Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c14cbac4a3e76d924621b34367cc8b6bcf977908':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
This commit is contained in:
Dianne Hackborn
2015-08-20 02:03:31 +00:00
committed by Android Git Automerger
parent bbb5717dee c14cbac4a3
commit 2af6ec5198
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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;