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

Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb am: 34471a7160

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

Change-Id: I27396019f31117f69f9088174ed52c6ce3526556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-02 00:35:02 +00:00
committed by Automerger Merge Worker
parent 0c688c9e7c 34471a7160
commit 8b23aa2c16
2 changed files with 12 additions and 0 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,6 +28,7 @@ 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;
@@ -99,6 +100,7 @@ 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);

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

@@ -16,6 +16,10 @@
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;
@@ -72,6 +76,12 @@ 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);