commit 6d23e5ae5a9edf8b63b650c719dacf305e046bf2
author Robin Lee <rgl@google.com> Mon Aug 03 16:14:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 03 16:14:14 2015 +0000
tree 42e84ec696585fbedc1133ed654a9a57e34f8967
parent c9acbed74857d2a9847914358c0bcfac3c01079f
parent 9bfaabb58728d2522ef8696158c83c8fed3e307a

Merge "Reuse mSenderUid to pass to device policy"

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 410956f..9125203 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -181,8 +181,7 @@
         Uri uri = getIntent().getParcelableExtra(KeyChain.EXTRA_URI);
         String alias = getIntent().getStringExtra(KeyChain.EXTRA_ALIAS);
         try {
-            int uid = ActivityManagerNative.getDefault().getLaunchedFromUid(getActivityToken());
-            devicePolicyManager.choosePrivateKeyAlias(uid, uri, alias, callback);
+            devicePolicyManager.choosePrivateKeyAlias(mSenderUid, uri, alias, callback);
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to request alias from DevicePolicyManager", e);
             // Proceed without a suggested alias.