Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,127 Commits 3 Branches 0 Tags
b59eacf5feee682483f681d26ebde0fc4811fa0f
Commit Graph

3178 Commits

Author SHA1 Message Date
RoboErik
b59eacf5fe resolved conflicts for merge of a41f48f8 to master 
Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a
 2014-09-05 14:29:31 -07:00
RoboErik
7d0db3c364 am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 
* commit '8fe00fb8658c49a4bfd6e5bb4665d91f3879fcf6':
  rename add/removeCallback to register/unregisterCallback
 2014-09-05 20:32:32 +00:00
RoboErik
88d98d3aab am 8fe56085: am 8c47737f: am fa8c8c3a: Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 
* commit '8fe5608598eefe7213fb978cad77981011773a26':
  rename SERVICE_ACTION to SERVICE_INTERFACE
 2014-09-05 20:32:22 +00:00
RoboErik
d89025f505 Merge "Minor tweaks to MediaBrowser" into lmp-dev 2014-09-05 19:49:46 +00:00
RoboErik
dfafca7691 Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev 2014-09-05 19:49:36 +00:00
RoboErik
845755d6e7 Merge "rename SERVICE_ACTION to SERVICE_INTERFACE" into lmp-dev 2014-09-05 19:45:44 +00:00
RoboErik
5dfa0a5f7a Minor tweaks to MediaBrowser 
-A swapped the param order on MediaBrowser.MediaItem constructor
-Added a missing aidl file for MediaItem

bug:17205016
Change-Id: I61538d76f76a993ed5a47b881e0d291fef1d8db3
 2014-09-05 11:40:34 -07:00
RoboErik
14f717a506 rename add/removeCallback to register/unregisterCallback 
bug:17390821
Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
 2014-09-05 11:40:33 -07:00
Jean-Michel Trivi
f0384ee674 am 565f0114: am 4bb9033a: am 0bd1a9d7: Merge "Permission check for entering MODE_IN_CALL" into lmp-dev 
* commit '565f01147b56bd6730a0fce8291894b4747ab9f7':
  Permission check for entering MODE_IN_CALL
 2014-09-05 18:26:57 +00:00
Jean-Michel Trivi
3512bcd3af Merge "Permission check for entering MODE_IN_CALL" into lmp-dev 2014-09-05 18:00:51 +00:00
Jean-Michel Trivi
ccd654e9d4 Permission check for entering MODE_IN_CALL 
Make the ability to change the audio mode conditional to having
 the MODIFY_PHONE_STATE permission.
Make AudioService's internal implementation of the mode setting
 (the setModeInt() method) private, it is only meant to be used
 by AudioService.
Refer to the permission names through Manifest.permission, not
 by their string value.

Bug 14964198

Change-Id: I49870207566e53d5c8764646cece06d8272f93ed
 2014-09-05 09:50:54 -07:00
RoboErik
ec7aa9d9d1 am 8e5eca7d: am 41151329: am 9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev 
* commit '8e5eca7db46654482c935aeaba2d0a1652ca739b':
  Ensure there's a valid handler when registering a sessions listener
 2014-09-04 21:28:55 +00:00
Eric Laurent
d77d888eff am dd1215b0: am c61756c5: am f225a5c2: Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 
* commit 'dd1215b07c8391e0f3853be015df4029b6245224':
  AudioManager: only use main looper for AudioPort event handler
 2014-09-04 21:28:49 +00:00
RoboErik
92e565f715 rename SERVICE_ACTION to SERVICE_INTERFACE 
For API consistency this intent is suppose to be named SERVICE_INTERFACE.

bug:17390782
Change-Id: I4c3b1d8476dd6c939792f73615e92d7bfa6d5758
 2014-09-04 14:06:34 -07:00
RoboErik
a4b9a191a8 Merge "Ensure there's a valid handler when registering a sessions listener" into lmp-dev 2014-09-04 20:52:56 +00:00
Eric Laurent
b6efa23adc Merge "AudioManager: only use main looper for AudioPort event handler" into lmp-dev 2014-09-04 20:47:44 +00:00
RoboErik
8f7ac26a2f am 82f0f332: am dd22920f: am 11370544: Merge "Update VolumeProvider apis per feedback" into lmp-dev 
* commit '82f0f332944acfe13d52a3099825d77edd4c9d4a':
  Update VolumeProvider apis per feedback
 2014-09-04 18:10:00 +00:00
