diff options
author | Vikram Gaur <vikramgaur@google.com> | 2022-04-15 18:47:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-15 18:47:54 +0000 |
commit | 20a798509c2f5367cbbdd3cf6160699e70f8bd18 (patch) | |
tree | c453390ef46e972be47d98428385c0bcf727d592 | |
parent | 100534bf33454f5924b2993c606e9516dd75b68b (diff) | |
parent | bb71278d0ba19e8e0621a3770c2c9c3121d27d96 (diff) | |
download | RemoteProvisioner-20a798509c2f5367cbbdd3cf6160699e70f8bd18.tar.gz |
Refactoring Test mode argument to setting. am: e8f9823ad0 am: bb71278d0b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/RemoteProvisioner/+/2064809
Change-Id: Ie8a0cb0ba937b2900600b5012259f43ba0483bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/com/android/remoteprovisioner/PeriodicProvisioner.java | 4 | ||||
-rw-r--r-- | src/com/android/remoteprovisioner/Provisioner.java | 5 | ||||
-rw-r--r-- | src/com/android/remoteprovisioner/SettingsManager.java | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/com/android/remoteprovisioner/PeriodicProvisioner.java b/src/com/android/remoteprovisioner/PeriodicProvisioner.java index 199632c..b050e1b 100644 --- a/src/com/android/remoteprovisioner/PeriodicProvisioner.java +++ b/src/com/android/remoteprovisioner/PeriodicProvisioner.java @@ -23,8 +23,8 @@ import android.net.ConnectivityManager; import android.os.RemoteException; import android.os.ServiceManager; import android.security.remoteprovisioning.AttestationPoolStatus; -import android.security.remoteprovisioning.ImplInfo; import android.security.remoteprovisioning.IRemoteProvisioning; +import android.security.remoteprovisioning.ImplInfo; import android.util.Log; import androidx.annotation.NonNull; @@ -233,7 +233,7 @@ public class PeriodicProvisioner extends Worker { Log.i(TAG, "Need to generate " + stats.keysToGenerate + " keys."); int generated; for (generated = 0; generated < stats.keysToGenerate; generated++) { - SystemInterface.generateKeyPair(false /* isTestMode */, secLevel, binder); + SystemInterface.generateKeyPair(SettingsManager.isTestMode(), secLevel, binder); // Prioritize provisioning if there are no keys available. No keys being available // indicates that this is the first time a device is being brought online. if (pool.total != 0) { diff --git a/src/com/android/remoteprovisioner/Provisioner.java b/src/com/android/remoteprovisioner/Provisioner.java index e7d591d..8093192 100644 --- a/src/com/android/remoteprovisioner/Provisioner.java +++ b/src/com/android/remoteprovisioner/Provisioner.java @@ -69,9 +69,8 @@ public class Provisioner { } DeviceInfo deviceInfo = new DeviceInfo(); ProtectedData protectedData = new ProtectedData(); - byte[] macedKeysToSign = - SystemInterface.generateCsr(false /* testMode */, numKeys, secLevel, geekChain, - challenge, protectedData, deviceInfo, binder); + byte[] macedKeysToSign = SystemInterface.generateCsr(SettingsManager.isTestMode(), numKeys, + secLevel, geekChain, challenge, protectedData, deviceInfo, binder); if (macedKeysToSign == null || protectedData.protectedData == null || deviceInfo.deviceInfo == null) { Log.e(TAG, "Keystore failed to generate a payload"); diff --git a/src/com/android/remoteprovisioner/SettingsManager.java b/src/com/android/remoteprovisioner/SettingsManager.java index 5808475..fbf4261 100644 --- a/src/com/android/remoteprovisioner/SettingsManager.java +++ b/src/com/android/remoteprovisioner/SettingsManager.java @@ -35,6 +35,7 @@ public class SettingsManager { // Check for expiring certs in the next 3 days public static final int EXPIRING_BY_MS_DEFAULT = 1000 * 60 * 60 * 24 * 3; public static final String URL_DEFAULT = "https://remoteprovisioning.googleapis.com/v1"; + public static final boolean IS_TEST_MODE = false; private static final String KEY_EXPIRING_BY = "expiring_by"; private static final String KEY_EXTRA_KEYS = "extra_keys"; @@ -185,4 +186,12 @@ public class SettingsManager { editor.clear(); editor.apply(); } + + /** + * Checks whether RKP is in test mode. + * @return true if device is in test mode, false otherwise. + */ + public static boolean isTestMode() { + return IS_TEST_MODE; + } } |