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

3243 Commits

Author SHA1 Message Date
Michael Wright
dfb309b870 am b04d7260: am 4b5e1fbe: am 54bc6182: Change callback methods from add to register. 
* commit 'b04d72602b06aa33034b17c9f29b8abba34644c5':
  Change callback methods from add to register.
 2014-09-12 19:22:19 +00:00
Jean-Michel Trivi
20380f44a3 am 0edbe3ea: am 025f0ad2: am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 
* commit '0edbe3ea1d5e0e231416e18a4648892cda223f4b':
  More android.media.AudioFormat.Builder javadoc
 2014-09-12 19:17:43 +00:00
Michael Wright
cde5bb45cc Change callback methods from add to register. 
Also changes intent returning method from get to create. Both changes
are in response to API council feedback.

Bug: 17389882
Change-Id: I3b57e3fc202148e3bbb24ac61229f04e8b4ac41e
 2014-09-11 19:37:30 +00:00
Youngsang Cho
3ebd8b021e am f5ccdcd5: am d82c7daf: am 4608b9d9: Fix build breakage 
* commit 'f5ccdcd5adc653f9b0e39b7d17fc758542866800':
  Fix build breakage
 2014-09-11 17:28:54 +00:00
Terry Heo
3d3af205fb am 29f8cb8f: am 5fce06fb: am 75cd6c5e: Merge "Add a system API to query hdmi system audio mode" into lmp-dev 
* commit '29f8cb8f9f5cdbae3f856c474c62e2f86cf6c429':
  Add a system API to query hdmi system audio mode
 2014-09-11 17:28:34 +00:00
Chulwoo Lee
2f42f85c5c am d94bbae8: am a6e66231: am cacba761: Notify of the update of TvInputInfo 
* commit 'd94bbae86626e0a7c1f3e2554845fb6e1fcc570d':
  Notify of the update of TvInputInfo
 2014-09-11 17:28:29 +00:00
Lajos Molnar
10d9fbed46 am f84d5a47: am 1018d8f7: am c4c153a8: MediaCodec.Image: use image.setCrop() in constructor 
* commit 'f84d5a472c98ca8edfb7f8720c745ba424322775':
  MediaCodec.Image: use image.setCrop() in constructor
 2014-09-11 17:28:00 +00:00
Jae Seo
0008debbb8 am 3e420539: am 1bb8ff97: am 5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices 
* commit '3e420539fae35ed10a9ee3f10594c69201e75d25':
  TIF: Enable inflating class android.media.tv.TvView on non-TV devices
 2014-09-11 17:22:25 +00:00
Jean-Michel Trivi
698286847c Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev 2014-09-11 16:16:22 +00:00
Jean-Michel Trivi
ce6ec6d256 am c60cf440: am 16c67b4d: am 6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 
* commit 'c60cf440d6ef03f18cbcec8987da8fb5aa230fad':
  Virtualizer: replace device type by virtualization mode
 2014-09-11 14:15:28 +00:00
Eric Laurent
62462e4c1b am 31b26c08: am 728f1ba3: am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev 
* commit '31b26c08f22b8fae6012460fa234792fbfaee473':
  Hide AudioDevice class
 2014-09-11 14:15:22 +00:00
Youngsang Cho
db8f7ab752 Fix build breakage 
Change-Id: Ic52e2d767f3adfedfa4e78aa2510d480c537c857
 2014-09-11 11:22:07 +09:00
Terry Heo
d608f3abac Merge "Add a system API to query hdmi system audio mode" into lmp-dev 2014-09-11 01:35:07 +00:00
Chulwoo Lee
19ba61affb Notify of the update of TvInputInfo 
The TvInputInfo is updated when
1. the package is reinstalled.
2. the media on which a newer version of TV inputs exists become
   available.
3. the media on which a newer version of TV inputs exists become
   unavailable.

BUG: 17349383
Change-Id: I983058b13678bd8ecf7d766dc8bdac5fed7df4a0
 2014-09-11 10:32:00 +09:00
Lajos Molnar
b1644e156d MediaCodec.Image: use image.setCrop() in constructor 
This avoids the ReadOnlyBuffer exception for readonly images.

