From bcb5ee6f43ea24fb74649f164ca3c3032a7be3b5 Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Tue, 26 Jan 2021 08:46:31 -0800
Subject: [PATCH] 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)
---
 .../server/devicepolicy/DevicePolicyManagerService.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 1a2eee06da4f2..ac2281a2dbaa2 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 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
                 return null;
             }
             final ComponentName supervisorComponent = ComponentName.unflattenFromString(supervisor);
+            if (supervisorComponent == null) {
+                return null;
+            }
             if (supervisorComponent.equals(doComponent) || supervisorComponent.equals(
                     poComponent)) {
                 return supervisorComponent;