diff options
5 files changed, 12 insertions, 12 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt index 8e1721219..33abe3e74 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt @@ -207,7 +207,8 @@ suspend fun revokeAppPermissions( permName, false, SERVER_LOG_ID, - /* permission_rationale_shown = */ false + /* permission_rationale_shown = */ false, + /* TODO: 324254847 use real ECM value */ false ) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java b/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java index 3e7ebfec0..8181531c2 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java @@ -746,7 +746,8 @@ public final class PermissionControllerServiceImpl extends PermissionControllerL PermissionControllerStatsLog.write( PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED, requestId, uid, packageName, permName, false, r, - /* permission_rationale_shown = */ false); + /* permission_rationale_shown = */ false, + /* TODO: 324254847 use real ECM value */ false); } } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt index dca1cbf3a..7bea02800 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt @@ -1021,7 +1021,8 @@ class GrantPermissionsViewModel( permission, isImplicit, result, - isPermissionRationaleShown + isPermissionRationaleShown, + /* TODO: 324254847 use real ECM value */ false ) } diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml index ef85fdf60..6261e52c6 100644 --- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml +++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml @@ -5051,7 +5051,7 @@ @hide @FlaggedApi("android.app.ondeviceintelligence.flags.enable_ondevice_intelligence") --> - <permission android:name="android.permission.BIND_ON_DEVICE_TRUSTED_SERVICE" + <permission android:name="android.permission.BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE" android:protectionLevel="signature"/> @@ -6632,13 +6632,6 @@ <permission android:name="android.permission.USE_BIOMETRIC_INTERNAL" android:protectionLevel="signature" /> - <!-- Allows privileged apps to access the background face authentication. - @SystemApi - @FlaggedApi("android.hardware.biometrics.face_background_authentication") - @hide --> - <permission android:name="android.permission.USE_BACKGROUND_FACE_AUTHENTICATION" - android:protectionLevel="signature|privileged" /> - <!-- Allows the system to control the BiometricDialog (SystemUI). Reserved for the system. @hide --> <permission android:name="android.permission.MANAGE_BIOMETRIC_DIALOG" android:protectionLevel="signature" /> diff --git a/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt index f8c7d4f51..614b59f3c 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt @@ -31,6 +31,7 @@ import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity +import com.android.modules.utils.build.SdkLevel import java.util.regex.Pattern import org.junit.Assert.assertTrue import org.junit.Assume @@ -50,7 +51,6 @@ class SensorBlockedBannerTest : BaseUsePermissionTest() { private val sensorPrivacyManager = context.getSystemService(SensorPrivacyManager::class.java)!! private val locationManager = context.getSystemService(LocationManager::class.java)!! - private val safetyCenterManager = context.getSystemService(SafetyCenterManager::class.java)!! private val sensorToPermissionGroup = mapOf( @@ -122,7 +122,11 @@ class SensorBlockedBannerTest : BaseUsePermissionTest() { @Test fun testCardClickOpenPrivacyControls() { + Assume.assumeTrue(SdkLevel.isAtLeastT()) Assume.assumeTrue(sensorPrivacyManager.supportsSensorToggle(CAMERA)) + val safetyCenterManager = context.getSystemService(SafetyCenterManager::class.java) + Assume.assumeNotNull(safetyCenterManager) + var isSafetyCenterEnabled = false runWithShellPermissionIdentity { isSafetyCenterEnabled = safetyCenterManager.isSafetyCenterEnabled |