Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afa9b6fd authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 8755f9eb: am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix... 

am 8755f9eb: am 60931a78: am dc4442f1: am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit '8755f9eb':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
parents 3b1c32eb 8755f9eb

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

+3 −3
Original line number Diff line number Diff line
@@ -10906,7 +10906,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;

    }
@@ -10994,7 +10994,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;
@@ -11051,7 +11051,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;