commit 56f545a3afe75b331360acbab88db5dc0fc09bc1
author Eric Biggers <ebiggers@google.com> Thu Apr 25 19:28:18 2024 +0000
committer Eric Biggers <ebiggers@google.com> Thu Apr 25 19:28:24 2024 +0000
tree fd0ffb48479b6af2cff8d650fb320b3486138d6b
parent 2c0a308fe744777ef8a48a264b58163cfef69e95

Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF

Since the class 'android.security.KeyStore' is going away, the UID_SELF
constant is being moved to a more appropriate location in KeyProperties.
Update code that references this constant to use the new location.  No
change in behavior; the value of the constant remains the same.

Bug: 326508120
Test: build
Flag: NONE mechanical refactoring with no behavior change
Change-Id: Ia73548f31b487ab526298a64ee1f4fcde32280e8

src/com/android/car/settings/security/CredentialStorageActivity.java

diff --git a/src/com/android/car/settings/security/CredentialStorageActivity.java b/src/com/android/car/settings/security/CredentialStorageActivity.java
index 9e533d8..29ae9d1 100644
--- a/src/com/android/car/settings/security/CredentialStorageActivity.java
+++ b/src/com/android/car/settings/security/CredentialStorageActivity.java
@@ -30,7 +30,7 @@
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyChain;
-import android.security.KeyStore;
+import android.security.keystore.KeyProperties;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -183,13 +183,13 @@
             return true;
         }
 
-        int uid = installBundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyStore.UID_SELF);
+        int uid = installBundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyProperties.UID_SELF);
 
         // Checks that the provided uid is none of the following:
-        // 1. KeyStore.UID_SELF
+        // 1. KeyProperties.UID_SELF
         // 2. Current uid process
         // 3. uid running as the system process (if in headless system user mode)
-        if (uid != KeyStore.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())
+        if (uid != KeyProperties.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())
                 && !(mUserManager.isHeadlessSystemUserMode()
                 && UserHandle.getUserId(uid) == UserHandle.USER_SYSTEM)) {
             int dstUserId = UserHandle.getUserId(uid);
@@ -338,7 +338,7 @@
         sendBroadcast(broadcast);
         setResult(RESULT_OK);
 
-        if (uid == Process.SYSTEM_UID || uid == KeyStore.UID_SELF) {
+        if (uid == Process.SYSTEM_UID || uid == KeyProperties.UID_SELF) {
             new MarkKeyAsUserSelectable(this, alias).execute();
         } else {
             finish();