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

9739 Commits

Author SHA1 Message Date
Jae Seo
a90338396c TIF: Rename requestUnblockContent to unblockContent 
The method TvView.requestUnblockContent doesn't match the name of the
corresponding method in TvInputService, onUnblockContent, hence changed
the name to make it consistent with the current naming scheme.
This change deprecated the requestUnblockContent method as the first
step.

Bug: 19337627
Change-Id: I530209c4dca66305da90ffded7199fa3c1c1780c
 2015-05-11 22:14:04 -07:00
Dongwon Kang
b9e26621ba Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev 2015-05-12 04:51:09 +00:00
Jae Seo
606c8a3965 TIF: Unhide the surface layout API 
Also fixed some comments to make them more consistent with now public
API.

Bug: 20254168
Change-Id: I62fcdace742603ffd3756c5188c8cf37ccf964ba
 2015-05-11 21:25:10 -07:00
Jean-Michel Trivi
46011f8871 AudioRecord.Builder works with no or partial parameters 
Complete missing build-time parameters for encoding and channel
  mask, according to documentation.

Bug 20894895

Change-Id: I61f9bfab374effeeded5ae782c4e8513b7310c06
 2015-05-11 10:58:16 -07:00
Jean-Michel Trivi
3b12261c50 Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev 2015-05-11 17:39:29 +00:00
Paul McLean
1c82b221d4 Merge "Changes as per API council review." into mnc-dev 2015-05-11 15:39:29 +00:00
Dongwon Kang
ba2a1c3b92 TIF: add more documentation on Session.setOverlayViewEnabled(). 
Bug: 19916441
Change-Id: I56685a7f417541a02078c4b9e9d324e641ec3da5
 2015-05-11 19:09:26 +09:00
Jean-Michel Trivi
fd3ac3da17 android.media.AudioRecord.Builder: no "capture preset" 
Implement feedback to keep using "audio sources" instead of migrating
  to "capture presets" in AudioRecord.Builder.

Bug 20887665

Change-Id: I4d7773102711c3a4f3f4050b3eb5600bfba889cd
 2015-05-09 00:13:07 +00:00
Wei Jia
ea4eb326cf Merge "MediaSync: address API review." into mnc-dev 2015-05-08 23:23:47 +00:00
Paul McLean
e3383cc453 Changes as per API council review. 
Bug: 20887665
Change-Id: I1da7a2c69d8cf20682c767294b1647beef33f90c
 2015-05-08 15:55:18 -07:00
Ronghua Wu
69e927c3cd Merge "media: merge CodecException's getErrorCode and getReason." into mnc-dev 2015-05-08 22:53:33 +00:00
Ronghua Wu
c53ad69bcc media: merge CodecException's getErrorCode and getReason. 
And unhide getErrorCode.

Bug: 20950388
Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
 2015-05-08 15:31:15 -07:00
Wei Jia
2d61e2b97c MediaSync: address API review. 
Rename *Settings to *Params;
Remove size parameter from MediaSync.queueAudio();

Bug: 20887706
Change-Id: I4c572da92ada51458031a482b96b3f624224e608
 2015-05-08 15:23:28 -07:00
Mike Lockwood
5759a8a9cf Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc-dev 2015-05-08 22:19:56 +00:00
Eric Laurent
e48f44f55b Merge "AudioManager: add previous AudioPort list" into mnc-dev 2015-05-08 21:17:16 +00:00
Eric Laurent
8a1e7a881e AudioManager: add previous AudioPort list 
Maintain a cache of previously attached audio ports used
to create lists of added and removed devices following
a port list update callback.

Change-Id: Iad1c95b85c8ae9bdbed79eb0cdc46aeedeafccea
 2015-05-08 11:43:05 -07:00
Chong Zhang
1e6be7285d MediaPlayer: pause media time when buffering 
bug: 20500732
Change-Id: Ife7f75f5cc587af56451c85ea8adbdc380f38348
 2015-05-07 22:43:27 +00:00
Mike Lockwood
3203f9a6a0 Merge "MidiManager: Improve output of "dumpsys midi"" into mnc-dev 2015-05-07 21:23:26 +00:00
Mike Lockwood
9490eae3aa BluetoothMidiDevice: Cleanup and error handling improvements 
Change-Id: I8b932f73e0230adfe576d1fc6735bd7b41e84010
 2015-05-07 13:39:01 -07:00
Mike Lockwood
fd5637fcce MidiManager: Improve output of "dumpsys midi" 
- Include each device's port status from MidiDeviceStatus
- MidiDeviceInfo.toString() now outputs all the names and values in the properties Bundle

Change-Id: Ic9329153e4ae4d5619e274d27a420943473377e5
 2015-05-07 13:02:01 -07:00
Chih-Hung Hsieh
9eb9dd326a Fix clang warnings on unused variable, mismatched tag, print format. 
BUG: 20890093
Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
 2015-05-07 12:30:13 -07:00
Jeff Brown
4244ce6a17 Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. 
Bug: 20641986
Change-Id: I137dfc7ef41bdda2ce3e81c164767319c88159f1
 2015-05-06 16:02:22 -07:00
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs." 
This reverts commit 1a937b04e63539cb1fab1bde601031d415c7156f.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
 2015-05-06 16:02:21 -07:00
Zhijun He
7c3997d96a ImageReader: Image getFormat should return the Image buffer format 
Also return buffer size correctly.

