Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef9198be authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Give DPM callers unsafe labels." into pi-dev am: a80057c3 

am: 4df6caea

Change-Id: I0fc1afd3dda2b62310883fd17e1cd09d530788a4
parents b5bbf4b2 4df6caea

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

+1 −2
Original line number Diff line number Diff line
@@ -7833,8 +7833,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            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 {