diff options
6 files changed, 7 insertions, 16 deletions
diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt index ceac6c3a7..7d6e56a70 100644 --- a/PermissionController/jarjar-rules.txt +++ b/PermissionController/jarjar-rules.txt @@ -34,8 +34,4 @@ rule com.android.permission.flags.*FeatureFlags* com.android.permissioncontrolle rule com.android.permission.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.Flags com.android.permissioncontroller.jarjar.@0 -rule com.android.settingslib.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule com.android.settingslib.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule com.android.settingslib.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 -rule com.android.settingslib.flags.Flags com.android.permissioncontroller.jarjar.@0 # LINT.ThenChange(PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java:applyJarjarTransform) diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml index 1339152d7..78017c32e 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -155,13 +155,9 @@ minSdkVersion="35" optionalMinSdkVersion="34" /> <permission name="android.permission.EMBED_ANY_APP_IN_UNTRUSTED_MODE" minSdkVersion="35" /> - <permission name="android.permission.READ_SYSTEM_PREFERENCES" - featureFlag="com.android.settingslib.flags.Flags.settingsCatalyst" /> </permissions> <app-op-permissions> <app-op-permission name="android.permission.SYSTEM_ALERT_WINDOW" /> - <app-op-permission name="android.permission.WRITE_SYSTEM_PREFERENCES" - featureFlag="com.android.settingslib.flags.Flags.writeSystemPreferencePermissionEnabled" /> </app-op-permissions> </role> diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp index f89fd140c..9f217660a 100644 --- a/PermissionController/role-controller/Android.bp +++ b/PermissionController/role-controller/Android.bp @@ -32,7 +32,6 @@ java_library { ], static_libs: [ "modules-utils-build_system", - "aconfig_settingslib_exported_flags_java_lib", "android.app.appfunctions.exported-flags-aconfig-java", "android.companion.virtualdevice.flags-aconfig-java-export", "android.content.pm.flags-aconfig-java-export", diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index bad5c7666..d9833ca56 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -42,10 +42,6 @@ rule com.android.safetycenter.annotations.** com.android.permission.jarjar.@0 rule com.android.safetycenter.internaldata.** com.android.permission.jarjar.@0 rule com.android.safetycenter.pendingintents.** com.android.permission.jarjar.@0 rule com.android.safetycenter.resources.** com.android.permission.jarjar.@0 -rule com.android.settingslib.flags.*FeatureFlags* com.android.permission.jarjar.@0 -rule com.android.settingslib.flags.FeatureFlags* com.android.permission.jarjar.@0 -rule com.android.settingslib.flags.FeatureFlags com.android.permission.jarjar.@0 -rule com.android.settingslib.flags.Flags com.android.permission.jarjar.@0 rule com.google.protobuf.** com.android.permission.jarjar.@0 rule kotlin.** com.android.permission.jarjar.@0 rule com.android.permissioncontroller.PermissionControllerStatsLog com.android.permission.jarjar.@0 diff --git a/service/java/com/android/ecm/EnhancedConfirmationService.java b/service/java/com/android/ecm/EnhancedConfirmationService.java index 1cc3a743e..64b5724a2 100644 --- a/service/java/com/android/ecm/EnhancedConfirmationService.java +++ b/service/java/com/android/ecm/EnhancedConfirmationService.java @@ -37,7 +37,6 @@ import android.app.ecm.IEnhancedConfirmationManager; import android.app.role.RoleManager; import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.InstallSourceInfo; import android.content.pm.PackageInstaller; @@ -48,7 +47,6 @@ import android.database.Cursor; import android.net.Uri; import android.os.Binder; import android.os.Build; -import android.os.Bundle; import android.os.Looper; import android.os.SystemClock; import android.os.SystemConfigManager; @@ -691,10 +689,13 @@ public class EnhancedConfirmationService extends SystemService { // telephony service is unavailable. } UserHandle user = mContext.getUser(); + /* + TODO b/408470449: reenable once call extras are fixed Bundle extras = call.getDetails().getExtras(); if (extras != null) { user = extras.getParcelable(Intent.EXTRA_USER_HANDLE, UserHandle.class); } + */ if (number != null) { return hasContactWithPhoneNumber(number, user) ? CALL_TYPE_TRUSTED : CALL_TYPE_UNTRUSTED; diff --git a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt index 9a4908c79..c1fca6398 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt @@ -25,6 +25,7 @@ import android.content.pm.PackageManager import android.net.Uri import android.os.Build import android.os.Process +import android.os.UserManager import android.permission.flags.Flags import android.platform.test.annotations.AppModeFull import android.platform.test.annotations.RequiresFlagsEnabled @@ -68,9 +69,11 @@ class EnhancedConfirmationInCallTest { val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() @Before - fun assumeNotAutoOrTv() { + fun assumeNotAutoTvOrHsum() { Assume.assumeFalse(packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) Assume.assumeFalse(packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) + // TODO b/408470449: remove once call extras are fixed + Assume.assumeFalse(UserManager.isHeadlessSystemUserMode()) } companion object { |