commit | a80057c3598f48231c20e706a3fc349cb394ba3f | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 27 03:06:37 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 27 03:06:37 2018 +0000 |
tree | bac85b9ecff829cb3e63f4ecec433d78bbf24818 | |
parent | 9a6bc76ee8f09181ef7c9ad34b1a51ba4c77737f [diff] | |
parent | 0472a26d0c77d88cae100403a8c690bdd04cabad [diff] |
Merge "Give DPM callers unsafe labels." into pi-dev
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 2e07703..56c9807 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7833,8 +7833,7 @@ ApplicationInfo appInfo = userContext.getApplicationInfo(); CharSequence result = null; if (appInfo != null) { - PackageManager pm = userContext.getPackageManager(); - result = pm.getApplicationLabel(appInfo); + result = appInfo.loadUnsafeLabel(userContext.getPackageManager()); } return result != null ? result.toString() : null; } finally {