Merge "Cleanup notification channel slice" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-05-29 10:55:53 +00:00
committed by Android (Google) Code Review
17 changed files with 10 additions and 1618 deletions

View File

@@ -37,7 +37,6 @@ public class ShadowRestrictedLockUtilsInternal {
private static DevicePolicyManager sDevicePolicyManager;
private static String[] sDisabledTypes;
private static int sKeyguardDisabledFeatures;
private static boolean sIsSuspended;
@Resetter
public static void reset() {
@@ -46,7 +45,6 @@ public class ShadowRestrictedLockUtilsInternal {
sKeyguardDisabledFeatures = 0;
sDisabledTypes = new String[0];
sMaximumTimeToLockIsSet = false;
sIsSuspended = false;
}
@Implementation
@@ -103,12 +101,6 @@ public class ShadowRestrictedLockUtilsInternal {
return sMaximumTimeToLockIsSet ? new EnforcedAdmin() : null;
}
@Implementation
protected static EnforcedAdmin checkIfApplicationIsSuspended(Context context,
String packageName, int userId) {
return sIsSuspended ? new EnforcedAdmin() : null;
}
public static void setRestricted(boolean restricted) {
sIsRestricted = restricted;
}
@@ -140,8 +132,4 @@ public class ShadowRestrictedLockUtilsInternal {
public static void setMaximumTimeToLockIsSet(boolean isSet) {
sMaximumTimeToLockIsSet = isSet;
}
public static void setSuspended(boolean suspended) {
sIsRestricted = suspended;
}
}