commit cd3aef2a170f939a38de004384e61ecfe1d7e043
author Rafael Higuera Silva <rafahs@google.com> Mon Aug 30 15:16:50 2021 +0000
committer Michele Berionne <mberionne@google.com> Mon Sep 27 18:39:58 2021 +0000
tree de399cb13edb85dff41b14fce2fbda7181972699
parent 3317b6c989fd59da368830d254a5d755163dff9c

DO NOT MERGE Adding package caller to prepareForUnattendedReboot.

Bug: 192607493
Test: make, manual
Change-Id: I566a32237dcd00e63d24619a403b9a14f7c85925
Merged-In: Ie904f8f0ff18eb0d367297abebead3032d0eabec

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e4f71ba..a25e355 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1900,7 +1900,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;
 
@@ -10338,11 +10339,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);
         }