commit 422e2418b07650b22ff829c1301c88336f65bdec
author Yan Zhu <yanzhuyan@google.com> Tue Dec 29 16:35:01 2020 -0800
committer Yan Zhu <yanzhuyan@google.com> Tue Dec 29 16:35:01 2020 -0800
tree 082c3586cf0be228c832b20483f725a0710ab19e
parent 2f1cedb30a22e34c81f52e607971e5d1379e2b11

Fix set-device-owner from shell for AAOS

Do not clear calling identify when setting DO for AAOS

Test: manual: download and install TestDPC
adb shell dpm set-device-owner --user 0 com.afwsamples.testdpc/.DeviceAdminReceiver
Fix: 176107119

Change-Id: I4b3b49c8fadc57088ecf506e1e31caff1f7118c7

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 5f6d76be..7b4c1be 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7620,10 +7620,9 @@
                         + " as profile owner on user " + currentForegroundUser);
                 // Sets profile owner on current foreground user since
                 // the human user will complete the DO setup workflow from there.
-                mInjector.binderWithCleanCallingIdentity(() ->
-                        manageUserUnchecked(/* deviceOwner= */ admin, /* profileOwner= */ admin,
-                                /* managedUser= */ currentForegroundUser,
-                                /* adminExtras= */ null));
+                manageUserUnchecked(/* deviceOwner= */ admin, /* profileOwner= */ admin,
+                            /* managedUser= */ currentForegroundUser,
+                            /* adminExtras= */ null);
             }
             return true;
         }