1436bcff72
We need to make the show sensitive content switch checked by default. The old implementation misses calling to super.updateState(), which caused lacking of UI refreshment. This change also added validation to the preference id that is used to construct the LockScreenNotificationShowSensitiveController, which avoids misusage. Added unit tests to verify that the UI is also updated upon Settings change, and the preference IDs are verified. Fix: 392621932 Flag: com.android.server.notification.notification_lock_screen_settings Test: manual Change-Id: I31fe602d5b5439515e5fdf5c706b420edaf79042
387 lines
15 KiB
Java
387 lines
15 KiB
Java
/*
|
|
* Copyright (C) 2019 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.notification;
|
|
|
|
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
|
|
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
|
|
import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS;
|
|
import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
|
|
|
|
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
|
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
|
|
|
import static com.google.common.truth.Truth.assertThat;
|
|
|
|
import static org.mockito.ArgumentMatchers.anyInt;
|
|
import static org.mockito.ArgumentMatchers.eq;
|
|
import static org.mockito.Mockito.when;
|
|
|
|
import android.app.KeyguardManager;
|
|
import android.app.admin.DevicePolicyManager;
|
|
import android.content.Context;
|
|
import android.content.pm.UserInfo;
|
|
import android.os.UserHandle;
|
|
import android.os.UserManager;
|
|
import android.provider.Settings;
|
|
|
|
import androidx.preference.PreferenceScreen;
|
|
|
|
import com.android.internal.widget.LockPatternUtils;
|
|
import com.android.settings.testutils.FakeFeatureFactory;
|
|
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
|
|
import com.android.settings.testutils.shadow.ShadowUtils;
|
|
import com.android.settingslib.RestrictedSwitchPreference;
|
|
|
|
import org.junit.After;
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
import org.mockito.Mock;
|
|
import org.mockito.MockitoAnnotations;
|
|
import org.robolectric.RobolectricTestRunner;
|
|
import org.robolectric.RuntimeEnvironment;
|
|
import org.robolectric.annotation.Config;
|
|
|
|
import java.util.Arrays;
|
|
|
|
@RunWith(RobolectricTestRunner.class)
|
|
@Config(shadows = {
|
|
ShadowUtils.class,
|
|
ShadowRestrictedLockUtilsInternal.class,
|
|
})
|
|
public class LockScreenNotificationShowSensitiveControllerTest {
|
|
|
|
@Mock
|
|
private DevicePolicyManager mDpm;
|
|
@Mock
|
|
UserManager mUm;
|
|
@Mock
|
|
KeyguardManager mKm;
|
|
@Mock
|
|
private PreferenceScreen mScreen;
|
|
@Mock
|
|
private LockPatternUtils mLockPatternUtils;
|
|
@Mock
|
|
private Context mMockContext;
|
|
|
|
private Context mContext;
|
|
private LockScreenNotificationShowSensitiveController mController;
|
|
private LockScreenNotificationShowSensitiveController mWorkController;
|
|
private RestrictedSwitchPreference mPreference;
|
|
private RestrictedSwitchPreference mWorkPreference;
|
|
|
|
@Before
|
|
public void setUp() {
|
|
MockitoAnnotations.initMocks(this);
|
|
mContext = RuntimeEnvironment.application;
|
|
|
|
FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
|
|
when(featureFactory.securityFeatureProvider.getLockPatternUtils(mMockContext))
|
|
.thenReturn(mLockPatternUtils);
|
|
when(mMockContext.getContentResolver()).thenReturn(mContext.getContentResolver());
|
|
when(mMockContext.getSystemService(UserManager.class)).thenReturn(mUm);
|
|
when(mMockContext.getSystemService(DevicePolicyManager.class)).thenReturn(mDpm);
|
|
when(mMockContext.getSystemService(KeyguardManager.class)).thenReturn(mKm);
|
|
when(mUm.getProfiles(anyInt())).thenReturn(Arrays.asList(new UserInfo(0, "", 0)));
|
|
|
|
mController = new LockScreenNotificationShowSensitiveController(
|
|
mMockContext,
|
|
LockScreenNotificationShowSensitiveController.KEY_SHOW_SENSITIVE
|
|
);
|
|
mPreference = new RestrictedSwitchPreference(mContext);
|
|
mPreference.setKey(mController.getPreferenceKey());
|
|
when(mScreen.findPreference(
|
|
mController.getPreferenceKey())).thenReturn(mPreference);
|
|
|
|
when(mUm.getProfiles(anyInt())).thenReturn(Arrays.asList(
|
|
new UserInfo(5, "", 0),
|
|
new UserInfo(10, "", UserInfo.FLAG_MANAGED_PROFILE | UserInfo.FLAG_PROFILE)));
|
|
mWorkController = new LockScreenNotificationShowSensitiveController(
|
|
mMockContext,
|
|
LockScreenNotificationShowSensitiveController.KEY_SHOW_SENSITIVE_WORK_PROFILE
|
|
);
|
|
mWorkPreference = new RestrictedSwitchPreference(mContext);
|
|
mWorkPreference.setKey(mWorkController.getPreferenceKey());
|
|
when(mScreen.findPreference(
|
|
mWorkController.getPreferenceKey())).thenReturn(mWorkPreference);
|
|
}
|
|
|
|
@After
|
|
public void tearDown() {
|
|
ShadowRestrictedLockUtilsInternal.reset();
|
|
}
|
|
|
|
@Test
|
|
public void profileUserIds() {
|
|
assertThat(mController.mWorkProfileUserId).isEqualTo(0);
|
|
assertThat(mWorkController.mWorkProfileUserId).isEqualTo(10);
|
|
}
|
|
|
|
@Test(expected = IllegalArgumentException.class)
|
|
public void validatePreferenceId() {
|
|
new LockScreenNotificationShowSensitiveController(
|
|
mMockContext,
|
|
"Illegal Key"
|
|
);
|
|
}
|
|
|
|
@Test
|
|
public void getAvailabilityStatus_noSecureLockscreen() {
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 0);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 10);
|
|
|
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
|
assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
|
}
|
|
|
|
@Test
|
|
public void getAvailabilityStatus_noWorkProfile() {
|
|
// reset controllers with no work profile
|
|
when(mUm.getProfiles(anyInt())).thenReturn(Arrays.asList(
|
|
new UserInfo(UserHandle.myUserId(), "", 0)));
|
|
mWorkController = new LockScreenNotificationShowSensitiveController(
|
|
mMockContext,
|
|
LockScreenNotificationShowSensitiveController.KEY_SHOW_SENSITIVE_WORK_PROFILE
|
|
);
|
|
mController = new LockScreenNotificationShowSensitiveController(mMockContext,
|
|
LockScreenNotificationShowSensitiveController.KEY_SHOW_SENSITIVE);
|
|
|
|
// should otherwise show
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 0);
|
|
|
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
|
assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
|
}
|
|
|
|
@Test
|
|
public void displayPreference_adminSaysNoRedaction() {
|
|
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
|
|
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
|
|
|
|
mController.displayPreference(mScreen);
|
|
assertThat(mPreference.isDisabledByAdmin()).isTrue();
|
|
mWorkController.displayPreference(mScreen);
|
|
assertThat(mWorkPreference.isDisabledByAdmin()).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void displayPreference_adminSaysNoSecure() {
|
|
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
|
|
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
|
|
|
|
mController.displayPreference(mScreen);
|
|
assertThat(mPreference.isDisabledByAdmin()).isTrue();
|
|
mWorkController.displayPreference(mScreen);
|
|
assertThat(mWorkPreference.isDisabledByAdmin()).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void displayPreference() {
|
|
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(0);
|
|
|
|
mController.displayPreference(mScreen);
|
|
assertThat(mPreference.isDisabledByAdmin()).isFalse();
|
|
mWorkController.displayPreference(mScreen);
|
|
assertThat(mWorkPreference.isDisabledByAdmin()).isFalse();
|
|
}
|
|
|
|
@Test
|
|
public void getAvailabilityStatus_adminSaysNoNotifications() {
|
|
when(mDpm.getKeyguardDisabledFeatures(eq(null), anyInt())).thenReturn(
|
|
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
|
|
|
|
// should show
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 0);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 10);
|
|
|
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
|
assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
|
}
|
|
|
|
@Test
|
|
public void getAvailabilityStatus_noNotifications() {
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
|
|
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
0, 0);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
0, 10);
|
|
|
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
|
assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
|
}
|
|
|
|
@Test
|
|
public void getAvailabilityStatus_workProfileLocked() {
|
|
// should otherwise show
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 0);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 10);
|
|
|
|
when(mKm.isDeviceLocked(10)).thenReturn(true);
|
|
|
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
|
assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
|
}
|
|
|
|
@Test
|
|
public void getAvailabilityStatus_show() {
|
|
// should show
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 0);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_SHOW_NOTIFICATIONS,
|
|
1, 10);
|
|
|
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
|
assertThat(mWorkController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
|
}
|
|
|
|
@Test
|
|
public void isChecked() {
|
|
// Given: screen is secure
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
|
|
|
|
// When: disable LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS
|
|
// then updateState, this mocks the mWorkController.mContentObserver.onChange()
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
0, 0);
|
|
mController.updateState(mPreference);
|
|
|
|
// Then: the toggle is unchecked
|
|
assertThat(mController.isChecked()).isFalse();
|
|
assertThat(mPreference.isChecked()).isFalse();
|
|
|
|
// When: enable LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS
|
|
// then updateState, this mocks the mWorkController.mContentObserver.onChange()
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
1, 0);
|
|
mController.updateState(mPreference);
|
|
|
|
// Then: the toggle is checked
|
|
assertThat(mController.isChecked()).isTrue();
|
|
assertThat(mPreference.isChecked()).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void isChecked_work() {
|
|
// Given: screen is secure
|
|
when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
|
|
|
|
// When: disable LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS for work profile
|
|
// then updateState, this mocks the mWorkController.mContentObserver.onChange()
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
0, 10);
|
|
mWorkController.updateState(mWorkPreference);
|
|
|
|
// Then: the toggle is unchecked
|
|
assertThat(mWorkController.isChecked()).isFalse();
|
|
assertThat(mWorkPreference.isChecked()).isFalse();
|
|
|
|
// When: enable LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS for work profile
|
|
// then updateState, this mocks the mWorkController.mContentObserver.onChange()
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
1, 10);
|
|
mWorkController.updateState(mWorkPreference);
|
|
|
|
// Then: the toggle is checked
|
|
assertThat(mWorkController.isChecked()).isTrue();
|
|
assertThat(mWorkPreference.isChecked()).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void isChecked_admin() {
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
1, 0);
|
|
|
|
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
|
|
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
|
|
|
|
assertThat(mController.isChecked()).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void setChecked_false() throws Exception {
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
0, 0);
|
|
|
|
mController.setChecked(false);
|
|
assertThat(Settings.Secure.getIntForUser(
|
|
mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0))
|
|
.isEqualTo(0);
|
|
}
|
|
|
|
@Test
|
|
public void setChecked_workProfile_true() throws Exception {
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
1, 10);
|
|
|
|
mWorkController.setChecked(true);
|
|
assertThat(Settings.Secure.getIntForUser(
|
|
mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 10))
|
|
.isEqualTo(1);
|
|
}
|
|
|
|
@Test
|
|
public void setChecked_true() throws Exception {
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
1, 0);
|
|
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
|
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
|
|
1, 10);
|
|
|
|
mController.setChecked(true);
|
|
mWorkController.setChecked(true);
|
|
assertThat(Settings.Secure.getIntForUser(
|
|
mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 10))
|
|
.isEqualTo(1);
|
|
assertThat(Settings.Secure.getIntForUser(
|
|
mContext.getContentResolver(), LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0))
|
|
.isEqualTo(1);
|
|
}
|
|
}
|
|
|