Skip to content

Commit

Permalink
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Browse files Browse the repository at this point in the history
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d83f47397e61d5ec04866af20efcb935a58cbdff)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
  • Loading branch information
Chris Antol authored and aoleary committed Sep 17, 2024
1 parent f0f147f commit c9daade
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/com/android/settings/homepage/SettingsHomepageActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ public CategoryMixin getCategoryMixin() {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

// Ensure device is provisioned in order to access Settings home
// TODO(b/331254029): This should later be replaced in favor of an allowlist
boolean unprovisioned = android.provider.Settings.Global.getInt(getContentResolver(),
android.provider.Settings.Global.DEVICE_PROVISIONED, 0) == 0;
if (unprovisioned) {
Log.e(TAG, "Device is not provisioned, exiting Settings");
finish();
return;
}

mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);
if (mIsEmbeddingActivityEnabled) {
final UserManager um = getSystemService(UserManager.class);
Expand Down

0 comments on commit c9daade

Please sign in to comment.