From 3fd46cc27db258b295de9bc4408d6f3b9df7e092 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 25 Apr 2024 19:21:25 +0000 Subject: [PATCH] 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: Iaca5b20c37b7952df8f26a99b3f7391c5a7f01b6 --- src/com/android/settings/security/CredentialStorage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java index ea336314566..1d8a721be94 100644 --- a/src/com/android/settings/security/CredentialStorage.java +++ b/src/com/android/settings/security/CredentialStorage.java @@ -34,7 +34,7 @@ import android.security.Credentials; import android.security.IKeyChainService; import android.security.KeyChain; import android.security.KeyChain.KeyChainConnection; -import android.security.KeyStore; +import android.security.keystore.KeyProperties; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; @@ -126,9 +126,9 @@ public final class CredentialStorage extends FragmentActivity { final Bundle bundle = mInstallBundle; mInstallBundle = null; - final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyStore.UID_SELF); + final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyProperties.UID_SELF); - if (uid != KeyStore.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) { + if (uid != KeyProperties.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) { final int dstUserId = UserHandle.getUserId(uid); // Restrict install target to the wifi uid. @@ -279,7 +279,7 @@ public final class CredentialStorage extends FragmentActivity { // If this is not a WiFi key, mark it as user-selectable, so that it can be // selected by users from the Certificate Selection prompt. - if (mUid == Process.SYSTEM_UID || mUid == KeyStore.UID_SELF) { + if (mUid == Process.SYSTEM_UID || mUid == KeyProperties.UID_SELF) { service.setUserSelectable(mAlias, true); }