commit 4d93ad694b3c94fefb4ea0dd9304fdee31a31944
author Edgar Wang <edgarwang@google.com> Thu May 28 06:45:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 28 06:45:04 2020 +0000
tree aac20a17334b2bbc5191df83fc2228b5cc966e3f
parent 6ea2228e311a012336ddb9e320f8766e9a1fc4e2
parent 9bc3b6a207f6d4dcd6b9946b207ab17ac1dce3ea

Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207

Change-Id: I74e93eca610194d7251c596bb854446bbc3dc129

src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java

diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 8b06975..f3c029f 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -288,7 +288,7 @@
             // setup.
             final String supervisor = getString(
                     com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);
-            if (supervisor == null) {
+            if (TextUtils.isEmpty(supervisor)) {
                 Log.w(TAG, "Unable to set profile owner post-setup, no default supervisor"
                         + "profile owner defined");
                 finish();
@@ -297,7 +297,7 @@
 
             final ComponentName supervisorComponent = ComponentName.unflattenFromString(
                     supervisor);
-            if (who.compareTo(supervisorComponent) != 0) {
+            if (supervisorComponent == null || who.compareTo(supervisorComponent) != 0) {
                 Log.w(TAG, "Unable to set non-default profile owner post-setup " + who);
                 finish();
                 return;