diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-04-12 18:18:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 18:18:45 -0700 |
| commit | 67ae551272f2bc8ffe83ecd62e970f657dc965d5 (patch) | |
| tree | 8d38b0feaf8a45217ef47d8811bbb14a947ada30 /core/java/android/app/IActivityManager.java | |
| parent | cbba37c6096486cbc8ce6f0c4eb7df9a352d54b1 (diff) | |
| parent | ff5b158f69bf453cf1fdedd175a09482c65f2bf2 (diff) | |
| download | frameworks_base-67ae551272f2bc8ffe83ecd62e970f657dc965d5.zip frameworks_base-67ae551272f2bc8ffe83ecd62e970f657dc965d5.tar.gz frameworks_base-67ae551272f2bc8ffe83ecd62e970f657dc965d5.tar.bz2 | |
Merge "Keep activities stopped while the lock screen is up."
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
| -rw-r--r-- | core/java/android/app/IActivityManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index c71b186..3fc2280 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -205,7 +205,8 @@ public interface IActivityManager extends IInterface { // Note: probably don't want to allow applications access to these. public void goingToSleep() throws RemoteException; public void wakingUp() throws RemoteException; - + public void setLockScreenShown(boolean shown) throws RemoteException; + public void unhandledBack() throws RemoteException; public ParcelFileDescriptor openContentUri(Uri uri) throws RemoteException; public void setDebugApp( @@ -588,4 +589,5 @@ public interface IActivityManager extends IInterface { int GET_CURRENT_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+144; int TARGET_TASK_AFFINITY_MATCHES_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+145; int NAVIGATE_UP_TO_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+146; + int SET_LOCK_SCREEN_SHOWN_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+147; } |