From 6ff8643e829d99a8abf9d26d948cac609ffaa13d Mon Sep 17 00:00:00 2001
From: David Liu <dswliu@google.com>
Date: Wed, 3 May 2023 21:09:10 +0000
Subject: [PATCH] Add Tapjacking Protection for all screens extends
 StorageWizardBase in Settings.

Add/remove the SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS flag into/from all screens extends StorageWizardBase with lifecycle.

Bug: 255305175

Test: manual test with make RunSettingsRoboTests
Change-Id: I7ed9e2bf9bbebf6cd6b7e76ad47a6d4155eb2eb2
---
 src/com/android/settings/deviceinfo/StorageWizardBase.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index 7203d8a7702..ad3c2c5dc22 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -41,7 +41,7 @@ import android.widget.TextView;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
-import com.android.settings.SetupWizardUtils;
+import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
@@ -85,6 +85,7 @@ public abstract class StorageWizardBase extends FragmentActivity {
         this.setTheme(sudTheme);
         ThemeHelper.trySetDynamicColor(this);
         super.onCreate(savedInstanceState);
+        getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
 
         mStorage = getSystemService(StorageManager.class);