summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2014-08-13 09:50:25 +0100
committerRobin Lee <rgl@google.com>2014-08-29 23:03:42 +0100
commitf0246a8a14d69680d1776620e75a485cf963e574 (patch)
tree7fffafa3844a193de4b206605bdb59599a0318d5 /keystore
parentd627eac286e377aec5c8f66d4746850c3eff8ff8 (diff)
downloadframeworks_base-f0246a8a14d69680d1776620e75a485cf963e574.zip
frameworks_base-f0246a8a14d69680d1776620e75a485cf963e574.tar.gz
frameworks_base-f0246a8a14d69680d1776620e75a485cf963e574.tar.bz2
Keep managed profile keystores in sync with owner
Fixes setting a keyguard password for keystore in a multi-user setup while we're at it. Bug: 16233206. Change-Id: I7941707ca66ac25bd122fd22e5e0f639e7af697e
Diffstat (limited to 'keystore')
-rw-r--r--keystore/java/android/security/KeyStore.java30
1 files changed, 30 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index 6ac49ee..0db8c77 100644
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -331,6 +331,36 @@ public class KeyStore {
}
}
+ public boolean resetUid(int uid) {
+ try {
+ mError = mBinder.reset_uid(uid);
+ return mError == NO_ERROR;
+ } catch (RemoteException e) {
+ Log.w(TAG, "Cannot connect to keystore", e);
+ return false;
+ }
+ }
+
+ public boolean syncUid(int sourceUid, int targetUid) {
+ try {
+ mError = mBinder.sync_uid(sourceUid, targetUid);
+ return mError == NO_ERROR;
+ } catch (RemoteException e) {
+ Log.w(TAG, "Cannot connect to keystore", e);
+ return false;
+ }
+ }
+
+ public boolean passwordUid(String password, int uid) {
+ try {
+ mError = mBinder.password_uid(password, uid);
+ return mError == NO_ERROR;
+ } catch (RemoteException e) {
+ Log.w(TAG, "Cannot connect to keystore", e);
+ return false;
+ }
+ }
+
public int getLastError() {
return mError;
}