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

9346 Commits

Author SHA1 Message Date
Dongwon Kang
a7b212d9f1 Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs" 2015-03-24 04:07:25 +00:00
Jeff Tinker
3910eb551c Merge "Note in docs that MediaDrm methods throw IllegalStateException" 2015-03-24 00:10:21 +00:00
Jeff Tinker
8873f848aa Merge "Report key request message type for unprefixed EME" 2015-03-24 00:05:34 +00:00
Jeff Tinker
4cdc2de0e4 Report key request message type for unprefixed EME 
bug: 19771299
Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
 2015-03-23 16:23:12 -07:00
Dongwon Kang
55113971e2 Merge "TIF: fix NPE in the case a hardware TV input is not ready to use." 2015-03-23 23:18:29 +00:00
Zhijun He
709a4de485 Merge "media: fix build break" 2015-03-23 17:30:28 +00:00
Zhijun He
d1cbc68405 media: fix build break 
clang/llvm complains the timestamp print formating.

Change-Id: Ie4bff9cbec90994709097d087d1c1f2a7d1465cf
 2015-03-23 10:10:04 -07:00
Dongwon Kang
731843e424 TIF: fix NPE in the case a hardware TV input is not ready to use. 
Bug: 19805327
Change-Id: I0c96ab9274ea2404d75b02205ef40f56fb4552f6
 2015-03-23 17:13:55 +09:00
Dongwon Kang
e638966972 TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs 
These flags are expected to be used for TV input's internal purpose.

Bug: 19190140
Change-Id: Ie45a582287a83abdbecb129f5c03cc166f617776
 2015-03-23 15:33:49 +09:00
Ruben Brunk
2c2546a296 camera2: Remove ProCamera. 
Bug: 19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
 2015-03-20 22:38:54 -07:00
Zhijun He
f6a09e5106 ImageReader/Writer: Add ImageWriter and Opaque ImageReader 
ImageWriter/Reader API change, including below changes
* Interface for Opaque ImageReader
* ImageWriter Interface and implementation
* Image class minor update to support ImageWriter opaque ImageReader

detach/attach interface are defined but yet to be implemented.

Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
 2015-03-20 18:19:58 -07:00
Yin-Chia Yeh
3816e4a73a Merge "Camera: update createStream API to add new rotation field" 2015-03-19 17:27:39 +00:00
Eric Laurent
f09d4bd388 Merge "fix return from finally" 2015-03-19 17:20:26 +00:00
Mike Lockwood
ac9e2d756e Merge "MidiDeviceInfo: Add constants for future Bluetooth MIDI support" 2015-03-19 17:10:17 +00:00
Mike Lockwood
3f5acc6d48 MidiDeviceInfo: Add constants for future Bluetooth MIDI support 
Change-Id: Id89b691e923b9de8e5dce58527ba38e28e8e1d36
 2015-03-19 08:02:50 -07:00
Dongwon Kang
28299099db Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract" 2015-03-19 00:20:14 +00:00
Dongwon Kang
10c6e230bc Merge "TIF: Add TvInputInfo.isHardwareInput()." 2015-03-19 00:18:44 +00:00
Eric Laurent
b304ba5bc8 fix return from finally 
Bug: 19709617.
Change-Id: I2c2e6ebe876e0e7e814554fa2ffc89551b3165b2
 2015-03-18 09:52:05 -07:00
Dongwon Kang
4536512f35 TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract 
These flags are expected to be used for TV input's internal purpose.

Bug: 19382355, Bug: 19190140
Change-Id: I1a6c224fc9e4d254a224f47407ba4a77b8f54d57
 2015-03-18 10:58:01 +09:00
Jae Seo
c6a1e5d16c TIF: Add a missing comment for the return value of onSelectTrack() 
Bug: 19630395
Change-Id: I2caa9ace23ee003e9662e363538a363ae9a0ced7
 2015-03-17 18:02:51 -07:00
Andy Hung
2bec0fe3a7 Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack""" 2015-03-17 23:14:24 +00:00
Andy Hung
9bd868fe7a Merge "Revert "Revert "soundpool: reuse channel for same sample if available""" 2015-03-17 23:12:38 +00:00
Andy Hung
bc4537393b Revert "Revert "soundpool: update sample rate when reusing audiotrack"" 
This reverts commit b801f73343194cd081f675a5dc2b3e90959cf6d1.

Change-Id: I0f6ee7fc981d65040f32e7852a5f66fd391b329d
 2015-03-17 23:05:12 +00:00
Andy Hung
0c4b81bd3e Revert "Revert "soundpool: reuse channel for same sample if available"" 
This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc.

Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3
 2015-03-17 23:02:00 +00:00
John Spurlock
d799f70187 Merge "Audio: Flag volume adjustments from hardware keys." 2015-03-17 19:19:01 +00:00
Ruben Brunk
db2b5f4472 Merge "camera2: Release surface in ImageReader#close and fix legacy cleanup" 2015-03-17 19:11:33 +00:00
John Spurlock
b94f2d6cad Audio: Flag volume adjustments from hardware keys. 
Bug: 19793279
Change-Id: If20d70c13c9e7d1f8a6b31e0069564073d30e2bc
 2015-03-17 14:15:02 -04:00
