diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-08-17 07:58:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-17 07:58:45 +0000 |
| commit | 4fff153a3cfef91a0a2aaf1e0bb5649e9f98ed0e (patch) | |
| tree | a371805c5fdb564b14c9f02639636f7c60d98f86 | |
| parent | f49e905dd05bc246bc80e19d6a5b8e02e1021b4a (diff) | |
| parent | 88a52512c859be8ea22a3e58c11af92b2e3243e0 (diff) | |
| download | android_packages_apps_ManagedProvisioning-4fff153a3cfef91a0a2aaf1e0bb5649e9f98ed0e.tar.gz android_packages_apps_ManagedProvisioning-4fff153a3cfef91a0a2aaf1e0bb5649e9f98ed0e.tar.bz2 android_packages_apps_ManagedProvisioning-4fff153a3cfef91a0a2aaf1e0bb5649e9f98ed0e.zip | |
am 88a52512: am eb18ce02: Fix NullPointerException when showing DeleteManagedProfileDialog
* commit '88a52512c859be8ea22a3e58c11af92b2e3243e0':
Fix NullPointerException when showing DeleteManagedProfileDialog
| -rw-r--r-- | src/com/android/managedprovisioning/DeleteManagedProfileDialog.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java b/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java index d380ae35..0a435f33 100644 --- a/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java +++ b/src/com/android/managedprovisioning/DeleteManagedProfileDialog.java @@ -82,9 +82,12 @@ public class DeleteManagedProfileDialog extends DialogFragment { 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 { |