diff options
| author | Michael Wright <michaelwr@google.com> | 2014-09-26 18:13:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-26 18:13:55 +0000 |
| commit | 1b409bcfb87a702c9486bd6562ece6e40ebc1656 (patch) | |
| tree | 21da391277d0d97d4275be0977bd53cf50d0e051 /policy/src | |
| parent | 0a094c61bc1150585af3e60be7de3a5b17fa5573 (diff) | |
| parent | 61a43ee7a98ae825097d16a17b2217cc1c1c00c9 (diff) | |
| download | frameworks_base-1b409bcfb87a702c9486bd6562ece6e40ebc1656.zip frameworks_base-1b409bcfb87a702c9486bd6562ece6e40ebc1656.tar.gz frameworks_base-1b409bcfb87a702c9486bd6562ece6e40ebc1656.tar.bz2 | |
Merge "Turn the device on if the camera lens is uncovered." into lmp-dev
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 006f5db..73ff066 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4093,6 +4093,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } else { intent = new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA); } + mPowerManager.wakeUp(whenNanos / 1000000); mContext.startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF); } mCameraLensCoverState = lensCoverState; |