summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/IActivityManager.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-09-23 12:57:44 -0700
committerDianne Hackborn <hackbod@google.com>2011-09-23 13:39:33 -0700
commit90c52de28691ca0bbbf7c039ef20f85ce46882cc (patch)
tree3a6dcf93f186f44561a312927d7fe2e97e45f6d4 /core/java/android/app/IActivityManager.java
parent67c5b1251178532726964c2e0f4229d079ff0a3e (diff)
downloadframeworks_base-90c52de28691ca0bbbf7c039ef20f85ce46882cc.zip
frameworks_base-90c52de28691ca0bbbf7c039ef20f85ce46882cc.tar.gz
frameworks_base-90c52de28691ca0bbbf7c039ef20f85ce46882cc.tar.bz2
Fix issue #5173952: Opening a Notification From Lock Screen...
...Should Skip Unsecure Lockscreen (ICS) Also while I am in there, clean up logging of intent objects to include even less sensitive information, while showing the true Intent in dump output (since apps can't get to that). Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
-rw-r--r--core/java/android/app/IActivityManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 27dd691..26813bf 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -372,6 +372,8 @@ public interface IActivityManager extends IInterface {
public void showBootMessage(CharSequence msg, boolean always) throws RemoteException;
+ public void dismissKeyguardOnNextActivity() throws RemoteException;
+
/*
* Private non-Binder interfaces
*/
@@ -602,4 +604,5 @@ public interface IActivityManager extends IInterface {
int UPDATE_PERSISTENT_CONFIGURATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+135;
int GET_PROCESS_PSS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+136;
int SHOW_BOOT_MESSAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+137;
+ int DISMISS_KEYGUARD_ON_NEXT_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+138;
}