summaryrefslogtreecommitdiffstats
path: root/core/java/android/security
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-03-20 11:36:50 -0700
committerKenny Root <kroot@google.com>2013-03-20 11:57:46 -0700
commitbd79419ef84ae31f3765721b50aa413fa462d1d1 (patch)
treed2eb8242f5a770452d7100d38b6c273aac242134 /core/java/android/security
parent78ad849163a7b01073b46fbd7d818392720005d1 (diff)
downloadframeworks_base-bd79419ef84ae31f3765721b50aa413fa462d1d1.zip
frameworks_base-bd79419ef84ae31f3765721b50aa413fa462d1d1.tar.gz
frameworks_base-bd79419ef84ae31f3765721b50aa413fa462d1d1.tar.bz2
KeyStore: add "migrate" command
To support the WiFi service, we need to support migration from the system UID to the wifi UID. This adds a command to achieve the migration. Bug: 8122243 Change-Id: I65f7a91504c1d2a2aac22b9c3051adffd28d66c1
Diffstat (limited to 'core/java/android/security')
-rw-r--r--core/java/android/security/IKeystoreService.java22
1 files changed, 22 insertions, 0 deletions
diff --git a/core/java/android/security/IKeystoreService.java b/core/java/android/security/IKeystoreService.java
index af4cdfa..2ae3c64 100644
--- a/core/java/android/security/IKeystoreService.java
+++ b/core/java/android/security/IKeystoreService.java
@@ -405,6 +405,25 @@ public interface IKeystoreService extends IInterface {
}
return _result;
}
+
+ @Override
+ public int migrate(String name, int targetUid) throws RemoteException {
+ Parcel _data = Parcel.obtain();
+ Parcel _reply = Parcel.obtain();
+ int _result;
+ try {
+ _data.writeInterfaceToken(DESCRIPTOR);
+ _data.writeString(name);
+ _data.writeInt(targetUid);
+ mRemote.transact(Stub.TRANSACTION_migrate, _data, _reply, 0);
+ _reply.readException();
+ _result = _reply.readInt();
+ } finally {
+ _reply.recycle();
+ _data.recycle();
+ }
+ return _result;
+ }
}
private static final String DESCRIPTOR = "android.security.keystore";
@@ -429,6 +448,7 @@ public interface IKeystoreService extends IInterface {
static final int TRANSACTION_grant = IBinder.FIRST_CALL_TRANSACTION + 17;
static final int TRANSACTION_ungrant = IBinder.FIRST_CALL_TRANSACTION + 18;
static final int TRANSACTION_getmtime = IBinder.FIRST_CALL_TRANSACTION + 19;
+ static final int TRANSACTION_migrate = IBinder.FIRST_CALL_TRANSACTION + 20;
/**
* Cast an IBinder object into an IKeystoreService interface, generating
@@ -513,4 +533,6 @@ public interface IKeystoreService extends IInterface {
public int ungrant(String name, int granteeUid) throws RemoteException;
public long getmtime(String name) throws RemoteException;
+
+ public int migrate(String name, int targetUid) throws RemoteException;
}