Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev (c14cbac4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -10730,7 +10730,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		synchronized (this) {
		buildAssistBundleLocked(pae, pae.result);
		mPendingAssistExtras.remove(pae);
		mHandler.removeCallbacks(pae);
		mUiHandler.removeCallbacks(pae);
		}
		return pae.extras;
		}
		@@ -10818,7 +10818,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		activity.app.thread.requestAssistContextExtras(activity.appToken, pae,
		requestType);
		mPendingAssistExtras.add(pae);
		mHandler.postDelayed(pae, timeout);
		mUiHandler.postDelayed(pae, timeout);
		} catch (RemoteException e) {
		Slog.w(TAG, "getAssistContextExtras failed: crash calling " + activity);
		return null;
		@@ -10875,7 +10875,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		synchronized (this) {
		buildAssistBundleLocked(pae, extras);
		boolean exists = mPendingAssistExtras.remove(pae);
		mHandler.removeCallbacks(pae);
		mUiHandler.removeCallbacks(pae);
		if (!exists) {
		// Timed out.
		return;