commit 180036ed2aeceaecf5f4fc97eb0f3e575eb3a75d
author Louis Chang <louischang@google.com> Tue Jan 23 08:58:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 23 08:58:14 2024 +0000
tree 71566236ab15b876eebbafab54f49eeda49d7417
parent 1d5762364633a160ca5912e5f52121de4227a6a4
parent 80b355a5e2bc27d638890327358a409b56f020e8

Merge "Makes #setTurnScreenOn a blocking binder call" into main

core/java/android/app/IActivityClientController.aidl

diff --git a/core/java/android/app/IActivityClientController.aidl b/core/java/android/app/IActivityClientController.aidl
index 7370fc3..5b044f6 100644
--- a/core/java/android/app/IActivityClientController.aidl
+++ b/core/java/android/app/IActivityClientController.aidl
@@ -119,7 +119,7 @@
 
     oneway void setShowWhenLocked(in IBinder token, boolean showWhenLocked);
     oneway void setInheritShowWhenLocked(in IBinder token, boolean setInheritShownWhenLocked);
-    oneway void setTurnScreenOn(in IBinder token, boolean turnScreenOn);
+    void setTurnScreenOn(in IBinder token, boolean turnScreenOn);
     oneway void setAllowCrossUidActivitySwitchFromBelow(in IBinder token, boolean allowed);
     oneway void reportActivityFullyDrawn(in IBinder token, boolean restoredFromBundle);
     oneway void overrideActivityTransition(IBinder token, boolean open, int enterAnim, int exitAnim,