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

8454 Commits

Author SHA1 Message Date
Jeff Tinker
44e21a21b0 am 576dc318: am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 
* commit '576dc3188364d54137151913230b01ab18af2324':
  Fix exception message string formatting in MediaDrm
 2014-08-29 19:13:55 +00:00
Dongwon Kang
52605792e2 am 02a24fa1: am 9d5dadc9: am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 
* commit '02a24fa16e819d3cf75d7b4b93ee09354a7a253e':
  TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
 2014-08-29 04:20:33 +00:00
Jeff Tinker
67085e1cac Merge "Fix exception message string formatting in MediaDrm" into lmp-dev 2014-08-29 01:45:25 +00:00
Dongwon Kang
4c4eadc33d TIF: update the default value documentation of Channels.COLUMN_BROWSABLE. 
Bug: 17310177
Change-Id: Ibd765675983082f63fde3586b7c7cf6cd399c80d
 2014-08-29 08:58:30 +09:00
Jean-Michel Trivi
12542f1757 am b49dfbef: am d6e389e8: am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 
* commit 'b49dfbef478aeaf1f88056fe14a85970a9580f2d':
  android.media.Ringtone: add getter for AudioAttributes
 2014-08-28 23:08:36 +00:00
Jean-Michel Trivi
53f5106d9d am c7e083a5: am 1917d96b: am f9882022: Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 
* commit 'c7e083a5b83804737fc5d006853d93a3e44c760e':
  More AudioManager.generateAudioSessionId() javadoc
 2014-08-28 23:08:31 +00:00
RoboErik
d133303a5c am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 
* commit 'ab71604780c4cccf238e1c78b7b05310c4a49583':
  Update to MediaBrowser APIs per council feedback
 2014-08-28 23:08:20 +00:00
RoboErik
674f89837b am 3b273101: am c4f63258: am b907b22f: Merge "Set/unset session on the callback" into lmp-dev 
* commit '3b2731011149b9688c181de048651345db446406':
  Set/unset session on the callback
 2014-08-28 22:58:52 +00:00
Shaohan Zou
050d3554f9 am ae10d378: am 4dd1023d: am 77bc1cef: Merge "Add Media Player Streaming Tests" into lmp-dev 
* commit 'ae10d3788751c1af318c4c8be1a96b9657a4d9a7':
  Add Media Player Streaming Tests
 2014-08-28 22:58:36 +00:00
Jean-Michel Trivi
09daab204c Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 2014-08-28 22:13:11 +00:00
Jean-Michel Trivi
d33c3a7765 Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev 2014-08-28 22:12:43 +00:00
RoboErik
350be2e1c2 Merge "Update to MediaBrowser APIs per council feedback" into lmp-dev 2014-08-28 21:51:50 +00:00
RoboErik
4fe4facb68 Merge "Set/unset session on the callback" into lmp-dev 2014-08-28 21:29:38 +00:00
RoboErik
5ea924bcdb Set/unset session on the callback 
We lost this somewhere. When a callback is set on a MediaSession it needs
to have a reference to the Session so it can do default routing of media
keys.

bug:17304614
Change-Id: I4af82947da790135049d40c5c69c2996f3cc4ccc
 2014-08-28 14:19:25 -07:00
RoboErik
3625bf72cb Update to MediaBrowser APIs per council feedback 
Does all the updates in the bug except the loadIcon/loadBitmap
methods, which are removed per feedback from Sharkey.

bug:17205016
Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
 2014-08-28 21:11:22 +00:00
Shaohan Zou
18b80d2a0d Merge "Add Media Player Streaming Tests" into lmp-dev 2014-08-28 21:00:33 +00:00
Julia Reynolds
5fd5d461d2 am e7472cec: am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 
* commit 'e7472cec1f01174c6dfdbbbd1287dcde56c1a21e':
  Audio/Micrphone user restriction/multiuser updates.
 2014-08-28 20:10:38 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
