commit 0b7be3ae6bd99a918b59c28b9748e35501a3ee64
author The Android Automerger <android-build@google.com> Tue Aug 18 01:09:52 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Aug 18 01:09:52 2015 -0700
tree c720ddd655117da79d87d46c7cbc1ddc068a13f6
parent eb18ce020febefd5c683fea8ade52ad57299ccf0
parent dc6b695bdb858f2af064697a3967ff448c81be2c

merge in mnc-release history after reset to mnc-dev

src/com/android/managedprovisioning/DeleteManagedProfileDialog.java

diff --git a/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java b/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java
index d380ae3..0a435f3 100644
--- a/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java
+++ b/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java
@@ -82,9 +82,12 @@
 
         String appLabel;
         Drawable appIcon;
+        MdmPackageInfo mdmPackageInfo = null;
         if (mdmPackageName != null) {
-            MdmPackageInfo mdmPackageInfo = Utils.getMdmPackageInfo(
+            mdmPackageInfo = Utils.getMdmPackageInfo(
                     getActivity().getPackageManager(), mdmPackageName);
+        }
+        if (mdmPackageInfo != null) {
             appLabel = mdmPackageInfo.getAppLabel();
             appIcon = mdmPackageInfo.getPackageIcon();
         } else {