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

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

Remove flag check to sanitise keyboard shortcuts provided by apps. 

Flag has been rolled out. Flag definition to be removed in a follow up.

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:4784e90b02b7af2b8284c7d359ef675859156314)
Merged-In: Iaca90a21f6337cdf7b149cf11aa7656cfb3bada4
Change-Id: Iaca90a21f6337cdf7b149cf11aa7656cfb3bada4
parent bae20314

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES; 
import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;

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





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

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

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





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;
@@ -428,9 +427,7 @@ public final class KeyboardShortcutListSearch { 
                mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, false);

                mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, false);

            } else {

            } else {

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

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

                if (validateKeyboardShortcutHelperIconUri()) {

                KeyboardShortcuts.sanitiseShortcuts(result);

                KeyboardShortcuts.sanitiseShortcuts(result);

                }

                mSpecificAppGroup.addAll(

                mSpecificAppGroup.addAll(

                        reMapToKeyboardShortcutMultiMappingGroup(result));

                        reMapToKeyboardShortcutMultiMappingGroup(result));

                mKeySearchResultMap.put(SHORTCUT_SPECIFICAPP_INDEX, true);

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

        // Add specific Ime shortcuts

        if (result != null) {

        if (result != null) {

            if (!result.isEmpty()) {

            if (!result.isEmpty()) {

                if (validateKeyboardShortcutHelperIconUri()) {

                KeyboardShortcuts.sanitiseShortcuts(result);

                KeyboardShortcuts.sanitiseShortcuts(result);

                }

                mInputGroup.addAll(

                mInputGroup.addAll(

                        reMapToKeyboardShortcutMultiMappingGroup(result));

                        reMapToKeyboardShortcutMultiMappingGroup(result));

            }

            }

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

+2 −9
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES; 
import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;

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





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

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

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





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;
@@ -412,10 +411,7 @@ public final class KeyboardShortcuts { 
        mReceivedAppShortcutGroups =

        mReceivedAppShortcutGroups =

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

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





        if (validateKeyboardShortcutHelperIconUri()) {

        sanitiseShortcuts(mReceivedAppShortcutGroups);

        sanitiseShortcuts(mReceivedAppShortcutGroups);

        }



        maybeMergeAndShowKeyboardShortcuts();

        maybeMergeAndShowKeyboardShortcuts();

    }

    }
@@ -423,10 +419,7 @@ public final class KeyboardShortcuts { 
        mReceivedImeShortcutGroups =

        mReceivedImeShortcutGroups =

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

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





        if (validateKeyboardShortcutHelperIconUri()) {

        sanitiseShortcuts(mReceivedImeShortcutGroups);

        sanitiseShortcuts(mReceivedImeShortcutGroups);

        }



        maybeMergeAndShowKeyboardShortcuts();

        maybeMergeAndShowKeyboardShortcuts();

    }

    }

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

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




import android.graphics.drawable.Icon;

import android.graphics.drawable.Icon;

import android.os.Handler;

import android.os.Handler;

import android.platform.test.annotations.EnableFlags;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutInfo;

import android.view.KeyboardShortcutInfo;

import android.view.WindowManager;

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

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;





import com.google.android.material.bottomsheet.BottomSheetDialog;

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

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestAppKeyboardShortcuts_callback_sanitisesIcons() {

    public void requestAppKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

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

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestImeKeyboardShortcuts_callback_sanitisesIcons() {

    public void requestImeKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

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

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

import android.app.Dialog;

import android.graphics.drawable.Icon;

import android.graphics.drawable.Icon;

import android.os.Handler;

import android.os.Handler;

import android.platform.test.annotations.EnableFlags;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutGroup;

import android.view.KeyboardShortcutInfo;

import android.view.KeyboardShortcutInfo;

import android.view.WindowManager;

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

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;





import org.junit.Before;

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

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestAppKeyboardShortcuts_callback_sanitisesIcons() {

    public void requestAppKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

        KeyboardShortcuts.toggle(mContext, DEVICE_ID);

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

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_VALIDATE_KEYBOARD_SHORTCUT_HELPER_ICON_URI)

    public void requestImeKeyboardShortcuts_callback_sanitisesIcons() {

    public void requestImeKeyboardShortcuts_callback_sanitisesIcons() {

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

        KeyboardShortcutGroup group = createKeyboardShortcutGroupForIconTests();

        KeyboardShortcuts.toggle(mContext, DEVICE_ID);

        KeyboardShortcuts.toggle(mContext, DEVICE_ID);