diff options
| author | Craig Mautner <cmautner@google.com> | 2015-04-07 16:17:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-07 16:17:57 +0000 |
| commit | 30b89849032eb57d1da93de40a6a9bd2a5f55a2e (patch) | |
| tree | c86011c47dffe540b011e3872b6deb6be00b5ecb /core/java/android | |
| parent | b6d8a8433660cf3d15d219e325454234f65025c5 (diff) | |
| parent | e56007786ace2fe0615197d95317ccd7be4d1ca6 (diff) | |
| download | frameworks_base-30b89849032eb57d1da93de40a6a9bd2a5f55a2e.zip frameworks_base-30b89849032eb57d1da93de40a6a9bd2a5f55a2e.tar.gz frameworks_base-30b89849032eb57d1da93de40a6a9bd2a5f55a2e.tar.bz2 | |
Merge "No longer unlock activity manager to test whitelist"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityManagerNative.java | 22 | ||||
| -rw-r--r-- | core/java/android/app/IActivityManager.java | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index be7287f..f63d13c 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -2452,6 +2452,15 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM reply.writeNoException(); return true; } + + case UPDATE_LOCK_TASK_PACKAGES_TRANSACTION: { + data.enforceInterface(IActivityManager.descriptor); + int userId = data.readInt(); + String[] packages = data.readStringArray(); + updateLockTaskPackages(userId, packages); + reply.writeNoException(); + return true; + } } return super.onTransact(code, data, reply, flags); @@ -5687,5 +5696,18 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } + @Override + public void updateLockTaskPackages(int userId, String[] packages) throws RemoteException { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + data.writeInterfaceToken(IActivityManager.descriptor); + data.writeInt(userId); + data.writeStringArray(packages); + mRemote.transact(UPDATE_LOCK_TASK_PACKAGES_TRANSACTION, data, reply, IBinder.FLAG_ONEWAY); + reply.readException(); + data.recycle(); + reply.recycle(); + } + private IBinder mRemote; } diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index e20b0da..4a1d6ff 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -488,6 +488,7 @@ public interface IActivityManager extends IInterface { public void setVoiceKeepAwake(IVoiceInteractionSession session, boolean keepAwake) throws RemoteException; + public void updateLockTaskPackages(int userId, String[] packages) throws RemoteException; /* * Private non-Binder interfaces @@ -823,4 +824,5 @@ public interface IActivityManager extends IInterface { int SET_DUMP_HEAP_DEBUG_LIMIT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+287; int DUMP_HEAP_FINISHED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+288; int SET_VOICE_KEEP_AWAKE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+289; + int UPDATE_LOCK_TASK_PACKAGES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+290; } |