Bug: 17059255
Change-Id: I83de487e8bf60ba09b1cba1c0106191dd741c217
 2014-09-10 17:58:09 -07:00
Jae Seo
9127e4580c TIF: Enable inflating class android.media.tv.TvView on non-TV devices 
Needed to pass the CTS for those devices.

Bug: 17455222
Change-Id: Ief9a76835418906d9e8e06d4e5ddc71a3370055d
 2014-09-10 13:11:13 -07:00
Jean-Michel Trivi
f35423bb4e Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev 2014-09-10 17:29:20 +00:00
Eric Laurent
b94b5d33b2 Merge "Hide AudioDevice class" into lmp-dev 2014-09-10 17:28:56 +00:00
Zhijun He
01b4bc1054 am d7332411: am 490f790b: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit 'd73324116a59b5ad9fcfcc8721db613e7d76f4c1':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 07:23:09 +00:00
Lajos Molnar
39e977834d am f152b6e5: am 482a07d7: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 
* commit 'f152b6e557a785eeca19041001167b1dba34f08d':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
 2014-09-10 07:22:57 +00:00
Robert Shih
c434010e30 am b840ec70: am 8bad28ef: am 3b0b5ce3: MediaPlayer/SubtitleController:fix add/select timed text on start 
* commit 'b840ec70c54672c8435f67f93b6fc03156208098':
  MediaPlayer/SubtitleController:fix add/select timed text on start
 2014-09-10 07:22:48 +00:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Robert Shih
8c4d53c3a9 MediaPlayer/SubtitleController:fix add/select timed text on start 
- scan internal tracks when necessary
 - fix overflow in addTimedTextSource
 - do not hide timed text track in doSelectDefaultTrack; i.e. apply
   hiding logic to subtitle tracks only
 - do not notify stop in scheduleUpdate; it will be fired in onStopped
   if necessary

Bug: 17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
 2014-09-10 01:33:17 +00:00
Jeff Tinker
02fe289de9 am 52b59f6c: am 6a884aad: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev 
* commit '52b59f6cb7155bf21abff70d25f0751a3f101830':
  Add support for max-res decode
 2014-09-10 01:10:08 +00:00
Lajos Molnar
5498ba4a1f am 55b5fb8e: am 4662ef1f: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev 
* commit '55b5fb8e25f0ef15377c08db9c1ec82e03482e18':
  initialize codec list before MediaCodec.getCodecInfo()
 2014-09-10 01:07:54 +00:00
Jean-Michel Trivi
aea175e499 More android.media.AudioFormat.Builder javadoc 
Bug 17059703

Change-Id: I1cca2effecbf1998dfa48774d87d94c00285c16c
 2014-09-09 17:52:22 -07:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo 
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
 2014-09-09 17:27:26 -07:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Zhijun He
b67c3102c9 CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P 
Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
 2014-09-09 16:19:10 -07:00
Lajos Molnar
aa79d99576 initialize codec list before MediaCodec.getCodecInfo() 
Bug: 17374217
Change-Id: I8e8fc3a34ec01afdf5fc577979010183971c878b
 2014-09-09 14:35:33 -07:00
Jason Monk
ce0bd0b745 am c8b3d218: am a03fb8a1: am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 
* commit 'c8b3d218f764b19dbe00d82d552304f4f9e07408':
  Add user-specific playSoundEffect and use in NavBar
 2014-09-09 18:31:28 +00:00
Jae Seo
c44c64e824 am 9ae2fd2f: am c83c5596: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev 
* commit '9ae2fd2fe828b740a0ca399c7973fe16359bbbcd':
  Add Japanese content ratings
 2014-09-09 18:08:26 +00:00
Jason Monk
9580f6c6cb Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev 2014-09-09 18:03:14 +00:00
Jae Seo
fe5998b5ad Add Japanese content ratings 
Bug: 17434802
Change-Id: I4be1ff9e5621f0a973c38f1abb377b1c92131a02
 2014-09-09 10:06:52 -07:00
Eric Laurent
984f270153 am 2a9021fd: am daafb999: am 602e21fa: Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev 
* commit '2a9021fd95c82b676dd504bf67fbb18db8269b9b':
  unhide AudioAttributes flag FLAG_HW_AV_SYNC
 2014-09-09 05:29:17 +00:00
