diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-01-16 01:34:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 01:34:03 +0000 |
| commit | 0174cd26bb1786e6dc7acefd1ae70a0ad2c76543 (patch) | |
| tree | 70409e262fce33c56bd565893fcb47ca09116a80 /core/java/android/app/IActivityManager.java | |
| parent | 2f7ae528093ef4434e4d6380df0803cf70359971 (diff) | |
| parent | f24e490058bc59344f8bd10fb6cbbffa792fbc05 (diff) | |
| download | frameworks_base-0174cd26bb1786e6dc7acefd1ae70a0ad2c76543.zip frameworks_base-0174cd26bb1786e6dc7acefd1ae70a0ad2c76543.tar.gz frameworks_base-0174cd26bb1786e6dc7acefd1ae70a0ad2c76543.tar.bz2 | |
am f24e4900: Merge "Offer to detect non-SSL/TLS network traffic."
* commit 'f24e490058bc59344f8bd10fb6cbbffa792fbc05':
Offer to detect non-SSL/TLS network traffic.
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
| -rw-r--r-- | core/java/android/app/IActivityManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index d1279ad..de47147 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -464,6 +464,8 @@ public interface IActivityManager extends IInterface { public void notifyLaunchTaskBehindComplete(IBinder token) throws RemoteException; public void notifyEnterAnimationComplete(IBinder token) throws RemoteException; + public void notifyCleartextNetwork(int uid, byte[] firstPacket) throws RemoteException; + /* * Private non-Binder interfaces */ @@ -782,4 +784,7 @@ public interface IActivityManager extends IInterface { int BOOT_ANIMATION_COMPLETE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+237; int GET_TASK_DESCRIPTION_ICON_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+238; int LAUNCH_ASSIST_INTENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+239; + + // Start of M transactions + int NOTIFY_CLEARTEXT_NETWORK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+280; } |