drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
233,580 Commits 1 Branch 0 Tags
Commit Graph

10321 Commits

Author SHA1 Message Date
Jean-Michel Trivi
e35bde5291 Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix" 2016-02-05 22:27:26 +00:00
Jean-Michel Trivi
fee832a097 Dynamic audio policies: fix AttributeMatchCriterion addition in mix 
When adding an AttributeMatchCriterion for a mix, build the instance
  with the constructor that matches the rule.

Bug 26798796

Change-Id: I130f4bdab51644685413d294096d35d9685ea5eb
 2016-02-05 11:15:42 -08:00
Glenn Kasten
f22472a1d0 Merge "Update documentation to say write not read or play" 2016-02-05 17:02:53 +00:00
Jae Seo
0cc5a9d8f6 MediaBrowser: Add extra lookup keys to specify media items to retrieve 
Bug: 25821318, Bug: 25153123, Bug: 25153113
Change-Id: I50cc99439a4a6dd714cf7bfd0950e2583554668a
 2016-02-05 12:52:17 +09:00
Jae Seo
3bc8dd8edd Merge "TIF: Add extras to TvInputInfo" 2016-02-03 23:29:58 +00:00
Jae Seo
3c590a8d20 TIF: Add extras to TvInputInfo 
Bug: 23820259, Bug: 21905878
Change-Id: I642525afb4f98bf7fb76917048dc9336a2a2313a
 2016-02-03 22:09:30 +09:00
Youngsang Cho
82621b6c09 TIF: call RecordingCallback.onConnected when SessionCallback.onConnected is called 
Bug: 26945681
Change-Id: Icd5029bc0a7cf82d690a69d390678831a46cd39a
 2016-02-02 22:10:39 -08:00
Chulwoo Lee
4fb2d18c46 Merge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"" 2016-02-02 18:54:48 +00:00
Chulwoo Lee
072300558e Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode" 
This reverts commit a6130cee3ac9ed8648be005adcf217cf4426defc.

Change-Id: Id3d5ec0ca35bbd8e0b28b2b0dd936078b5da93d6
 2016-02-02 18:34:58 +00:00
Jiabin Huang
1570c3e91e Merge "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode" 2016-02-02 09:22:02 +00:00
Jiabin Huang
a6130cee3a TIF: Improve android.media.tv.TvContract.Programs.Genres#decode 
test results:
 random string(1000 channels) decode 1000 times on Nexus Player
 6.8 seconds => 1.4 seconds

Bug: 23307587
Change-Id: If309b0819d705d791c8fa9b177e6d2bd0019102e
 2016-02-02 18:19:30 +09:00
Sungsoo Lim
bc89bd2056 Merge "MediaBrowserUtils: Fix NPE" 2016-02-02 02:23:11 +00:00
Sungsoo Lim
a24ca36ce1 MediaBrowserUtils: Fix NPE 
Bug: 26910471
Change-Id: I134516f6318c34cc5dfdcf04438e6ba00b843607
 2016-02-02 11:22:11 +09:00
Hyungtae Kim
3a0ad304f6 Merge "Rename instr argument 'repeat' to 'iterations'" 2016-02-02 01:41:48 +00:00
Hyungtae Tim Kim
84789bef99 Rename instr argument 'repeat' to 'iterations' 
The argument means the number of test iterations for camera
stress testing. Renamed for easier understanding of the argument.

Change-Id: I3247e35f8640c98db5c8438c3fc79a45073d9623
 2016-02-01 16:00:49 -08:00
Glenn Kasten
679f1e26d0 Update documentation to say write not read or play 
Change-Id: I41b074f17da519f87ce410a576ecee079bdf4615
 2016-02-01 14:11:51 -08:00
Sungsoo Lim
8e3fb58621 MediaBrowser: Minor fixes 
- Change double spaces to a single space.
- Add IntDef annotation.
- Use a plural noun for 'flag'.
- Check parentId using TextUtils.isEmpty().

Change-Id: Ic268e543a60fbe281a4deaa24d4d9bde9c0bc22d
 2016-02-01 21:54:52 +09:00
Hang Yin
a80bf36741 Merge "Camera2 framework stress test suite" 2016-01-30 00:45:00 +00:00
Jean-Michel Trivi
5bf536cf78 Merge "Fix dynamic audio policy rules" 2016-01-29 22:52:28 +00:00
Jean-Michel Trivi
32696d49e1 Fix dynamic audio policy rules 
Always set the mix type when adding rules, even
 when adding from a parcel.

Bug 26798796

Change-Id: Ib10bfa9b9b7753b18d9b1b5a67e82677dcac2cbe
 2016-01-29 13:50:20 -08:00
Dongwon Kang
f14a39398f Merge "TIF: Make RecordingCallback static" 2016-01-29 18:53:24 +00:00
Dongwon Kang
397b1447ab TIF: Make RecordingCallback static 
Change-Id: I5138713fe21f49d43e9c70af8c2ba66318aa8342
 2016-01-29 10:47:21 -08:00
Jae Seo
c7cbd7b21f Merge "TIF: Unhide TvInputCallback.onInputUpdated()" 2016-01-29 18:06:09 +00:00
Jae Seo
61e97e0e42 Merge "TIF: Add Hardware prefix to method/member names for better readability" 2016-01-29 18:05:47 +00:00
Sungsoo Lim
b8a74e5b41 Merge "MediaBrowser: Make support lib work properly" 2016-01-29 07:19:14 +00:00
Jae Seo
1abbbcd33e TIF: Add Hardware prefix to method/member names for better readability 
Also removed the infix 'Tv' to make those names consistent with other
names (e.g. mHdmiInputIdMap, inputList, etc.)

