Merge changes I10121f29,Iaca90a21 into main (24630204) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1338,16 +1338,6 @@ flag {
	}		}
	}		}

	flag {
	name: "validate_keyboard_shortcut_helper_icon_uri"
	namespace: "systemui"
	description: "Adds a check that the caller can access the content URI of an icon in the shortcut helper."
	bug: "331180422"
	metadata {
	purpose: PURPOSE_BUGFIX
	}
	}

	flag {		flag {
	name: "glanceable_hub_allow_keyguard_when_dreaming"		name: "glanceable_hub_allow_keyguard_when_dreaming"
	namespace: "systemui"		namespace: "systemui"

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;
	@@ -427,9 +426,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);
	@@ -445,9 +442,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);