Skip to content

Commit 4a816fa

Browse files
committed
Fix(Inventory): prevent error with android.permission.QUERY_USERS (only for sys app)
1 parent 4299214 commit 4a816fa

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

inventory/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
apply plugin: 'com.android.library'
1+
plugins {
2+
id 'com.android.library'
3+
}
24

35
android {
46
compileSdk 34

inventory/src/main/java/org/flyve/inventory/categories/User.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,7 @@ public User(Context xCtx) {
112112
public String getUserName() {
113113
String userName = "N/A";
114114
try {
115-
if (Build.VERSION.SDK_INT >= 17) {
116-
UserManager userMgr = (UserManager) context.getSystemService(Context.USER_SERVICE);
117-
if (userMgr != null) {
118-
try {
119-
// validate permission exception
120-
userName = userMgr.getUserName();
121-
} catch (Exception ex) {
122-
InventoryLog.e(InventoryLog.getMessage(context, CommonErrorType.USER_NAME, ex.getMessage()));
123-
userName = Build.USER;
124-
}
125-
} else {
126-
userName = Build.USER;
127-
}
128-
} else {
129-
userName = Build.USER;
130-
}
115+
userName = Build.USER;
131116
} catch (Exception ex) {
132117
InventoryLog.e(InventoryLog.getMessage(context, CommonErrorType.USER_NAME, ex.getMessage()));
133118
}

0 commit comments

Comments
 (0)