Merge "Revert "Snap for 6792834 from edbf3411d2c91f38a1a5d93b9e5b338052..."" (2d0adaf8) · Commits · e / os / android_frameworks_base

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5579,7 +5579,7 @@ package android.window {
		method @BinderThread public void onTaskInfoChanged(@NonNull android.app.ActivityManager.RunningTaskInfo);
		method @BinderThread public void onTaskVanished(@NonNull android.app.ActivityManager.RunningTaskInfo);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public final void registerOrganizer();
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setInterceptBackPressedOnTaskRoot(boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void setInterceptBackPressedOnTaskRoot(@NonNull android.window.WindowContainerToken, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public static void setLaunchRoot(int, @NonNull android.window.WindowContainerToken);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public final void unregisterOrganizer();
		}

core/java/android/inputmethodservice/TEST_MAPPING

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		{
		"imports": [
		{
		"path": "frameworks/base/core/java/android/view/inputmethod"
		}
		]
		}

core/java/android/telephony/PhoneStateListener.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -950,10 +950,6 @@ public class PhoneStateListener {
		* This method will be called when an emergency call is placed on any subscription (including
		* the no-SIM case), regardless of which subscription this listener was registered on.
		*
		* This method is deprecated. Both this method and the new
		* {@link #onOutgoingEmergencyCall(EmergencyNumber, int)} will be called when an outgoing
		* emergency call is placed.
		*
		* @param placedEmergencyNumber The {@link EmergencyNumber} the emergency call was placed to.
		*
		* @deprecated Use {@link #onOutgoingEmergencyCall(EmergencyNumber, int)}.
		@@ -972,22 +968,24 @@ public class PhoneStateListener {
		* This method will be called when an emergency call is placed on any subscription (including
		* the no-SIM case), regardless of which subscription this listener was registered on.
		*
		* Both this method and the deprecated {@link #onOutgoingEmergencyCall(EmergencyNumber)} will be
		* called when an outgoing emergency call is placed. You should only implement one of these
		* methods.
		* The default implementation of this method calls
		* {@link #onOutgoingEmergencyCall(EmergencyNumber)} for backwards compatibility purposes. Do
		* not call {@code super(...)} from within your implementation unless you want
		* {@link #onOutgoingEmergencyCall(EmergencyNumber)} to be called as well.
		*
		* @param placedEmergencyNumber The {@link EmergencyNumber} the emergency call was placed to.
		* @param subscriptionId The subscription ID used to place the emergency call. If the
		* emergency call was placed without a valid subscription (e.g. when there
		* are no SIM cards in the device), this will be equal to
		* {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber,
		int subscriptionId) {
		// Default implementation for backwards compatibility
		onOutgoingEmergencyCall(placedEmergencyNumber);
		}

		/**
		@@ -1373,10 +1371,6 @@ public class PhoneStateListener {
		PhoneStateListener psl = mPhoneStateListenerWeakRef.get();
		if (psl == null) return;

		Binder.withCleanCallingIdentity(
		() -> mExecutor.execute(
		() -> psl.onOutgoingEmergencyCall(placedEmergencyNumber)));

		Binder.withCleanCallingIdentity(
		() -> mExecutor.execute(
		() -> psl.onOutgoingEmergencyCall(placedEmergencyNumber,

core/java/android/view/inputmethod/TEST_MAPPING

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"name": "CtsAutoFillServiceTestCases",
		"options": [
		{
		"include-filter": "android.autofillservice.cts.inline"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		{
		"exclude-annotation": "android.platform.test.annotations.AppModeFull"
		}
		]
		}
		]
		}

core/java/android/window/ITaskOrganizerController.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -60,5 +60,6 @@ interface ITaskOrganizerController {
		* Requests that the given task organizer is notified when back is pressed on the root activity
		* of one of its controlled tasks.
		*/
		void setInterceptBackPressedOnTaskRoot(ITaskOrganizer organizer, boolean interceptBackPressed);
		void setInterceptBackPressedOnTaskRoot(in WindowContainerToken task,
		boolean interceptBackPressed);
		}