diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-06-09 23:33:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 23:33:52 +0000 |
| commit | 476695227393b6c35c6777754b0e3b6448ceb7d2 (patch) | |
| tree | 1ea49051f4cadd6bc07c70d39e4924e04bd4c0a0 /core/java/android/app/ActivityThread.java | |
| parent | 64d6ce8a661fd63b90b4c9f3f7d400208cb2430a (diff) | |
| parent | a3acdb33df7c7be7ff3d9f376ff833e4b0c1d897 (diff) | |
| download | frameworks_base-476695227393b6c35c6777754b0e3b6448ceb7d2.zip frameworks_base-476695227393b6c35c6777754b0e3b6448ceb7d2.tar.gz frameworks_base-476695227393b6c35c6777754b0e3b6448ceb7d2.tar.bz2 | |
Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index ffb3fb8..e21c04a 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2572,9 +2572,11 @@ public final class ActivityThread { AssistStructure structure = null; AssistContent content = new AssistContent(); ActivityClientRecord r = mActivities.get(cmd.activityToken); + Uri referrer = null; if (r != null) { r.activity.getApplication().dispatchOnProvideAssistData(r.activity, data); r.activity.onProvideAssistData(data); + referrer = r.activity.onProvideReferrer(); if (cmd.requestType == ActivityManager.ASSIST_CONTEXT_FULL) { structure = new AssistStructure(r.activity); Intent activityIntent = r.activity.getIntent(); @@ -2597,7 +2599,7 @@ public final class ActivityThread { } IActivityManager mgr = ActivityManagerNative.getDefault(); try { - mgr.reportAssistContextExtras(cmd.requestToken, data, structure, content); + mgr.reportAssistContextExtras(cmd.requestToken, data, structure, content, referrer); } catch (RemoteException e) { } } |