Skip to content

Commit 67dbd92

Browse files
authored
Merge pull request #3 from ltrudu/master
Hot Fix for latest TC52x/57x A13 BSP
2 parents 0bebf3a + 032977e commit 67dbd92

File tree

10 files changed

+20
-250
lines changed

10 files changed

+20
-250
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,5 @@ lint/intermediates/
7979
lint/generated/
8080
lint/outputs/
8181
lint/tmp/
82-
# lint/reports/
82+
# lint/reports/
83+
.idea/

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 116 deletions
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/jarRepositories.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.idea/markdown-navigator-enh.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.idea/markdown-navigator.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.settings/org.eclipse.buildship.core.prefs

Lines changed: 0 additions & 13 deletions
This file was deleted.

CriticalPermissionsHelper/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
ext {
55
PUBLISH_GROUP_ID = 'com.zebra.criticalpermissionshelper'
66
PUBLISH_ARTIFACT_ID = 'criticalpermissionshelper'
7-
PUBLISH_VERSION = '0.6'
7+
PUBLISH_VERSION = '0.7'
88
}
99

1010
android {
@@ -13,8 +13,8 @@ android {
1313
defaultConfig {
1414
minSdkVersion 30
1515
targetSdkVersion 32
16-
versionCode 6
17-
versionName "0.6"
16+
versionCode 7
17+
versionName "0.7"
1818

1919
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2020

CriticalPermissionsHelper/src/main/java/com/zebra/criticalpermissionshelper/ProfileManagerCommand.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,21 @@ private void onEMDKManagerRetrieved(EMDKManager emdkManager)
203203
if(mProfileManager == null)
204204
{
205205
try {
206-
emdkManager.getInstanceAsync(EMDKManager.FEATURE_TYPE.PROFILE, mStatusListener);
206+
logMessage("Requesting profile manager.", EMessageType.DEBUG);
207+
logMessage("Current API version: " + android.os.Build.VERSION.SDK_INT, EMessageType.VERBOSE);
208+
if(android.os.Build.VERSION.SDK_INT < 33) {
209+
logMessage("Requesting profile manager Asynchonously", EMessageType.DEBUG);
210+
emdkManager.getInstanceAsync(EMDKManager.FEATURE_TYPE.PROFILE, mStatusListener);
211+
}
212+
else
213+
{
214+
logMessage("Requesting profile manager synchronized", EMessageType.DEBUG);
215+
ProfileManager profileManager = (ProfileManager) emdkManager.getInstance(EMDKManager.FEATURE_TYPE.PROFILE);
216+
if(profileManager != null)
217+
{
218+
onProfileManagerInitialized(profileManager);
219+
}
220+
}
207221
} catch (EMDKException e) {
208222
logMessage("Error when trying to retrieve profile manager: " + e.getMessage(), EMessageType.ERROR);
209223
}

0 commit comments

Comments
 (0)