diff options
| author | 2023-06-12 13:45:06 +0000 | |
|---|---|---|
| committer | 2023-06-12 13:45:06 +0000 | |
| commit | 1a4893e7518c8e5548e3d46fcb408644c36d6f94 (patch) | |
| tree | 5a359d72b2f3836517000e8ae420a74fb359c3ed | |
| parent | 33705ab79f09a64225f6d837ca3bea50b8c802ac (diff) | |
| parent | 4360e144f415998490536cd47619f6346a819e3f (diff) | |
Merge "Don't enforce android.permission.TURN_SCREEN_ON in UDC." into udc-dev am: 4360e144f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23635699
Change-Id: If3b7f102f37189414456a019f7382ef9f1fc8e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/PowerManager.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index d1063f647c4f..d1c10fa46aaa 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -190,8 +190,7 @@ public final class PowerManager { /** * Wake lock flag: Turn the screen on when the wake lock is acquired. * <p> - * This flag requires {@link android.Manifest.permission#TURN_SCREEN_ON} for apps targeting - * Android version {@link Build.VERSION_CODES#UPSIDE_DOWN_CAKE} and higher. + * This flag will require {@link android.Manifest.permission#TURN_SCREEN_ON} in future releases. * </p><p> * Normally wake locks don't actually wake the device, they just cause the screen to remain on * once it's already on. This flag will cause the device to wake up when the wake lock is diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 695a0cf3f79d..a53b831d55c1 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -283,7 +283,7 @@ public final class PowerManagerService extends SystemService private static final long ENHANCED_DISCHARGE_PREDICTION_BROADCAST_MIN_DELAY_MS = 60 * 1000L; /** - * Apps targeting Android U and above need to define + * Apps targeting Android V and above need to define * {@link android.Manifest.permission#TURN_SCREEN_ON} in their manifest for * {@link android.os.PowerManager#ACQUIRE_CAUSES_WAKEUP} to have any effect. * Note that most applications should use {@link android.R.attr#turnScreenOn} or @@ -291,7 +291,7 @@ public final class PowerManagerService extends SystemService * previous foreground app from being resumed first when the screen turns on. */ @ChangeId - @EnabledSince(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT) public static final long REQUIRE_TURN_SCREEN_ON_PERMISSION = 216114297L; /** Reason ID for holding display suspend blocker. */ |