commit bcb5ee6f43ea24fb74649f164ca3c3032a7be3b5
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Jan 26 08:46:31 2021 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Mon Mar 15 16:15:35 2021 +0000
tree 19a9e1f5ca5756c2b6fefd20657ce3065888b1a1
parent 1fcb030d0e8831def81e2e2c8ccfa4145b72ca96

Don't crash if default supervision profile owner is not set

Bug: 175430552
Test: build, flash, watch logcat

Change-Id: If441946fa278c04ae88122f6243f5a7dedd96ebc
(cherry picked from commit bd27c365915f824824d865668c63a2119c4700fb)

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;