John Spurlock
1bb69d0688 am f1e0b838: am dcd367d2: am 70dcf487: Merge "Enhance audio service dumpsys." into lmp-dev 
* commit 'f1e0b838cefefe48130b2aa3e4461a37ea55b6a7':
  Enhance audio service dumpsys.
 2014-08-28 17:22:21 +00:00
John Spurlock
2b29bc4c1c Enhance audio service dumpsys. 
- Add device name for keys
 - Add max volume for streams
 - Add missing stream name constant

Bug:16964015
Change-Id: I92facbd8ae49ba299c27bcb10bcf6668fed0d302
 2014-08-28 12:20:05 -04:00
Lajos Molnar
c5f688bb3f am 0b307ba1: am 05366fef: am cb28f853: Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 
* commit '0b307ba11f5a6aaf3ab16f0c4bcdcc55106b786d':
  media: update MediaCodec/Info/List/Format APIs based on review comments
 2014-08-28 14:01:46 +00:00
Lajos Molnar
7b8b560e3f Merge "media: update MediaCodec/Info/List/Format APIs based on review comments" into lmp-dev 2014-08-28 13:28:52 +00:00
Jae Seo
f565c3569a am 2eba45ce: am e1c0d6f0: am 5bb8065a: TIF: Enable applications to register custom content rating systems 
* commit '2eba45cea451399c9da75601524eb0ded2aa2875':
  TIF: Enable applications to register custom content rating systems
 2014-08-28 09:41:29 +00:00
Jae Seo
9c165d6e9a TIF: Enable applications to register custom content rating systems 
A recent change that moved the string resource for the system supported
content ratings from the framework to the TV app led to a need for
allowing the TV app to publish its own content rating systems. This
change added an intent action and a metadata key to be used by the TV
input manager service for querying available content rating systems,
similarly to the way InputManager defined ACTION_QUERY_KEYBOARD_LAYOUTS
and META_DATA_KEYBOARD_LAYOUTS for custom keyboard layouts. Applications
now can register their own rating systems simply by declaring a
broadcast receiver in their manifests.

Bug: 17167287, Bug: 17114406
Change-Id: I1808c624014b603ea709714737c2a880714bdc0a
 2014-08-27 21:52:07 -07:00
Shaohan Zou
d097e7ef74 Add Media Player Streaming Tests 
Change-Id: I4bb78b0487d158f4ea57349b591f66eda6b325d2
 2014-08-27 17:36:51 -07:00
Eric Laurent
e71ab3bef9 am 648e593b: am 02d9054a: am db1c0e19: Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 
* commit '648e593be4855b7303b26532b5680ef02afb02f8':
  fix condition to send ACTION_AUDIO_BECOMING_NOISY intent
 2014-08-27 22:25:00 +00:00
Eino-Ville Talvala
33bf20f3ef am 0d09fda1: am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '0d09fda101e557f2e8894746d14f8a190f2a1af0':
  Camera2: Correct error handling
 2014-08-27 21:51:05 +00:00
Eric Laurent
6c104d84c3 Merge "fix condition to send ACTION_AUDIO_BECOMING_NOISY intent" into lmp-dev 2014-08-27 21:47:11 +00:00
Lajos Molnar
217474682a media: update MediaCodec/Info/List/Format APIs based on review comments 
Bug: 17059255
Change-Id: Ifbba2a0799e7db5ae48190ba6b1e4ba13fffa167
 2014-08-27 14:40:02 -07:00
Jean-Michel Trivi
84e18ecd4b android.media.Ringtone: add getter for AudioAttributes 
Bug 17290606

Change-Id: I28406080cc1fb6a916b2859d0ef39980464953e9
 2014-08-27 14:32:17 -07:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates. 
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
 2014-08-27 16:25:00 -04:00
Eric Laurent
27c30e4426 fix condition to send ACTION_AUDIO_BECOMING_NOISY intent 
In checkSendBecomingNoisyIntent(), only output devices
must be taken into account when checking if the device
type is in mBecomingNoisyIntentDevices

Bug: 17298383.
Bug: 16403219.
Change-Id: I2213681184ab9fb3b874029143f2bbd34032d6b8
 2014-08-27 12:36:33 -07:00