RoboErik
f85a08d30f Merge "Update VolumeProvider apis per feedback" into lmp-dev 2014-09-04 17:38:01 +00:00
Jae Seo
cdd7078427 am 4aaabe36: am 3dd7f2c7: am 9c723776: Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 
* commit '4aaabe368ca16ead4a507adf83bc14965b2114e9':
  TIF: Add Quebec ratings for Canada and fix the XML example
 2014-09-04 03:39:06 +00:00
Eric Laurent
5a7e9207f0 AudioManager: only use main looper for AudioPort event handler 
Bug: 17336373.
Change-Id: I0a9a7012778f99acbf027ec2928ca222954ad0bd
 2014-09-03 19:11:39 -07:00
RoboErik
8e1e84847e Ensure there's a valid handler when registering a sessions listener 
Some legacy apps register a RemoteController on a thread without a
looper. This ensures a handler with a looper is used when it registers
the sessions listener.

bug:17357029
Change-Id: Ia3d98f5dcc331edd0c3a7e858db1d9e7e2749e14
 2014-09-03 18:25:15 -07:00
Jae Seo
a90ae8bebb Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 2014-09-04 01:23:35 +00:00
Jungshik Jang
834f398290 am 9efde9ad: am e855cd67: am 5957c55c: Merge "Rename ro.config.music_vol_steps into ro.config.media_vol_steps." into lmp-dev 
* commit '9efde9ad278794b4baea05823ff6edaab452d55f':
  Rename ro.config.music_vol_steps into ro.config.media_vol_steps.
 2014-09-04 00:55:14 +00:00
Glenn Kasten
9de9f08540 am 624b985d: am c39dfd87: am 57d76e43: Merge "Fix regression in CTS for AudioTrack" into lmp-dev 
* commit '624b985db885fddbaf33896fce0b66bc1dacbdaa':
  Fix regression in CTS for AudioTrack
 2014-09-03 23:59:37 +00:00
Jae Seo
0a514c0a87 TIF: Add Quebec ratings for Canada and fix the XML example 
Bug: 17332911, Bug: 17321648
Change-Id: Ice884ecdeda246e978ab235913e3e92d0c1e6ec2
 2014-09-03 16:42:39 -07:00
Jungshik Jang
9ed982d42d Rename ro.config.music_vol_steps into ro.config.media_vol_steps. 
Bug: 17342612
Change-Id: I77b08a606d26e3d3fd909e28c5ecb9898d214be0
 2014-09-04 08:36:21 +09:00
RoboErik
0d0f67f5ee Update VolumeProvider apis per feedback 
Added currentVolume to constructor.
Removed onGetCurrentVolume and notifyVolume changed.
Added setCurrentVolume and getCurrentVolume.
Updated javadoc to make it clear how they're used.

bug:17258168
Change-Id: I24388aab38824b101ccc18810caa09d46aa7afe0
 2014-09-03 16:29:15 -07:00
David Smith
005038abda Merge "Add RGBA8888 to MediaCodecInfo.CodecCapabilities" 2014-09-03 23:18:14 +00:00
David Smith
5576620c13 Add RGBA8888 to MediaCodecInfo.CodecCapabilities 
Change-Id: I0604aea94702dc81c903b7f5d2715dd078c41ca6
 2014-09-03 15:06:18 -07:00
Glenn Kasten
49367a367c Merge "Fix regression in CTS for AudioTrack" into lmp-dev 2014-09-03 18:31:59 +00:00
Youngsang Cho
92d4addf70 am 11fe15a2: am 5c674006: am 797b2b0d: Merge "Add a warning log when it takes long time to handle a message in TIS" into lmp-dev 
* commit '11fe15a214c4981dd03f4fa6109ed2d28e2f9598':
  Add a warning log when it takes long time to handle a message in TIS
 2014-09-03 17:42:18 +00:00
Youngsang Cho
9df2c1be32 Add a warning log when it takes long time to handle a message in TIS 
Bug: 17291092
Change-Id: If14ff467ac81d4f8d33febd57dd414dc5f4d3558
 2014-09-03 23:18:20 +09:00
RoboErik
057e9e6be0 am b263500a: am 42da57f1: am d4c2499c: Merge "Allow empty strings in playFromSearch" into lmp-dev 
* commit 'b263500a1368bf1865106c437b0cd2add94d65ae':
  Allow empty strings in playFromSearch
 2014-09-03 13:49:36 +00:00
