Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c49bead1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6286840 from 48cfaff0 to rvc-release

Change-Id: I22dab051208e2ac6bb686185ee62b064c27e7f4a
parents 2d0b6cf2 48cfaff0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -449,9 +449,9 @@
    <string name="accessibility_service_dialog_bottom_text_multiple">These apps can view your screen, actions, and inputs, perform actions, and control the display.</string>

    <!-- Label for the assistant role. [CHAR LIMIT=30] -->
    <string name="role_assistant_label">Default assist app</string>
    <string name="role_assistant_label">Default digital assistant app</string>
    <!-- Short label for the assistant role. [CHAR LIMIT=30] -->
    <string name="role_assistant_short_label">Assist app</string>
    <string name="role_assistant_short_label">Digital assistant app</string>
    <!-- Description for the assistant role. [CHAR LIMIT=NONE] -->
    <string name="role_assistant_description">Assist apps can help you based on information from the screen you\u2019re viewing. Some apps support both launcher and voice input services to give you integrated assistance.</string>
    <!-- Template for the title when an app requests to become the default assistant app. [CHAR LIMIT=100] -->
+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ private suspend fun revokePermissionsOnUnusedApps(context: Context) {
        val whitelistAppOpMode =
            AppOpLiveData[pkg.packageName, OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED, pkg.uid]
                .getInitializedValue()
        if (whitelistAppOpMode == AppOpsManager.MODE_IGNORED) {
        if (whitelistAppOpMode == AppOpsManager.MODE_IGNORED
                || whitelistAppOpMode == AppOpsManager.MODE_DEFAULT) {
            // User exempt
            return@forEachInParallel
        }