diff options
author | Nate Myren <ntmyren@google.com> | 2023-03-22 23:00:04 +0000 |
---|---|---|
committer | Nate Myren <ntmyren@google.com> | 2023-03-22 23:45:16 +0000 |
commit | c16b1ec4da3a42282841587b8395faec01f090d0 (patch) | |
tree | 878b472ee27b87bc90e5b71bffa11cba31f52841 | |
parent | e6be8e3ac9e3d94a84e0107122a1fa73eb2d75db (diff) | |
parent | 8a6f1f59d6cb5367f0c88980a75ddc227dba956a (diff) | |
download | Permission-c16b1ec4da3a42282841587b8395faec01f090d0.tar.gz |
[conflict] RESTRICT AUTOMERGE Finish ManagePermissionsActivity if device is not provisioned am: 8a6f1f59d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/20655406
Change-Id: I328704f72f4a5ae17ef3c8be233a298d1c45dfbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java index 91ca82338..3dae9dca7 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java @@ -39,6 +39,7 @@ import android.os.Bundle; import android.os.Process; import android.os.UserHandle; import android.permission.PermissionManager; +import android.provider.Settings; import android.safetycenter.SafetyCenterManager; import android.safetycenter.SafetyEvent; import android.safetycenter.SafetySourceData; @@ -142,6 +143,15 @@ public final class ManagePermissionsActivity extends SettingsActivity { 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(); |