Change-Id: I40eff18f8ca795c080edaf293f4906848caed0ca
 2016-01-28 22:40:39 -08:00
Sungsoo Lim
d67933e271 MediaBrowser: Make support lib work properly 
Do not change the methods signature and order of methods in
MediaBrowser related AIDL files. A change of the method signatures
or the order could break the support library.

Bug: 26841304
Change-Id: Id8c013eafc38c1a716df63dd86f446bc9c9ff21d
 2016-01-29 15:21:07 +09:00
Jae Seo
631052954d TIF: Unhide TvInputCallback.onInputUpdated() 
Needed to load proper resources when the TV input app is updated

Bug: 26851344
Change-Id: If3d143a254a9585e90ab1d91abcdb68bf39eaa9f
 2016-01-29 05:34:23 +00:00
Jae Seo
808a91a0c6 Merge "TIF: Allow undefined reasons to be passed by notifyVideoUnavailable" 2016-01-29 05:04:30 +00:00
Jae Seo
8a151a0a21 TIF: Allow undefined reasons to be passed by notifyVideoUnavailable 
Bug: 26819129
Change-Id: Ia3cbc8183b08e7431276795f74fcc6701de0a238
 2016-01-28 21:02:06 -08:00
Andy Hung
d89cb1eb81 Merge "Add AudioRecord timestamps" 2016-01-29 03:23:19 +00:00
Jae Seo
03c75de39f Merge "TIF: Notify of a change to TvInputInfo regardless of service connection" 2016-01-29 02:15:56 +00:00
Jae Seo
c2a89510dd TIF: Notify of a change to TvInputInfo regardless of service connection 
Also removed unnecessary input ID in various methods

Change-Id: I50a2da924e9442312ccf16278e9123f837ec8942
 2016-01-28 17:54:26 -08:00
Andy Hung
0ad99c0597 Add AudioRecord timestamps 
API change

Bug: 13569372
Bug: 22886739
Change-Id: Ic250fd0c39901f4e99c58281e371f27c241b6bed
 2016-01-28 17:19:11 -08:00
Donghyun Cho
b3c06c2f50 Merge "MediaSession: Define an extra field for staying paused after play" 2016-01-29 01:15:36 +00:00
Wei Jia
f202143597 Merge "MediaDataSource: add getFlags()" 2016-01-28 19:22:28 +00:00
Jae Seo
a4ff399039 Merge "TIF: Refactor TvInputInfo" 2016-01-28 18:16:36 +00:00
Jae Seo
a21579ad8d TIF: Refactor TvInputInfo 
Moved fields and methods that are used only for building TvInputInfo
into Builder.
Renamed some parameters for consistency.
Removed trivial comments for private methods.

Change-Id: I620c504d9b895d2572e1ebe2ea58ceaffd53ab43
 2016-01-28 09:14:32 -08:00
Anton Daubert
8f7a8f1eba Fix the initialize of PreviewImageData to its default values. 
Bug: 26762780, 26837999
Change-Id: Ifc268beb84903576b8c82681fddf2f51ffc4a2ec
 2016-01-28 13:52:46 +01:00
Lajos Molnar
153d7ada2e Merge "MediaExtractor: add getDrmInitData API" 2016-01-28 05:55:07 +00:00
Daichi Hirono
376c5a8d34 Merge "Implement MtpDevice#getPartialObject64 in Java API." 2016-01-28 04:46:16 +00:00
Robert Shih
21b0008db6 MediaExtractor: add getDrmInitData API 
Bug: 26070802
Change-Id: I32e256f5988e206188f43d1bef0ad2ffdce8caec
 2016-01-27 20:42:27 -08:00
Jean-Michel Trivi
8af734b80a Merge "API to query recording format and device on AudioRecordConfiguration" 2016-01-28 04:23:04 +00:00
Arunesh Mishra
4666057155 Merge "SoundTrigger system API changes." 2016-01-28 04:10:38 +00:00
Jean-Michel Trivi
f730d87936 API to query recording format and device on AudioRecordConfiguration 
Bug 22876530

Change-Id: I5d529cecbef91361afce64f20faca17f6ebb8ba9
 2016-01-27 19:38:06 -08:00
Donghyun Cho
3de7c4146e MediaSession: Define an extra field for staying paused after play 
Introduced a new constant EXTRA_PREPARE_ONLY, which allows
MediaController to ask MediaSession to stay paused right after play
requests are called. If this field is set to true in extra bundle and it
is passed during playFromMediaId, playFromSearch, and playFromUri
requests, MediaSession will prepare the given media, but not start
playing it.

Bug: 25841735
Change-Id: I2a2f71a251bd6f475698fe8a5bb696ac70003e2b
 2016-01-28 12:22:58 +09:00
Daichi Hirono
c8718b57b7 Merge "Add varietions of MtpDevice's mehtods using long." 2016-01-28 02:56:34 +00:00
Daichi Hirono
e0e6654a31 Add varietions of MtpDevice's mehtods using long. 
BUG=26525304

Change-Id: I0a0b187910cf498720d8e7b8fbe9b0590e67e65e
 2016-01-28 11:54:57 +09:00
Jean-Michel Trivi
297489448b Merge "Dynamic audio policies by UID" 2016-01-28 02:48:00 +00:00
Daichi Hirono
038832b900 Implement MtpDevice#getPartialObject64 in Java API. 
BUG=26703522

Change-Id: I08510e3a179b7dc8bf247a9e997dc8a160138fc2
 2016-01-28 11:19:55 +09:00