Merge "[ECM] Legacy code: treat DEFAULT as ALLOWED (st)" into main
This commit is contained in:
@@ -267,7 +267,8 @@ public class RestrictedPreferenceHelper {
|
|||||||
preference.getUid(), preference.getPackageName());
|
preference.getUid(), preference.getPackageName());
|
||||||
final boolean ecmEnabled = mContext.getResources().getBoolean(
|
final boolean ecmEnabled = mContext.getResources().getBoolean(
|
||||||
com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
|
com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
|
||||||
appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;
|
appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED
|
||||||
|
|| mode == AppOpsManager.MODE_DEFAULT;
|
||||||
serviceAllowed = appOpsAllowed;
|
serviceAllowed = appOpsAllowed;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// Allow service in case if app ops is not available in testing.
|
// Allow service in case if app ops is not available in testing.
|
||||||
|
Reference in New Issue
Block a user