PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Disallow screenshot on Wi-Fi QR code settings"

Browse Source 
This reverts commit 950837b20f.

Reason for revert: The security issue is downgraded to NSI, remove the screenshot protection to rollback the original design.

Change-Id: Iecaf7e4e19dc3452a7d2aeaf32bf38619e760c76
This commit is contained in:
Weng Su
2023-03-28 19:27:01 +00:00
parent 950837b20f
commit cc53f44d49
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
View File

@@ -28,7 +28,6 @@ import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.view.WindowManager;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
@@ -100,7 +99,6 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
if (savedInstanceState != null) { if (savedInstanceState != null) {
String qrCode = savedInstanceState.getString(KEY_QR_CODE); String qrCode = savedInstanceState.getString(KEY_QR_CODE);

10
tests/robotests/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
View File

@@ -16,10 +16,6 @@
package com.android.settings.wifi.dpp; 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.doNothing;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@@ -76,12 +72,6 @@ public class WifiDppConfiguratorActivityTest {
Robolectric.setupActivity(WifiDppConfiguratorActivity.class); Robolectric.setupActivity(WifiDppConfiguratorActivity.class);
} }
@Test
public void launchActivity_shouldAddFlagSecure() {
assertThat(mActivity.getWindow().getAttributes().flags & FLAG_SECURE)
.isEqualTo(FLAG_SECURE);
}
@Test @Test
public void handleIntent_isGuestUser_shouldFinish() { public void handleIntent_isGuestUser_shouldFinish() {
when(mUserManager.isGuestUser()).thenReturn(true); when(mUserManager.isGuestUser()).thenReturn(true);