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:
@@ -21,6 +21,7 @@ import android.os.UserHandle;
|
||||
import android.text.TextUtils;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
|
||||
@@ -128,11 +129,11 @@ public class RestrictedAppPreference extends AppPreference {
|
||||
/**
|
||||
* Checks if the given setting is subject to Enhanced Confirmation Mode restrictions for this
|
||||
* package. Marks the preference as disabled if so.
|
||||
* @param restriction The key identifying the setting
|
||||
* @param packageName the package to check the restriction for
|
||||
* @param uid the uid of the package
|
||||
* @param settingIdentifier The key identifying the setting
|
||||
* @param packageName the package to check the settingIdentifier for
|
||||
*/
|
||||
public void checkEcmRestrictionAndSetDisabled(String restriction, String packageName, int uid) {
|
||||
mHelper.checkEcmRestrictionAndSetDisabled(restriction, packageName, uid);
|
||||
public void checkEcmRestrictionAndSetDisabled(@NonNull String settingIdentifier,
|
||||
@NonNull String packageName) {
|
||||
mHelper.checkEcmRestrictionAndSetDisabled(settingIdentifier, packageName);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user