Snap for 6250736 from a373984e964f4bc3acac189028d39be9c11c33d3 to qt-qpr3-release (2f6ac765) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodManager.java

+30 −67

Original line number	Diff line number	Diff line
		@@ -92,10 +92,7 @@ import java.util.Comparator;
		import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		import java.util.concurrent.CancellationException;
		import java.util.concurrent.CompletableFuture;
		import java.util.concurrent.CountDownLatch;
		import java.util.concurrent.ExecutionException;
		import java.util.concurrent.TimeUnit;

		/**
		@@ -424,13 +421,6 @@ public final class InputMethodManager {
		int mCursorCandStart;
		int mCursorCandEnd;

		/**
		* Initial startInput with {@link StartInputReason.WINDOW_FOCUS_GAIN} is executed
		* in a background thread. Later, if there is an actual startInput it will wait on
		* main thread till the background thread completes.
		*/
		private CompletableFuture<Void> mWindowFocusGainFuture;

		/**
		* The instance that has previously been sent to the input method.
		*/
		@@ -655,7 +645,6 @@ public final class InputMethodManager {
		} catch (RemoteException e) {
		}
		}
		}
		// Check focus again in case that "onWindowFocus" is called before
		// handling this message.
		if (mServedView != null && canStartInput(mServedView)) {
		@@ -665,6 +654,7 @@ public final class InputMethodManager {
		startInputInner(reason, null, 0, 0, 0);
		}
		}
		}
		return;
		}
		case MSG_SEND_INPUT_EVENT: {
		@@ -1225,10 +1215,6 @@ public final class InputMethodManager {
		*/
		void clearBindingLocked() {
		if (DEBUG) Log.v(TAG, "Clearing binding!");
		if (mWindowFocusGainFuture != null) {
		mWindowFocusGainFuture.cancel(false /* mayInterruptIfRunning */);
		mWindowFocusGainFuture = null;
		}
		clearConnectionLocked();
		setInputChannelLocked(null);
		mBindSequence = -1;
		@@ -1612,18 +1598,6 @@ public final class InputMethodManager {
		boolean startInputInner(@StartInputReason int startInputReason,
		@Nullable IBinder windowGainingFocus, @StartInputFlags int startInputFlags,
		@SoftInputModeFlags int softInputMode, int windowFlags) {
		if (startInputReason != StartInputReason.WINDOW_FOCUS_GAIN
		&& mWindowFocusGainFuture != null) {
		try {
		mWindowFocusGainFuture.get();
		} catch (ExecutionException \| InterruptedException e) {
		// do nothing
		} catch (CancellationException e) {
		// window no longer has focus.
		return true;
		}
		}

		final View view;
		synchronized (mH) {
		view = mServedView;
		@@ -1977,19 +1951,13 @@ public final class InputMethodManager {
		startInputFlags \|= StartInputFlags.FIRST_WINDOW_FOCUS_GAIN;
		}

		final boolean forceNewFocus1 = forceNewFocus;
		final int startInputFlags1 = startInputFlags;
		if (mWindowFocusGainFuture != null) {
		mWindowFocusGainFuture.cancel(false/* mayInterruptIfRunning */);
		}
		mWindowFocusGainFuture = CompletableFuture.runAsync(() -> {
		if (checkFocusNoStartInput(forceNewFocus1)) {
		if (checkFocusNoStartInput(forceNewFocus)) {
		// We need to restart input on the current focus view. This
		// should be done in conjunction with telling the system service
		// about the window gaining focus, to help make the transition
		// smooth.
		if (startInputInner(StartInputReason.WINDOW_FOCUS_GAIN, rootView.getWindowToken(),
		startInputFlags1, softInputMode, windowFlags)) {
		startInputFlags, softInputMode, windowFlags)) {
		return;
		}
		}
		@@ -2001,14 +1969,13 @@ public final class InputMethodManager {
		if (DEBUG) Log.v(TAG, "Reporting focus gain, without startInput");
		mService.startInputOrWindowGainedFocus(
		StartInputReason.WINDOW_FOCUS_GAIN_REPORT_ONLY, mClient,
		rootView.getWindowToken(), startInputFlags1, softInputMode, windowFlags,
		rootView.getWindowToken(), startInputFlags, softInputMode, windowFlags,
		null, null, 0 /* missingMethodFlags */,
		rootView.getContext().getApplicationInfo().targetSdkVersion);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		});
		}

		/** @hide */
		@@ -2023,10 +1990,6 @@ public final class InputMethodManager {
		// If the mCurRootView is losing window focus, release the strong reference to it
		// so as not to prevent it from being garbage-collected.
		mCurRootView = null;
		if (mWindowFocusGainFuture != null) {
		mWindowFocusGainFuture.cancel(false /* mayInterruptIfRunning */);
		mWindowFocusGainFuture = null;
		}
		} else {
		if (DEBUG) {
		Log.v(TAG, "Ignoring onPreWindowFocus()."

services/core/java/com/android/server/trust/TrustManagerService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1389,7 +1389,8 @@ public class TrustManagerService extends SystemService {
		if (DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED.equals(action)) {
		refreshAgentList(getSendingUserId());
		updateDevicePolicyFeatures();
		} else if (Intent.ACTION_USER_ADDED.equals(action)) {
		} else if (Intent.ACTION_USER_ADDED.equals(action) \|\| Intent.ACTION_USER_STARTED.equals(
		action)) {
		int userId = getUserId(intent);
		if (userId > 0) {
		maybeEnableFactoryTrustAgents(mLockPatternUtils, userId);
		@@ -1430,6 +1431,7 @@ public class TrustManagerService extends SystemService {
		filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
		filter.addAction(Intent.ACTION_USER_ADDED);
		filter.addAction(Intent.ACTION_USER_REMOVED);
		filter.addAction(Intent.ACTION_USER_STARTED);
		context.registerReceiverAsUser(this,
		UserHandle.ALL,
		filter,