dpm: Fix crash when invoked by system

 * ApplicationInfo will be null in this case, skip the legacyApp
   check to avoid crashing of system_server.

Change-Id: Ifcbc2528a6d0e9e6bd5df1ad4fcd8d65341ce052

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index d86b834..a227d63 100644 (file)
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -5095,12 +5095,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
         }
 
         boolean legacyApp = false;
-        if (ai.targetSdkVersion <= Build.VERSION_CODES.M) {
-            legacyApp = true;
-        } else if ("com.google.android.apps.enterprise.dmagent".equals(ai.packageName)
-                && ai.versionCode == 697) {
-            // TODO: STOPSHIP remove this (revert ag/895987) once a new prebuilt is dropped
-            legacyApp = true;
+        if (ai != null) {
+            if (ai.targetSdkVersion <= Build.VERSION_CODES.M) {
+                legacyApp = true;
+            } else if ("com.google.android.apps.enterprise.dmagent".equals(ai.packageName)
+                    && ai.versionCode == 697) {
+                // TODO: STOPSHIP remove this (revert ag/895987) once a new prebuilt is dropped
+                legacyApp = true;
+            }
         }
 
         final int rawStatus = getEncryptionStatus();