Replace ECM AppOps call with service
A new ECM service was introcuded in changeId I831391e4437b51b3312b5273a2360bd029a3d8ee. We begin calling it, and update/cleanup method signatures to match. Note: There are two feature flags: 1. enhancedConfirmationModeApisEnabled - read only, protects the mainline API. 2. extendEcmToAllSettings - runtime - gates calls to the above APIs. We use both so we can ramp up in teamfood as needed. Bug: 297372999 Test: Tested on device Test: atest SpaPrivilegedLibTests Test: atest com.android.settings.applications.specialaccess.notificationaccess Test: atest com.android.settings.datausage Test: atest PremiumSmsAccessTest Test: atest RestrictedPreferenceHelperTest Change-Id: I945ec51df5cd63de548a8ffdd1acc4f09f2301e5
This commit is contained in:
@@ -16,7 +16,6 @@
|
||||
package com.android.settings.testutils.shadow;
|
||||
|
||||
import android.annotation.NonNull;
|
||||
import android.annotation.Nullable;
|
||||
import android.annotation.UserIdInt;
|
||||
import android.app.admin.DevicePolicyManager;
|
||||
import android.content.Context;
|
||||
@@ -122,9 +121,7 @@ public class ShadowRestrictedLockUtilsInternal {
|
||||
|
||||
@Implementation
|
||||
public static Intent checkIfRequiresEnhancedConfirmation(@NonNull Context context,
|
||||
@NonNull String restriction,
|
||||
int uid,
|
||||
@Nullable String packageName) {
|
||||
@NonNull String settingIdentifier, @NonNull String packageName) {
|
||||
if (ArrayUtils.contains(sEcmRestrictedPkgs, packageName)) {
|
||||
return new Intent();
|
||||
}
|
||||
@@ -132,6 +129,12 @@ public class ShadowRestrictedLockUtilsInternal {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Implementation
|
||||
public static boolean isEnhancedConfirmationRestricted(@NonNull Context context,
|
||||
@NonNull String settingIdentifier, @NonNull String packageName) {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static void setRestricted(boolean restricted) {
|
||||
sIsRestricted = restricted;
|
||||
}
|
||||
|
Reference in New Issue
Block a user