diff options
| author | Yorke Lee <yorkelee@google.com> | 2016-06-16 21:21:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 21:21:57 +0000 |
| commit | 599cf6bc4a129a76dccd74713f7d3deb5fdc50f2 (patch) | |
| tree | f93152873507553f3f8fd5382e21be0acafd0d53 /core/java/android | |
| parent | 0bae4dcd76d4138ca9ec9d0b0e9960705e54650d (diff) | |
| parent | f33af2285b74ff7f092149ee86ec687a892aa600 (diff) | |
Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b
Change-Id: If4d9abfb81929f8366fc9acc7978816d55117fbc
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index f8a6a17a0f57..72126d0329a3 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -106,12 +106,13 @@ interface IWindowManager * @param alwaysFocusable True if the app windows are always focusable regardless of the stack * they are in. * @param homeTask True if this is the task. + * @param targetSdkVersion The application's target SDK version */ void addAppToken(int addPos, IApplicationToken token, int taskId, int stackId, int requestedOrientation, boolean fullscreen, boolean showWhenLocked, int userId, int configChanges, boolean voiceInteraction, boolean launchTaskBehind, in Rect taskBounds, in Configuration configuration, int taskResizeMode, - boolean alwaysFocusable, boolean homeTask); + boolean alwaysFocusable, boolean homeTask, int targetSdkVersion); /** * * @param token The token we are adding to the input task Id. |