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

Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb am: b3599ae3b6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902

Change-Id: I3940fb8e1333d051d12ddb5001717d473bf89d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-30 17:18:01 +00:00
committed by Automerger Merge Worker
parent d7b40a08fd b3599ae3b6
commit d82f2eae5c
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);