RoboErik
b2f57cfd04 am a241a83d: am 720c772a: am d5ceabd3: Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* commit 'a241a83d18530d3bb9010a36f8cc89e50ad20c7b':
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 13:49:21 +00:00
Jungshik Jang
d6aefa5515 am 8271173e: am 4a948322: am befc4c11: Merge "Make stream_music volume configurable." into lmp-dev 
* commit '8271173e44340d4c67044c60cf908dba56fab8e8':
  Make stream_music volume configurable.
 2014-09-03 09:14:03 +00:00
Jean-Michel Trivi
6ae6b11e51 am f2bdd3fc: am 22a14cd2: am 73db0682: Merge "Restore permission check for mic muting" into lmp-dev 
* commit 'f2bdd3fcbbfade395c0a7de19f63a79e2e590f72':
  Restore permission check for mic muting
 2014-09-03 05:03:35 +00:00
RoboErik
bcd20f850c Merge "Allow empty strings in playFromSearch" into lmp-dev 2014-09-03 00:40:21 +00:00
RoboErik
4b253d2bcd Allow empty strings in playFromSearch 
This allows empty strings to be passed to playFromSearch to indicate
something should be chosen for the user and played. This makes it
consistent with INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH.

bug:17316566
Change-Id: I00ce8d252efa940e05568629e35198450c224a92
 2014-09-02 17:39:46 -07:00
RoboErik
42f0a36ece Merge changes Id38bcf7c,I54f156d9 into lmp-dev 
* changes:
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active
 2014-09-03 00:26:10 +00:00
RoboErik
f2133474af Update MediaController comment to mention notification listeners 
Forgot to update the comment to specify that notification listeners
may also get a MediaController from the manager.

Change-Id: Id38bcf7cb38185bfe4f99bcf8889a6415320dd36
 2014-09-02 17:22:08 -07:00
Jungshik Jang
e8f8bc0ad6 Merge "Make stream_music volume configurable." into lmp-dev 2014-09-02 23:20:32 +00:00
Jean-Michel Trivi
859f4f7272 Merge "Restore permission check for mic muting" into lmp-dev 2014-09-02 20:23:00 +00:00
Glenn Kasten
c56b808591 Fix regression in CTS for AudioTrack 
Bug: 17160316
Change-Id: Id1828f6684cdd410ee315c8b313d64785d786e1d
 2014-09-02 11:48:27 -07:00
Michael Wright
2993c30a33 am ac0f5a46: am 6e0bd93a: am b1ff74c9: Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 
* commit 'ac0f5a4616dab78a4216d826219379a663cc1139':
  VirtualDisplay.Callbacks -> Callback
 2014-09-02 18:36:06 +00:00
Jean-Michel Trivi
b129930398 am dbb72302: am 26f51de0: am cd46ad98: Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 
* commit 'dbb723022367174662a49aa4080286d454e2e0e4':
  Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager
 2014-09-02 18:36:01 +00:00
Ronghua Wu
98f883f8de am 50ac3f3c: am eaa9befb: am e4999af8: Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev 
* commit '50ac3f3c994e9a825f6f84445ce44ce8b4451c20':
  API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView
 2014-09-02 18:02:52 +00:00
RoboErik
5652066479 am 5728c18a: am c9942120: am b7d24c75: Merge "Update MediaBrowser to use String ids instead of Uris" into lmp-dev 
* commit '5728c18ac5a248bab36f7fefbf89c12ec0284fbb':
  Update MediaBrowser to use String ids instead of Uris
 2014-09-02 17:57:16 +00:00
Michael Wright
02aa75a083 Merge "VirtualDisplay.Callbacks -> Callback" into lmp-dev 2014-09-02 17:54:45 +00:00
Jean-Michel Trivi
5f4cfd3ab7 Merge "Move *_AUDIO_PLUG actions from Intent to android.media.AudioManager" into lmp-dev 2014-09-02 17:52:46 +00:00
Jae Seo
6203ec7bb3 am a49159c5: am 88a6ada7: am 746a550b: Merge "TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE" into lmp-dev 
* commit 'a49159c53f258a62afdd6ebe1e156e907b01ced4':
  TIF: Allow ISO 639-1 code for Channels.COLUMN_AUDIO_LANGUAGE
 2014-09-02 17:45:27 +00:00