Jean-Michel Trivi
d0ce27a698 am 3fcc7935: am c313bbcb: am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '3fcc7935df26183ce38a64532e2e86a1ec41d47c':
  SoundPool.Builder: document default values
 2014-08-27 18:49:47 +00:00
Eino-Ville Talvala
2227cac5af Merge "Camera2: Correct error handling" into lmp-dev 2014-08-27 18:47:30 +00:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling 
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
 2014-08-27 11:08:18 -07:00
Jeff Tinker
2979986b57 Fix exception message string formatting in MediaDrm 
bug: 17281760
Change-Id: If527234d2efb1507eca8703027e3cbdd53961b9e
 2014-08-27 11:05:13 -07:00
Jae Seo
d824acc263 am aef26a7a: am f6ee0846: am 54f4fd7d: Merge "TIF: Make TV content rating names consistent" into lmp-dev 
* commit 'aef26a7a3116649801600b6aca80039b200aa4c2':
  TIF: Make TV content rating names consistent
 2014-08-26 21:02:57 +00:00
Jae Seo
ff9ec7779a Merge "TIF: Make TV content rating names consistent" into lmp-dev 2014-08-26 20:32:03 +00:00
Ji-Hwan Lee
8e5529326e am 81d8f52d: am 24e0e863: am 593d3117: Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 
* commit '81d8f52d974e7289563bfe9245f24536bee9d0a4':
  TIF: Reset main TvView only for explicit reset() call
 2014-08-26 19:39:53 +00:00
Ji-Hwan Lee
56bfc2bc24 Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev 2014-08-26 19:20:46 +00:00
Ji-Hwan Lee
d0f0058883 TIF: Reset main TvView only for explicit reset() call 
Or, do not reset when it's called internaly while tuning.

Bug: 17269010
Change-Id: I3447ef0e628c066f71eee5a1416347fa6c721504
 2014-08-27 02:55:10 +09:00
Jae Seo
b2835e2700 TIF: Make TV content rating names consistent 
Bug: 17275999
Change-Id: I79e9ce180b23b37799f0e7daffa7778bff9cd3e4
 2014-08-26 10:08:56 -07:00
Youngsang Cho
9068981ae1 am e5c88c85: am ff0f038a: am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit 'e5c88c859eaf735cdfb2c1ffedae62db12219fc0':
  Reset a session callback variable when tune is failed
 2014-08-26 15:06:11 +00:00
Youngsang Cho
c931cc0850 Merge "Reset a session callback variable when tune is failed" into lmp-dev 2014-08-26 14:40:03 +00:00
Youngsang Cho
7cf6705455 Reset a session callback variable when tune is failed 
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
 2014-08-26 23:12:59 +09:00
Chulwoo Lee
ff7073e582 am a5b65fff: am 8ddae2f5: am 42bbfe62: Recreate overlay view after the TIS crashes 
* commit 'a5b65fffe5433b2df884ffd767d2696e06445fbb':
  Recreate overlay view after the TIS crashes
 2014-08-26 13:26:07 +00:00
Chulwoo Lee
ffad70bb7e Recreate overlay view after the TIS crashes 
The overlay view should be recreated when the session is recreated
after the TIS crash.

Change-Id: I7605aac0feed644ae29d65127f68630c3658343f
 2014-08-26 21:30:26 +09:00
Chulwoo Lee
f06bc89505 am 35a04acd: am 8e602688: am 748bbc04: Merge "Fix checking trackId" into lmp-dev 
* commit '35a04acd2bc580469540af09a8824123cd51e528':
  Fix checking trackId
 2014-08-26 10:10:06 +00:00
Dongwon Kang
38624e50af am 5a3ba1c5: am 8853b9f2: am 0628fbf6: Merge "TIF: fix NPE when notifyXXX is called on c-tor of Session implementation" into lmp-dev 
* commit '5a3ba1c5d04a409cd834081b4ed0faa157f97bb0':
  TIF: fix NPE when notifyXXX is called on c-tor of Session implementation
 2014-08-26 10:09:41 +00:00