Eric Laurent
7c36c86342 Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev 2014-09-09 01:59:00 +00:00
Eric Laurent
56340fc2e8 unhide AudioAttributes flag FLAG_HW_AV_SYNC 
Bug: 17112525.
Change-Id: Ia817d8e4b6e517da04f948bcb138fc38faea6caf
 2014-09-08 18:51:35 -07:00
RoboErik
4dfedcb0c3 am 0e6071ec: am c1ec88a5: am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev 
* commit '0e6071ec37b667d2c0af20522e312e07256e88ce':
  Possible fix for dead handler in Music button event sending
 2014-09-08 23:14:54 +00:00
Jean-Michel Trivi
b3bf7d487a Virtualizer: replace device type by virtualization mode 
Define audio virtualization modes that represent the different
 audio processing modes.
Change and document the change in the methods used to describe
 the virtualizer capabilities and characteristics.
Implement internal conversion functions between virtualization
 modes and device types.

Bug 17059703

Change-Id: Ic4db211d6f51492be9088783246abb4b2866d76f
 2014-09-08 15:20:01 -07:00
RoboErik
9ff7dda93e Possible fix for dead handler in Music button event sending 
I'm still attempting to root cause, but this is a potential fix. I
suspect the callback is getting registerd on a looper that isn't the
main looper which is then getting killed at some point. This change
will make all legacy callbacks happen on the main looper, which should
prevent the state.

bug:17420281
Change-Id: Ia78e694b32b24398d3c09f49d12632755ef45597
 2014-09-08 13:11:55 -07:00
Jason Monk
0c37ba3188 Add user-specific playSoundEffect and use in NavBar 
Add a hidden version of playSoundEffect that takes a userId to
get the correct setting as to whether sound effects should play
or not.

Bug: 15106706
Change-Id: I5c0b74081fd00732a43fe42a76d33d05197333d0
 2014-09-08 15:34:23 -04:00
Jae Seo
6f74a2ab6c am 57091aef: am 067d3da5: am 8f2f5184: Merge "TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable" into lmp-dev 
* commit '57091aeffee9742e8bec807d6b966d4200cfdaf6':
  TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable
 2014-09-07 21:10:50 +00:00
Jae Seo
d254611778 TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable 
TV input services are now required to call these methods to
unblock/block the screen.

Bug: 17364845
Change-Id: Ifb435900d7f61785198dba2e255a2d24dbf44dc6
 2014-09-07 13:39:17 -07:00
Eric Laurent
6a8eeda65f Hide AudioDevice class 
AudioDevice class is only used by Virtualizer so
far so it does not need to be public yet.
Also removed redundant DEVICE_ prefix to device
types.

Bug: 17059703.
Change-Id: I5c93f66487b35de24f28641141f8e7de9e85c6c2
 2014-09-07 11:15:59 -07:00
Jean-Michel Trivi
cd2278f7f3 am 56acac5d: am 81cbf021: am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev 
* commit '56acac5da324ca43a9ec2c81f41a57540cd5efb7':
  Respect Android conventions in AudioManager extras
 2014-09-06 00:05:35 +00:00
Jean-Michel Trivi
3461586662 am f2188810: am 959b735f: am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev 
* commit 'f2188810c51482fcc292e5d8dcb4afa714ef5b52':
  AudioAttributes: unhide CREATOR
 2014-09-06 00:05:29 +00:00
Jean-Michel Trivi
afd899c61f Merge "Respect Android conventions in AudioManager extras" into lmp-dev 2014-09-05 23:37:10 +00:00
Jean-Michel Trivi
2caa0a6070 Merge "AudioAttributes: unhide CREATOR" into lmp-dev 2014-09-05 23:36:44 +00:00
Lajos Molnar
9092ed6c65 am 7b5bcc68: am 89315051: am 00352e1e: Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev 
* commit '7b5bcc68fd16be733a557931d78829c3ab9ce7ea':
  MediaCodecInfo: allow getting info for secure codec
 2014-09-05 23:32:31 +00:00