commit b6c64857ecee0c079577ba45d4eb84196f0f9792
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 15 21:46:41 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 15 21:46:41 2021 +0000
tree 6e8c3c1bfe5e9bb449db7b5827e2b4cb9c125dcf
parent 0aee9a8100e5bea98ec2b9786c63486823df0d27
parent bcb5ee6f43ea24fb74649f164ca3c3032a7be3b5

Merge "Don't crash if default supervision profile owner is not set" into sc-dev

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 1a2eee0..ac2281a 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8817,6 +8817,9 @@
                 return null;
             }
             final ComponentName supervisorComponent = ComponentName.unflattenFromString(supervisor);
+            if (supervisorComponent == null) {
+                return null;
+            }
             if (supervisorComponent.equals(doComponent) || supervisorComponent.equals(
                     poComponent)) {
                 return supervisorComponent;