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

Commit f1a15b5e authored by Ben Murdoch's avatar Ben Murdoch Committed by Android Build Coastguard Worker
Browse files

RESTRICT AUTOMERGE Remove flag check to sanitise keyboard shortcuts provided by apps. 

Flag has been rolled out.

Bug: 331180422
Flag: EXEMPT removing com.android.systemui.validate_keyboard_shortcut_helper_icon_uri
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e1bee47e162d62984dd5f21686fed1cff19f6c21)
Merged-In: Iaca90a21f6337cdf7b149cf11aa7656cfb3bada4
Change-Id: Iaca90a21f6337cdf7b149cf11aa7656cfb3bada4
parent 4c269d7b

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java

+2 −8
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.systemui.statusbar; 
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;



import static com.android.systemui.Flags.validateKeyboardShortcutHelperIconUri;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.AppGlobals;
@@ -426,9 +424,7 @@ public final class KeyboardShortcutListSearch { 
                mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, false);

            } else {

                mCurrentAppPackageName = result.get(0).getPackageName();

                if (validateKeyboardShortcutHelperIconUri()) {

                KeyboardShortcuts.sanitiseShortcuts(result);

                }

                mSpecificAppGroup.addAll(

                        reMapToKeyboardShortcutMultiMappingGroup(result));

                mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, true);
@@ -444,9 +440,7 @@ public final class KeyboardShortcutListSearch { 
        // Add specific Ime shortcuts

        if (result != null) {

            if (!result.isEmpty()) {

                if (validateKeyboardShortcutHelperIconUri()) {

                KeyboardShortcuts.sanitiseShortcuts(result);

                }

                mInputGroup.addAll(

                        reMapToKeyboardShortcutMultiMappingGroup(result));

            }

packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

+2 −10
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import static android.content.Context.LAYOUT_INFLATER_SERVICE; 
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;



import static com.android.systemui.Flags.validateKeyboardShortcutHelperIconUri;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.AlertDialog;
@@ -407,10 +405,7 @@ public final class KeyboardShortcuts { 
        mReceivedAppShortcutGroups =

                result == null ? Collections.emptyList() : result;



        if (validateKeyboardShortcutHelperIconUri()) {

        sanitiseShortcuts(mReceivedAppShortcutGroups);

        }



        maybeMergeAndShowKeyboardShortcuts();

    }
@@ -418,10 +413,7 @@ public final class KeyboardShortcuts { 
        mReceivedImeShortcutGroups =

                result == null ? Collections.emptyList() : result;



        if (validateKeyboardShortcutHelperIconUri()) {

        sanitiseShortcuts(mReceivedImeShortcutGroups);

        }



        maybeMergeAndShowKeyboardShortcuts();

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutListSearchTest.java

+0 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.when; 


import android.graphics.drawable.Icon;

import android.os.Handler;

import android.platform.test.annotations.EnableFlags;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutInfo;

import android.view.WindowManager;
@@ -34,7 +33,6 @@ import android.view.WindowManager; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;



import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -93,7 +91,6 @@ public class KeyboardShortcutListSearchTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestAppKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();
@@ -112,7 +109,6 @@ public class KeyboardShortcutListSearchTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestImeKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsTest.java

+0 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.annotation.Nullable; 
import android.app.Dialog;

import android.graphics.drawable.Icon;

import android.os.Handler;

import android.platform.test.annotations.EnableFlags;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutInfo;

import android.view.WindowManager;
@@ -39,7 +38,6 @@ import android.view.WindowManager; 
import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;



import org.junit.Before;
@@ -128,7 +126,6 @@ public class KeyboardShortcutsTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestAppKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

        KeyboardShortcuts.toggle(mContext, DEVICE_ID);
@@ -140,7 +137,6 @@ public class KeyboardShortcutsTest extends SysuiTestCase { 
    }



    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestImeKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

        KeyboardShortcuts.toggle(mContext, DEVICE_ID);