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

Merge "Changes to "Alarms and Reminders" permission" into sc-dev am: 39086c24fd

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

Change-Id: I644442b4d41b343bfc1aebcc2c42ac2f9dc7ce82
This commit is contained in:
Suprabh Shukla
2021-04-09 23:00:09 +00:00
committed by Automerger Merge Worker
parent 83770d66ff 39086c24fd
commit a4d354f673
4 changed files with 193 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailsTest.java
View File

@@ -27,7 +27,6 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
import com.android.settings.applications.AppStateAppOpsBridge;
import com.android.settingslib.RestrictedSwitchPreference;
import org.junit.Before;
@@ -48,7 +47,7 @@ public class AlarmsAndRemindersDetailsTest {
@Mock
private AppStateAlarmsAndRemindersBridge mAppStateBridge;
@Mock
private AppStateAppOpsBridge.PermissionState mPermissionState;
private AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState mPermissionState;
private AlarmsAndRemindersDetails mFragment = new AlarmsAndRemindersDetails();
@@ -96,12 +95,12 @@ public class AlarmsAndRemindersDetailsTest {
mPackageInfo.applicationInfo = new ApplicationInfo();
when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
.thenReturn(mPermissionState);
mPermissionState.permissionDeclared = false;
when(mPermissionState.shouldBeVisible()).thenReturn(false);
mFragment.refreshUi();
verify(mSwitchPref).setEnabled(false);
mPermissionState.permissionDeclared = true;
when(mPermissionState.shouldBeVisible()).thenReturn(true);
mFragment.refreshUi();
verify(mSwitchPref).setEnabled(true);
@@ -114,11 +113,11 @@ public class AlarmsAndRemindersDetailsTest {
when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
.thenReturn(mPermissionState);
when(mPermissionState.isPermissible()).thenReturn(true);
when(mPermissionState.isAllowed()).thenReturn(true);
mFragment.refreshUi();
verify(mSwitchPref).setChecked(true);
when(mPermissionState.isPermissible()).thenReturn(false);
when(mPermissionState.isAllowed()).thenReturn(false);
mFragment.refreshUi();
verify(mSwitchPref).setChecked(false);
}

114
tests/unit/src/com/android/settings/applications/AppStateAlarmsAndRemindersBridgeTest.java Normal file
View File

@@ -0,0 +1,114 @@
/*
* Copyright (C) 2021 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.applications;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import android.app.AlarmManager;
import android.content.Context;
import android.os.UserHandle;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class AppStateAlarmsAndRemindersBridgeTest {
private static final String TEST_PACKAGE_1 = "com.example.test.1";
private static final String TEST_PACKAGE_2 = "com.example.test.2";
private static final int UID_1 = 12345;
private static final int UID_2 = 7654321;
@Mock
private AlarmManager mAlarmManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Before
public void initMocks() {
MockitoAnnotations.initMocks(this);
}
@Test
public void shouldBeVisible_permissionRequestedIsTrue_isTrue() {
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
true /* permissionRequested */,
true /* permissionGranted */)
.shouldBeVisible()).isTrue();
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
true /* permissionRequested */,
false /* permissionGranted */)
.shouldBeVisible()).isTrue();
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
false /* permissionRequested */,
true /* permissionGranted */)
.shouldBeVisible()).isFalse();
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
false /* permissionRequested */,
false /* permissionGranted */)
.shouldBeVisible()).isFalse();
}
@Test
public void isAllowed_permissionGrantedIsTrue_isTrue() {
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
true /* permissionRequested */,
true /* permissionGranted */)
.isAllowed()).isTrue();
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
true /* permissionRequested */,
false /* permissionGranted */)
.isAllowed()).isFalse();
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
false /* permissionRequested */,
true /* permissionGranted */)
.isAllowed()).isTrue();
assertThat(new AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState(
false /* permissionRequested */,
false /* permissionGranted */)
.isAllowed()).isFalse();
}
@Test
public void createPermissionState() {
AppStateAlarmsAndRemindersBridge bridge = new AppStateAlarmsAndRemindersBridge(mContext,
null, null);
bridge.mAlarmManager = mAlarmManager;
bridge.mRequesterPackages = new String[]{TEST_PACKAGE_1, "some.other.package"};
doReturn(false).when(mAlarmManager).hasScheduleExactAlarm(TEST_PACKAGE_1,
UserHandle.getUserId(UID_1));
doReturn(true).when(mAlarmManager).hasScheduleExactAlarm(TEST_PACKAGE_2,
UserHandle.getUserId(UID_2));
AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState state1 =
bridge.createPermissionState(TEST_PACKAGE_1, UID_1);
assertThat(state1.shouldBeVisible()).isTrue();
assertThat(state1.isAllowed()).isFalse();
AppStateAlarmsAndRemindersBridge.AlarmsAndRemindersState state2 =
bridge.createPermissionState(TEST_PACKAGE_2, UID_2);
assertThat(state2.shouldBeVisible()).isFalse();
assertThat(state2.isAllowed()).isTrue();
}
}