Merge "Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF" into main
diff --git a/robotests/src/com/android/certinstaller/CertInstallerRoboTest.java b/robotests/src/com/android/certinstaller/CertInstallerRoboTest.java
index 1c845a9..54d8abb 100644
--- a/robotests/src/com/android/certinstaller/CertInstallerRoboTest.java
+++ b/robotests/src/com/android/certinstaller/CertInstallerRoboTest.java
@@ -22,7 +22,7 @@
import android.content.Intent;
import android.security.Credentials;
import android.security.KeyChain;
-import android.security.KeyStore;
+import android.security.keystore.KeyProperties;
import android.os.Process;
import org.junit.Before;
@@ -82,7 +82,7 @@
/**
* mUid should be ignored if EXTRA_CERTIFICATE_USAGE is provided.
* if EXTRA_CERTIFICATE_USAGE does not equal CERTIFICATE_USAGE_WIFI,
- * mUid should equal KeyStore.UID_SELF
+ * mUid should equal KeyProperties.UID_SELF
*/
@Test
public void testUidUsageNotNullPass() throws Exception {
@@ -92,7 +92,7 @@
CredentialHelper helper = startActivityAndGetCredentialHelper(intent);
- assertThat(helper.getUid()).isEqualTo(KeyStore.UID_SELF);
+ assertThat(helper.getUid()).isEqualTo(KeyProperties.UID_SELF);
assertThat(helper.getCertUsageSelected()).isEqualTo("usage");
}
diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java
index eab58f5..bc1a141 100644
--- a/src/com/android/certinstaller/CredentialHelper.java
+++ b/src/com/android/certinstaller/CredentialHelper.java
@@ -16,7 +16,7 @@
package com.android.certinstaller;
-import static android.security.KeyStore.UID_SELF;
+import static android.security.keystore.KeyProperties.UID_SELF;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.KeyguardManager;
