Snap for 6667244 from dc26c091d975767c6cae98bef855c391687254d3 to rvc-qpr1-release (84204d15) · Commits · e / os / android_frameworks_base

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ package android {
		public static final class R.bool {
		field public static final int config_assistantOnTopOfDream = 17891333; // 0x1110005
		field public static final int config_perDisplayFocusEnabled = 17891332; // 0x1110004
		field public static final int config_remoteInsetsControllerControlsSystemBars = 17891334; // 0x1110006
		}

		public static final class R.string {

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ public final class Telecom extends BaseCommand {
		private static final String COMMAND_UNREGISTER_PHONE_ACCOUNT = "unregister-phone-account";
		private static final String COMMAND_SET_DEFAULT_DIALER = "set-default-dialer";
		private static final String COMMAND_GET_DEFAULT_DIALER = "get-default-dialer";
		private static final String COMMAND_STOP_BLOCK_SUPPRESSION = "stop-block-suppression";

		/**
		* Change the system dialer package name if a package name was specified,
		* Example: adb shell telecom set-system-dialer <PACKAGE>
		@@ -115,6 +117,8 @@ public final class Telecom extends BaseCommand {
		+ "usage: telecom set-sim-count <COUNT>\n"
		+ "usage: telecom get-sim-config\n"
		+ "usage: telecom get-max-phones\n"
		+ "usage: telecom stop-block-suppression: Stop suppressing the blocked number"
		+ " provider after a call to emergency services.\n"
		+ "usage: telecom set-emer-phone-account-filter <PACKAGE>\n"
		+ "\n"
		+ "telecom set-phone-account-enabled: Enables the given phone account, if it has"
		@@ -207,6 +211,9 @@ public final class Telecom extends BaseCommand {
		case COMMAND_UNREGISTER_PHONE_ACCOUNT:
		runUnregisterPhoneAccount();
		break;
		case COMMAND_STOP_BLOCK_SUPPRESSION:
		runStopBlockSuppression();
		break;
		case COMMAND_SET_DEFAULT_DIALER:
		runSetDefaultDialer();
		break;
		@@ -324,8 +331,13 @@ public final class Telecom extends BaseCommand {
		System.out.println("Success - " + handle + " unregistered.");
		}

		private void runStopBlockSuppression() throws RemoteException {
		mTelecomService.stopBlockSuppression();
		}

		private void runSetDefaultDialer() throws RemoteException {
		final String packageName = nextArgRequired();
		String packageName = nextArg();
		if ("default".equals(packageName)) packageName = null;
		mTelecomService.setTestDefaultDialer(packageName);
		System.out.println("Success - " + packageName + " set as override default dialer.");
		}

core/java/android/app/ApplicationExitInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -502,7 +502,7 @@ public final class ApplicationExitInfo implements Parcelable {
		* Return the defining kernel user identifier, maybe different from {@link #getRealUid} and
		* {@link #getPackageUid}, if an external service has the
		* {@link android.R.styleable#AndroidManifestService_useAppZygote android:useAppZygote} set
		* to <code>true<code> and was bound with the flag
		* to <code>true</code> and was bound with the flag
		* {@link android.content.Context#BIND_EXTERNAL_SERVICE} - in this case, this field here will
		* be the kernel user identifier of the external service provider.
		*/

core/java/android/inputmethodservice/InlineSuggestionSession.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,11 @@ class InlineSuggestionSession {
		*/
		@MainThread
		void invalidate() {
		try {
		mCallback.onInlineSuggestionsSessionInvalidated();
		} catch (RemoteException e) {
		Log.w(TAG, "onInlineSuggestionsSessionInvalidated() remote exception:" + e);
		}
		if (mResponseCallback != null) {
		consumeInlineSuggestionsResponse(EMPTY_RESPONSE);
		mResponseCallback.invalidate();

core/java/android/inputmethodservice/InputMethodService.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -605,9 +605,6 @@ public class InputMethodService extends AbstractInputMethodService {
		if (DEBUG) Log.v(TAG, "unbindInput(): binding=" + mInputBinding
		+ " ic=" + mInputConnection);
		// Unbind input is per process per display.
		// TODO(b/150902448): free-up IME surface when target is changing.
		// e.g. DisplayContent#setInputMethodTarget()
		removeImeSurface();
		onUnbindInput();
		mInputBinding = null;
		mInputConnection = null;