commit 0472a26d0c77d88cae100403a8c690bdd04cabad
author Jeff Sharkey <jsharkey@android.com> Mon Mar 26 19:19:23 2018 -0600
committer Jeff Sharkey <jsharkey@android.com> Mon Mar 26 19:19:26 2018 -0600
tree cd4ee4d5bac85baa42b7bca34913a2fdbf532280
parent b133cbfd0b5afb0217ee45c8e26847465c6a717a

Give DPM callers unsafe labels.

Tests want the full label, so give it to them.

Test: none
Bug: 74254785
Change-Id: Ia358ee54396ee0a0684fd352c7133f54d9f8c4a7

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

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 {