Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, 4564351, 4564352, 4564333, 4564033, 4560455, 4564034, 4560674, 4560675, 4563620, 4561607, 4561062, 4561063] into pi-release
Change-Id: Ie308d644fd0a0f4f72fd54d7bf86c1cf63e720b7
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 0ad882d..72f4aa3 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -59,6 +59,7 @@
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserDialogs;
import com.android.settingslib.RestrictedLockUtils;
@@ -425,6 +426,9 @@
mDPM.setActiveAdmin(mDeviceAdmin.getComponent(), mRefreshing);
EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_ACTIVATED_BY_USER,
mDeviceAdmin.getActivityInfo().applicationInfo.uid);
+
+ unrestrictAppIfPossible(BatteryUtils.getInstance(this));
+
setResult(Activity.RESULT_OK);
} catch (RuntimeException e) {
// Something bad happened... could be that it was
@@ -446,6 +450,15 @@
finish();
}
+ void unrestrictAppIfPossible(BatteryUtils batteryUtils) {
+ // Unrestrict admin app if it is already been restricted
+ final String packageName = mDeviceAdmin.getComponent().getPackageName();
+ final int uid = batteryUtils.getPackageUid(packageName);
+ if (batteryUtils.isForceAppStandbyEnabled(uid, packageName)) {
+ batteryUtils.setForceAppStandby(uid, packageName, AppOpsManager.MODE_ALLOWED);
+ }
+ }
+
void continueRemoveAction(CharSequence msg) {
if (!mWaitingForRemoveMsg) {
return;
diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java
index dac90ef..8dc802c 100644
--- a/src/com/android/settings/notification/VisibilityPreferenceController.java
+++ b/src/com/android/settings/notification/VisibilityPreferenceController.java
@@ -147,8 +147,10 @@
}
private boolean getLockscreenNotificationsEnabled() {
- return Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0;
+ final UserInfo parentUser = mUm.getProfileParent(UserHandle.myUserId());
+ final int primaryUserId = parentUser != null ? parentUser.id : UserHandle.myUserId();
+ return Settings.Secure.getIntForUser(mContext.getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId) != 0;
}
private boolean getLockscreenAllowPrivateNotifications() {
diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
index 1a4ce89..1602f15 100644
--- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
+++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java
@@ -18,23 +18,37 @@
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import android.app.AppOpsManager;
+import android.app.admin.DeviceAdminInfo;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
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;
import org.robolectric.Robolectric;
@RunWith(SettingsRobolectricTestRunner.class)
public class DeviceAdminAddTest {
+ private static final int UID = 12345;
+ private static final String PACKAGE_NAME = "com.android.test.device.admin";
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private DeviceAdminInfo mDeviceAdmin;
+ @Mock
+ private BatteryUtils mBatteryUtils;
private FakeFeatureFactory mFeatureFactory;
private DeviceAdminAdd mDeviceAdminAdd;
@@ -44,6 +58,10 @@
mFeatureFactory = FakeFeatureFactory.setupForTest();
mDeviceAdminAdd = Robolectric.buildActivity(DeviceAdminAdd.class).get();
+
+ doReturn(UID).when(mBatteryUtils).getPackageUid(PACKAGE_NAME);
+ when(mDeviceAdmin.getComponent().getPackageName()).thenReturn(PACKAGE_NAME);
+ mDeviceAdminAdd.mDeviceAdmin = mDeviceAdmin;
}
@Test
@@ -56,4 +74,23 @@
verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_DENY), eq("app"));
}
+
+ @Test
+ public void unrestrictAppIfPossible_appRestricted_unrestrictApp() {
+ doReturn(true).when(mBatteryUtils).isForceAppStandbyEnabled(UID, PACKAGE_NAME);
+
+ mDeviceAdminAdd.unrestrictAppIfPossible(mBatteryUtils);
+
+ verify(mBatteryUtils).setForceAppStandby(UID, PACKAGE_NAME, AppOpsManager.MODE_ALLOWED);
+ }
+
+ @Test
+ public void unrestrictAppIfPossible_appUnrestricted_doNothing() {
+ doReturn(false).when(mBatteryUtils).isForceAppStandbyEnabled(UID, PACKAGE_NAME);
+
+ mDeviceAdminAdd.unrestrictAppIfPossible(mBatteryUtils);
+
+ verify(mBatteryUtils, never()).setForceAppStandby(UID, PACKAGE_NAME,
+ AppOpsManager.MODE_ALLOWED);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
index e37c852..fbc2512 100644
--- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
@@ -209,6 +209,31 @@
}
@Test
+ public void testUpdateState_noLockScreenNotificationsGloballyInProfile() {
+ final int primaryUserId = 2;
+ final UserInfo primaryUserInfo = new UserInfo(primaryUserId, "user 2", 0);
+ when(mUm.getProfileParent(anyInt())).thenReturn(primaryUserInfo);
+
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId);
+
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ NotificationChannel channel = mock(NotificationChannel.class);
+ mController.onResume(appRow, channel, null, null);
+
+ RestrictedListPreference pref = mock(RestrictedListPreference.class);
+ mController.updateState(pref);
+
+ ArgumentCaptor<CharSequence[]> argumentCaptor =
+ ArgumentCaptor.forClass(CharSequence[].class);
+ verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
+ assertFalse(toStringList(argumentCaptor.getValue())
+ .contains(String.valueOf(VISIBILITY_NO_OVERRIDE)));
+ assertFalse(toStringList(argumentCaptor.getValue())
+ .contains(String.valueOf(VISIBILITY_PRIVATE)));
+ }
+
+ @Test
public void testUpdateState_noPrivateLockScreenNotificationsGlobally() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1);
