diff options
| author | Wei Sheng Shih <wilsonshih@google.com> | 2021-11-08 07:07:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-08 07:07:27 +0000 |
| commit | 385935d07f61d1d7db1f70e89ce092ae1fd97673 (patch) | |
| tree | 0b3c30abd29fd2a9f338de90135c22c03b9886e5 /core/java/android | |
| parent | 0849b35051246bff712572eaef71ac34dae2d9c8 (diff) | |
| parent | 5ffa690f0c9260b281d12b0fc2a7a82edf7110b6 (diff) | |
Merge "setTurnScreenOn can only used as wakeup"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index db5dcc5c264b..af59ea1d22ff 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -77,7 +77,6 @@ import android.os.IBinder; import android.os.Looper; import android.os.Parcelable; import android.os.PersistableBundle; -import android.os.PowerManager; import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager.ServiceNotFoundException; @@ -8788,9 +8787,7 @@ public class Activity extends ContextThemeWrapper * the activity is visible after the screen is turned on when the lockscreen is up. In addition, * if this flag is set and the activity calls {@link * KeyguardManager#requestDismissKeyguard(Activity, KeyguardManager.KeyguardDismissCallback)} - * the screen will turn on. If the screen is off and device is not secured, this flag can turn - * screen on and dismiss keyguard to make this activity visible and resume, which can be used to - * replace {@link PowerManager#ACQUIRE_CAUSES_WAKEUP} + * the screen will turn on. * * @param turnScreenOn {@code true} to turn on the screen; {@code false} otherwise. * |