Ruben Brunk
443ab2c7db camera2: Release surface in ImageReader#close and fix legacy cleanup 
Bug: 19694090
Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
 2015-03-17 17:49:29 +00:00
Jeff Tinker
5f1be4be08 Merge "Deprecate redundant event, should handle via NotProvisionedException" 2015-03-17 17:49:11 +00:00
Dongwon Kang
8c6e4b3980 Merge "TIF: Add getDescription() method to TvTrackInfo." 2015-03-16 23:58:05 +00:00
Mike Lockwood
0caf689ab4 MidiDeviceInfo: Fix NPE for devices with no port names 
Change-Id: I703709f84b6b1951b67918c9762bb84a142d855c
 2015-03-16 16:03:17 -07:00
Yin-Chia Yeh
bfbbee7566 Camera: update createStream API to add new rotation field 
Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
 2015-03-16 13:48:15 -07:00
Andreas Gampe
6ec9fd8b3b am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison" 
* commit 'c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
  Frameworks/base: Use equals for Integer comparison
 2015-03-16 20:26:32 +00:00
Andreas Gampe
3d33314e03 Merge "Frameworks/base: Use equals for Integer comparison" 2015-03-16 19:10:40 +00:00
Ronghua Wu
0e22acb635 Merge "media: add MediaFormat.KEY_PRIORITY." 2015-03-16 16:38:25 +00:00
Andreas Gampe
5c5978985a Frameworks/base: Use equals for Integer comparison 
Integer == is dangerous, as equal objects may not be identical
objects. In fact, MediaFormat.setInteger was creating a new object
every time.

Change MediaFormat.setInteger and setLong to use valueOf, which
may reuse returned objects.

Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
 2015-03-15 15:45:15 -07:00
Ronghua Wu
c33958833f media: add MediaFormat.KEY_PRIORITY. 
Change-Id: I82e2adb3dfac90952a11e2253fe06a2d9be1bc09
 2015-03-14 01:21:42 +00:00
Mike Lockwood
3ae6acda81 Merge "Add MidiManager to public API" 2015-03-14 00:49:00 +00:00
Jeff Tinker
5ce85b99b3 Note in docs that MediaDrm methods throw IllegalStateException 
Also fixes incorrect documention where ResourceBusyException can't
be thrown

bug: 18285793
Change-Id: I52d782a772aed97d32e70d7505c48540a320ca07
 2015-03-13 16:10:45 -07:00
Jeff Tinker
7c8d999f42 Deprecate redundant event, should handle via NotProvisionedException 
bug: 12033385
Change-Id: I02103f3fd9f48f57113bb248891fc1c8f0d8a248
 2015-03-13 14:45:17 -07:00
Jeff Tinker
5609a32366 am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 
* commit '0d22633e07a6911403383a22bb3164f53b4f4409':
  Handle NULL keys and NULL values in MediaDrm JNI HashMap
 2015-03-13 18:43:36 +00:00
John Spurlock
78d08ee44a Merge "VolumePolicy: Debounce adjustments from vibrate->silent." 2015-03-13 18:41:50 +00:00
Jeff Tinker
62632e25f5 Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 2015-03-13 18:20:43 +00:00
Mike Lockwood
81b9f7d325 Add MidiManager to public API 
Also made some small API changes based on feedback from the lint tool.

Change-Id: Ibcf1e9107d86d3a364f811ce47a13aa0da653366
 2015-03-13 11:00:57 -07:00
Mike Lockwood
4011e20921 Merge "MidiDeviceInfo meta-data improvements:" 2015-03-13 17:27:37 +00:00
John Spurlock
07e72432ac VolumePolicy: Debounce adjustments from vibrate->silent. 
Disallows volume adjustments (lower) from vibrate to silent
until a small period of time after an adjustment from normal
to vibrate.

This provides for enough time for the user to see the state change
to vibrate and feel the associated haptic feedback before yet
another state change to silent.

Bug: 19260237
Change-Id: I5843a1c144d56146a83db194f352832c8d85159d
 2015-03-13 12:42:47 -04:00
John Spurlock
b6e19e3e0f AudioService: Define minimum levels for volume streams. 
- Set a floor of 1 for voice call + bluetooth sco, otherwise 0.
 - All api calls validated to ensure a floor of the min level.
 - Volume UI updated to shift the seekbar by the min value.
 - Remove duplicate static max method in AudioService.
 - Ensure streams with a min level > 0 are not considered muteable.

Bug: 19260237
Change-Id: I213180c9c277f51bd3897b7f777e5f88ed1db125
 2015-03-13 11:02:01 -04:00
John Spurlock
63b9e8200e Merge "Volume policy updates." 2015-03-13 00:59:34 +00:00
Marco Nelissen
a80ac05f85 resolved conflicts for merge of 42f55d1e to master 
Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec
 2015-03-12 16:17:45 -07:00
Mike Lockwood
f2cd802402 MidiDeviceInfo meta-data improvements: 
Add property for user visible device name
Add names for input and output ports
Rename "model" to "product" to match USB specification.

Change-Id: I8dc50da935f26825ffc73de456d34e7933aa987c
 2015-03-12 12:05:47 -07:00