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

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

am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to... 

am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit 'c14cbac4':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
parents bbb5717d c14cbac4

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;