Bug: 19527410
Change-Id: I9a912afc61d577571c1b2a7f6df21da40838e925
 2015-05-06 12:14:36 -07:00
Eric Laurent
b65cd17b05 Merge "Implement audio routing callbacks" into mnc-dev 2015-05-06 17:51:53 +00:00
Jeff Tinker
26d955fd02 Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev 2015-05-06 17:22:35 +00:00
Eric Laurent
4bcdba8484 Implement audio routing callbacks 
Implement JNI for AudioTrack and AudioRecord routing
callbacks:
- Added files core/jni/android_media_DeviceCallback.cpp/.h
for JNI callback implementation used by both AudioTrack
and AudioRecord.
- Made AudioManager AudioPort and AudioPatch methods static
in order to call them without context.

Also added IO handle information to AudioMixPort.

Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
 2015-05-06 17:03:50 +00:00
Jae Seo
936c040ec4 TIF: Make all the parameters for UNRATED null 
UNRATED is equivalent to Java null in its meaning and usage, thus it is
not appropriate to use non-trivial strings such as "com.android.tv" and
"UNRATED" to create this constant. Replaced them with the string "null",
which is commonly used in other parts of Android and also modified the
documentation to clarify its usage.

Bug: 19102311
Change-Id: I28ac8da3584eb2cc6dfd7284e2b88873fd4e9d13
 2015-05-05 15:48:06 -07:00
Jeff Tinker
fc48bf78a2 Clarify wording of MediaCrypto exception "ERROR_NO_KEY" 
related-to-bug: 20857014
Change-Id: I13204528ec44cda76a721f4d9f6021c1435921ac
 2015-05-05 15:04:01 -07:00
Harish Mahendrakar
34265cd94f media: Added MPEG2 profile/levels and tests 
Bug: 20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
 2015-05-05 11:05:22 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Robert Shih
5eac1da3bb Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev 2015-05-04 23:50:07 +00:00
Robert Shih
98b6842e30 MediaPlayer: setSubtitleAnchor on a HandlerThread 
This ensures that we wouldn't run into the error `Can't create handler
inside thread that has not called Looper.prepare` no matter on which
thread we attempt to set the SubtitleController internally.

Bug: 20821869
Change-Id: Ie53d60b58f5382428e7b7a01deccfa516b61b25f
 2015-05-04 16:38:30 -07:00
Wei Jia
d80d6f6b05 MediaSync: clean up configureAudioTrack and configureSurface. 
Bug: 19666434

Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
 2015-05-04 15:59:20 -07:00
Svetoslav
e9fc4cda50 Merge "Add camera app op - framework" into mnc-dev 2015-05-03 00:41:50 +00:00
Svetoslav
fbf0ecabac Add camera app op - framework 
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
 2015-05-02 16:23:19 -07:00
Mike Lockwood
5ba44affe6 Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev 2015-05-02 16:09:47 +00:00
Lajos Molnar
4971de2a2e Merge "media: hook up MediaCodec.setSurface" into mnc-dev 2015-05-02 02:23:11 +00:00
Chong Zhang
039cd7ffaa Merge "MediaRecorderTest: test recording from persistent surface" into mnc-dev 2015-05-02 02:20:47 +00:00
Chong Zhang
0335916173 MediaRecorder: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866
 2015-05-02 02:20:20 +00:00
Chong Zhang
ac95f1ac77 MediaRecorderTest: test recording from persistent surface 
Bug: 19127604
Bug: 19489395

Change-Id: I17984e0febaf0541a0ce650a07e0c485ffc41c08
 2015-05-01 18:37:07 -07:00
Chong Zhang
8034d60f6e MediaCodec: implement persistent input surface APIs 
Bug: 19127604
Bug: 19489395

Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a
 2015-05-01 18:30:09 -07:00
Lajos Molnar
5e02ba977e media: hook up MediaCodec.setSurface 
Bug: 11990461
Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374
 2015-05-01 17:39:37 -07:00
Mike Lockwood
8c26d843a7 BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets 
Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9
 2015-05-01 16:16:42 -07:00
Robert Shih
043b26ba9a am 4816ebe8: am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 
* commit '4816ebe8c2f312bca44d95abdfec0dba137c4fd4':
  MediaPlayer: provide mime type for all track types
 2015-05-01 01:35:13 +00:00
Lajos Molnar
f0afeb2373 am 0486d03d: am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings 
* commit '0486d03dc0c843f31852afc2812c934f10aeb21e':
  media: Hook up MediaPlayer and MediaSync to new settings
 2015-05-01 01:34:53 +00:00
John Reck
6dc2c89b49 am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7':
  Change how Java Bitmaps are accessed in a few places
 2015-05-01 01:32:46 +00:00
Robert Shih
4816ebe8c2 am e8a8440d: am f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 
* commit 'e8a8440d70222750ad9b8563cbc80ca5c563b9c1':
  MediaPlayer: provide mime type for all track types
 2015-05-01 00:57:33 +00:00
Robert Shih
f12071222f Merge "MediaPlayer: provide mime type for all track types" into mnc-dev 2015-05-01 00:31:24 +00:00
Lajos Molnar
0486d03dc0 am 607dab36: am 05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings 
* commit '607dab369580d8510f42b1a796ee623eaf4b2adf':
  media: Hook up MediaPlayer and MediaSync to new settings
 2015-05-01 00:28:36 +00:00