From cc53f44d493906392dd21c2c2e72130b234b10e2 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Tue, 28 Mar 2023 19:27:01 +0000 Subject: [PATCH] Revert "Disallow screenshot on Wi-Fi QR code settings" This reverts commit 950837b20f418df7a0583f5fa78df00a74a88c31. Reason for revert: The security issue is downgraded to NSI, remove the screenshot protection to rollback the original design. Change-Id: Iecaf7e4e19dc3452a7d2aeaf32bf38619e760c76 --- .../settings/wifi/dpp/WifiDppConfiguratorActivity.java | 2 -- .../wifi/dpp/WifiDppConfiguratorActivityTest.java | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java index 6c9d4980f44..e6f0b31f384 100644 --- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java +++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java @@ -28,7 +28,6 @@ import android.os.UserManager; import android.provider.Settings; import android.util.EventLog; import android.util.Log; -import android.view.WindowManager; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.FragmentTransaction; @@ -100,7 +99,6 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); if (savedInstanceState != null) { String qrCode = savedInstanceState.getString(KEY_QR_CODE); diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java index 88fa83afbf7..d8605ded829 100644 --- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java @@ -16,10 +16,6 @@ package com.android.settings.wifi.dpp; -import static android.view.WindowManager.LayoutParams.FLAG_SECURE; - -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -76,12 +72,6 @@ public class WifiDppConfiguratorActivityTest { Robolectric.setupActivity(WifiDppConfiguratorActivity.class); } - @Test - public void launchActivity_shouldAddFlagSecure() { - assertThat(mActivity.getWindow().getAttributes().flags & FLAG_SECURE) - .isEqualTo(FLAG_SECURE); - } - @Test public void handleIntent_isGuestUser_shouldFinish() { when(mUserManager.isGuestUser()).thenReturn(true);