commit bd683811625bac40d6bedce5b77c909100bf53ad
author Rafael Higuera Silva <rafahs@google.com> Tue Sep 28 15:54:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 28 15:54:54 2021 +0000
tree 6b96488e68ad42e9ac4247a1105885470b6b16e4
parent c13629de40b31785adb6ca6fa37785acd38dc7ea
parent cd3aef2a170f939a38de004384e61ecfe1d7e043

Merge "DO NOT MERGE Adding package caller to prepareForUnattendedReboot."

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5fc8f86..b67b77a 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1955,7 +1955,8 @@
                 case CMD_PREPARE_UNATTENDED_REBOOT:
                     request = (MainThreadRequest) msg.obj;
                     request.result =
-                            UiccController.getInstance().getPinStorage().prepareUnattendedReboot();
+                            UiccController.getInstance().getPinStorage()
+                                .prepareUnattendedReboot(request.workSource);
                     notifyRequester(request);
                     break;
 
@@ -10391,11 +10392,12 @@
     @Override
     @TelephonyManager.PrepareUnattendedRebootResult
     public int prepareForUnattendedReboot() {
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
         enforceRebootPermission();
 
         final long identity = Binder.clearCallingIdentity();
         try {
-            return (int) sendRequest(CMD_PREPARE_UNATTENDED_REBOOT, null);
+            return (int) sendRequest(CMD_PREPARE_UNATTENDED_REBOOT, null, workSource);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }