diff options
| author | Pihuei Wang <pihuei@google.com> | 2023-03-21 01:47:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-03-21 01:47:00 +0000 |
| commit | 2badd60a6afcb3fc5d8ef79aa621fbadd5ea2e8c (patch) | |
| tree | 85576bbfd06369ed4aeecc21a12581ee1c20aab2 /bts/java/com/google/android/setupcompat/bts/AbstractSetupBtsService.java | |
| parent | f23b1dae8ed0367b0400b8a4e2fb8933cdb6991f (diff) | |
| parent | e1b6a73e3916d90a5662a3b6875b19d5c8d72902 (diff) | |
| download | setupcompat-2badd60a6afcb3fc5d8ef79aa621fbadd5ea2e8c.tar.gz | |
Merge "Import updated Android SetupCompat Library 515497412" into udc-devandroid14-dev
Diffstat (limited to 'bts/java/com/google/android/setupcompat/bts/AbstractSetupBtsService.java')
| -rw-r--r-- | bts/java/com/google/android/setupcompat/bts/AbstractSetupBtsService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bts/java/com/google/android/setupcompat/bts/AbstractSetupBtsService.java b/bts/java/com/google/android/setupcompat/bts/AbstractSetupBtsService.java index eb10693..80066ab 100644 --- a/bts/java/com/google/android/setupcompat/bts/AbstractSetupBtsService.java +++ b/bts/java/com/google/android/setupcompat/bts/AbstractSetupBtsService.java @@ -256,7 +256,7 @@ public abstract class AbstractSetupBtsService extends Service { for (Signature signature : info.signingInfo.getApkContentsSigners()) { if (SETUP_WIZARD_RELEASE_CERTIFICATE_STRING.equals(signature.toCharsString()) - || (allowDebugKeys + || (isAllowDebugKeysOrBuild() && SETUP_WIZARD_DEBUG_CERTIFICATE_STRING.equals(signature.toCharsString()))) { return true; } @@ -273,6 +273,10 @@ public abstract class AbstractSetupBtsService extends Service { return false; } + private boolean isAllowDebugKeysOrBuild() { + return Build.TYPE.equals("userdebug") || Build.TYPE.equals("eng") || allowDebugKeys; + } + @VisibleForTesting boolean verifyCallingAppPermission() { int checkPermission = |