提交: 635426b0a7db8791bc62836921d3b2f22b36acea - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• 修订版: 635426b0a7db8791bc62836921d3b2f22b36acea (tree)
• 时间: 2015-01-31 04:00:45
• 作者: Robin Lee <rgl@goog...>
• Commiter: Robin Lee

Log Message

Repair broken keychain wifi_uid logic

Check for cross-user installs was missing a short-circuit for installs
where no UID was specified. This is now added.

Bug: 19194391
Change-Id: I10aa8323b47e0fcabb59e7c30d677080bb80b976

更改概述

• modified: src/com/android/settings/CredentialStorage.java

差异

--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -223,9 +223,9 @@ public final class CredentialStorage extends Activity {
         Bundle bundle = mInstallBundle;
         mInstallBundle = null;
 
-        final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);
+        final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyStore.UID_SELF);
 
-        if (!UserHandle.isSameUser(uid, Process.myUid())) {
+        if (uid != KeyStore.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) {
             int dstUserId = UserHandle.getUserId(uid);
             int myUserId = UserHandle.myUserId();