commit 434e9227af1fecf2d23a6f401c48642906d3080e
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Fri Mar 17 16:23:33 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Apr 18 22:42:20 2023 +0000
tree db54fa4b2b8a352bc494573dcdf444ee5fec53dc
parent 37391874b2f5c93ddb17becbabf3b82948d2b5be

[automerge] RESTRICT AUTOMERGE Finish ManagePermissionsActivity if device is not provisioned 2p: 5e297ab513

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/20652904

Bug: 253043490
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05aa2babaf7ec53c0708526d19e9ae5f622e31b8)
Merged-In: Ib41c94e90be70ee98e3f02c347d7b44c25467478
Change-Id: Ib41c94e90be70ee98e3f02c347d7b44c25467478

PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java
index bf48e28..28e0d23 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java
@@ -35,6 +35,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.MenuItem;
 
@@ -122,6 +123,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();