From 637baaf0db76f9e1e51eeab077ffb85da0ff9308 Mon Sep 17 00:00:00 2001
From: Nicolas Prevot <nprevot@google.com>
Date: Tue, 10 Feb 2015 17:18:07 +0000
Subject: Avoid NullPointerException in enableSystemApp if the app is absent.

In enableSystemApp: if the app is absent, throw a IllegalArgumentException
instead of failing with a NullPointerException.

BUG:19321306

Change-Id: I4ec09a0a77d29ca04e8d52f5546c1e4d0f8641e5
---
 .../com/android/server/devicepolicy/DevicePolicyManagerService.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index b8f0d07293d8..8987df965026 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -5072,6 +5072,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
             throws RemoteException {
         ApplicationInfo appInfo = pm.getApplicationInfo(packageName, GET_UNINSTALLED_PACKAGES,
                 userId);
+        if (appInfo == null) {
+            throw new IllegalArgumentException("The application " + packageName +
+                    " is not present on this device");
+        }
         return (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
     }
 
-- 
cgit v1.2.3-59-g8ed1b