diff options
| author | Winson Chung <winsonc@google.com> | 2017-10-30 16:22:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-30 16:22:26 +0000 |
| commit | 941dcba6e310e0bafcc1459422e7db01c5b70bb0 (patch) | |
| tree | ed2d79b651ca1a0b953eae78448750d281a32599 /core/java/android | |
| parent | d94a7f97546c9b55cbda7d7c78712568da54ce19 (diff) | |
| parent | da2818fe89e7f37ee60169ce653197049db450ea (diff) | |
Merge "1/ Refactor out logic to fetch assist data asynchronously"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/IActivityManager.aidl | 5 | ||||
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 49513d1825de..322450e5a18d 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -63,6 +63,7 @@ import android.os.ParcelFileDescriptor; import android.os.PersistableBundle; import android.os.StrictMode; import android.service.voice.IVoiceInteractionSession; +import com.android.internal.app.IAssistDataReceiver; import com.android.internal.app.IVoiceInteractor; import com.android.internal.os.IResultReceiver; import com.android.internal.policy.IKeyguardDismissCallback; @@ -453,7 +454,7 @@ interface IActivityManager { void notifyCleartextNetwork(int uid, in byte[] firstPacket); int createStackOnDisplay(int displayId); void setTaskResizeable(int taskId, int resizeableMode); - boolean requestAssistContextExtras(int requestType, in IResultReceiver receiver, + boolean requestAssistContextExtras(int requestType, in IAssistDataReceiver receiver, in Bundle receiverExtras, in IBinder activityToken, boolean focused, boolean newSessionId); void resizeTask(int taskId, in Rect bounds, int resizeMode); @@ -617,7 +618,7 @@ interface IActivityManager { boolean updateDisplayOverrideConfiguration(in Configuration values, int displayId); void unregisterTaskStackListener(ITaskStackListener listener); void moveStackToDisplay(int stackId, int displayId); - boolean requestAutofillData(in IResultReceiver receiver, in Bundle receiverExtras, + boolean requestAutofillData(in IAssistDataReceiver receiver, in Bundle receiverExtras, in IBinder activityToken, int flags); void dismissKeyguard(in IBinder token, in IKeyguardDismissCallback callback); int restartUserInBackground(int userId); diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 6e49bac38116..3d38dc41aa9a 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -16,7 +16,7 @@ package android.view; -import com.android.internal.app.IAssistScreenshotReceiver; +import com.android.internal.app.IAssistDataReceiver; import com.android.internal.os.IResultReceiver; import com.android.internal.view.IInputContext; import com.android.internal.view.IInputMethodClient; @@ -272,7 +272,7 @@ interface IWindowManager /** * Used only for assist -- request a screenshot of the current application. */ - boolean requestAssistScreenshot(IAssistScreenshotReceiver receiver); + boolean requestAssistScreenshot(IAssistDataReceiver receiver); /** * Called by the status bar to notify Views of changes to System UI visiblity. |