commit | 7be8af2b1328d25ee8aa833af8f51ba996830a87 | [log] [tgz] |
---|---|---|
author | Nate Myren <ntmyren@google.com> | Tue Dec 06 14:01:03 2022 -0800 |
committer | android-t1 <android-t1@t2mobile.com> | Mon Aug 07 11:15:47 2023 +0800 |
tree | 097a956dd42c684d0e2038a9978f6074c2dd5d94 | |
parent | 945a8c2f02abcc06482b2d79337d0ef52a70f7d8 [diff] |
RESTRICT AUTOMERGE Finish ManagePermissionsActivity if device is not provisioned If the device isn't set up yet, do not allow access to the permissions settings Bug: 253043490 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8a6f1f59d6cb5367f0c88980a75ddc227dba956a) Merged-In: I6e8fb8f2d934cff965069493740cfc1c59c3623f Change-Id: I6e8fb8f2d934cff965069493740cfc1c59c3623f
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java index 4c186cf..c7b1bdc 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java
@@ -38,6 +38,7 @@ import android.os.Process; import android.os.UserHandle; import android.permission.PermissionManager; +import android.provider.Settings; import android.util.Log; import android.view.MenuItem; @@ -135,6 +136,15 @@ return; } + boolean provisioned = Settings.Global.getInt( + getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0) != 0; + boolean completed = Settings.Secure.getInt( + getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, 0) != 0; + if (!provisioned || !completed) { + finishAfterTransition(); + return; + } + android.app.Fragment fragment = null; Fragment androidXFragment = null; String action = getIntent().getAction();