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

Prevent apps from displaying over Settings

Browse Source 
Specifically, the DrawOverlayDetails fragment only.

Bug: 36070413
Test: make RunSettingsRoboTests -j100
Change-Id: I0069f0cacf8c963c8c6878dc89a32b205983a568
This commit is contained in:
Christine Franks
2017-03-15 15:13:44 -07:00
parent 418e5bffda
commit c50403c606
4 changed files with 116 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
View File

@@ -19,10 +19,11 @@ package com.android.settings.applications;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsUsageMonitor;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.core.TouchOverlayManager;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowPreferenceFragment;
import org.junit.Before;
import org.junit.Test;
@@ -32,6 +33,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@@ -47,17 +49,22 @@ public class DrawOverlayDetailsTest {
private FakeFeatureFactory mFeatureFactory;
private DrawOverlayDetails mFragment;
@Mock
private TouchOverlayManager mTouchOverlayManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mFragment = new DrawOverlayDetails();
mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
ReflectionHelpers.setField(mFragment, "mTouchOverlayManager", mTouchOverlayManager);
}
@Test
public void logSpecialPermissionChange() {
mFragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
mFragment.logSpecialPermissionChange(true, "app");
verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW), eq("app"));
@@ -66,4 +73,18 @@ public class DrawOverlayDetailsTest {
verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_APPDRAW_DENY), eq("app"));
}
@Test
@Config(shadows = ShadowPreferenceFragment.class)
public void onStart_disableOverlay() {
mFragment.onStart();
verify(mTouchOverlayManager).setOverlayAllowed(false);
}
@Test
@Config(shadows = ShadowPreferenceFragment.class)
public void onStop_enableOverlay() {
mFragment.onStop();
verify(mTouchOverlayManager).setOverlayAllowed(true);
}
}