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

9045 Commits

Author SHA1 Message Date
RoboErik
e8dc96e103 am 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 
* commit '0713f9449306b6a08ca8102f76452db270b6486a':
  Make setting the session token in MediaBrowserService synchronous
 2014-12-09 00:17:53 +00:00
Dongwon Kang
00274f76cd am 46e18c1d: am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev 
* commit '46e18c1d4159e1d34197d756e5df6a3d2e60ad04':
  TIF: increase the time threshold for tune operation which was too harsh
 2014-12-09 00:17:23 +00:00
Lajos Molnar
ceabd79c4b am 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev 
* commit '967da505b2cb96ed85161fd940dbecb467bfe38c':
  media: allow full range of Vorbis sampling rates
 2014-12-09 00:16:43 +00:00
RoboErik
0713f94493 am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 
* commit 'e9905bd489cd6fcb75203b97a3a7d60b95329a6a':
  Make setting the session token in MediaBrowserService synchronous
 2014-12-08 19:15:18 +00:00
Dongwon Kang
46e18c1d41 am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev 
* commit '91d6f185d3c9109ed21956df7d8fd9501ccf1f6c':
  TIF: increase the time threshold for tune operation which was too harsh
 2014-12-08 19:14:14 +00:00
Lajos Molnar
967da505b2 am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev 
* commit '2b6dc199432a574d8655734865b0d75d2140fd8c':
  media: allow full range of Vorbis sampling rates
 2014-12-08 19:12:07 +00:00
RoboErik
f58a909113 Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev 2014-12-05 17:57:15 +00:00
Dongwon Kang
670de6b627 Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev 2014-12-05 04:08:06 +00:00
Dongwon Kang
c0abc9cadb TIF: increase the time threshold for tune operation which was too harsh 
Bug: 18612616
Change-Id: I62ddde2f9796f3b1dd8240f5c88fbff234b3618b
 2014-12-05 08:57:48 +09:00
RoboErik
fd228a383c Make setting the session token in MediaBrowserService synchronous 
The MusicDemo was depending on the fact that setting the session token
is done synchronously and that getSessionToken can be called immediately
after. This makes setting the token synchronous again but leaves the
post to update any MediaBrowsers that are waiting on a connection.

This does introduce a small race condition if an app tries to set it
twice from different threads, but this is a very unlikely situation
and MediaBrowserService is not guaranteed to be thread safe.

bug:18603085
Change-Id: Id934c9f3b6520225cd92d1d8a6e2b3d606b8c6c8
 2014-12-04 14:48:38 -08:00
Chih-hung Hsieh
f597aae090 am e762f986: am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit 'e762f986c47caf90a4c5e2887ab41818a1c4599e':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 19:59:09 +00:00
Chih-hung Hsieh
e762f986c4 am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit '0ebbfaedd7fd843229d289baa69fffd33eab2985':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 19:51:15 +00:00
Lajos Molnar
610e288de6 media: allow full range of Vorbis sampling rates 
Bug: 18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
 2014-12-04 09:50:54 -08:00
Chih-hung Hsieh
ccce6e0f9f Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 2014-12-04 01:04:09 +00:00
Dongwon Kang
43a5124a6a am c0ab1086: am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 
* commit 'c0ab1086f06a01d28858c3ded1a15aa53af2960a':
  TIF: call tune() in HardwareSession
 2014-12-03 21:49:29 +00:00
Dongwon Kang
c0ab1086f0 am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 
* commit '25a051880666022163b9a641737f26adc31e5477':
  TIF: call tune() in HardwareSession
 2014-12-03 20:40:45 +00:00
Michael Wright
dae3912b3e am eb26c8ee: am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 
* commit 'eb26c8ee2a25e37eab4a34d772e9e7d90ae71fe4':
  Correctly iterate through MediaProjection callbacks.
 2014-12-03 17:19:01 +00:00
Mike Lockwood
0927c43c38 Merge "Remove obsolete AudioManager audio dock plugged Intents" 2014-12-03 13:39:26 +00:00
Michael Wright
eb26c8ee2a am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 
* commit '4de2ab4c55f74a7e166f58c7b7e72fc47c0d24c1':
  Correctly iterate through MediaProjection callbacks.
 2014-12-03 07:56:20 +00:00
Dongwon Kang
b0bbaec8be Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 2014-12-03 02:22:12 +00:00
Michael Wright
7081a5d1ae Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 2014-12-03 01:14:22 +00:00
Mike Lockwood
008dfadb31 Remove obsolete AudioManager audio dock plugged Intents 
We have no code that listens for AudioManager.ACTION_ANALOG_AUDIO_DOCK_PLUG
and AudioManager.ACTION_DIGITAL_AUDIO_DOCK_PLUG

Change-Id: I96a746c84e5a4b17df1b9fbdbb5de77e6bc39714
 2014-12-02 12:23:04 -08:00
Jean-Michel Trivi
2a1cdd4d4f am 8e74a8a7: am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 
* commit '8e74a8a77e06c93180a5b807c3d9865c89be3dc7':
  AudioMix address and type, rule exclusion API, dynamic source
 2014-12-02 17:31:25 +00:00
Jean-Michel Trivi
8e74a8a77e am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 
* commit '874e4502217aa48a06171a7d880b9ca571fd76b1':
  AudioMix address and type, rule exclusion API, dynamic source
 2014-12-02 17:25:24 +00:00
Jean-Michel Trivi
57457b98cf Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev 2014-12-02 17:09:30 +00:00
Jinsuk Kim
59efa5ec9c am f2d68c88: am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'f2d68c8811db6fee4650ae5cd310cbe54744d9df':
  audioservice: system audio control in master volume mode
 2014-12-02 07:42:56 +00:00
Dongwon Kang
0e7a556844 am b076324c: am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit 'b076324c64060161e75c35f43c688f7cf067e396':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:42:50 +00:00
Jinsuk Kim
f2d68c8811 am bfe763d1: am b4355ec3: Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 
* commit 'bfe763d1c96fe0f8e704743160a478d2e698a801':
  audioservice: system audio control in master volume mode
 2014-12-02 07:36:10 +00:00
Dongwon Kang
b076324c64 am 3599af39: am 7cfe00f6: Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 
* commit '3599af39e45af0498daa4873216a8cf4d6fe67f9':
  TIF: fix a race condition when TvInputManager is initialized
 2014-12-02 07:36:05 +00:00
Jinsuk Kim
b4355ec3d0 Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev 2014-12-02 07:26:41 +00:00
Dongwon Kang
7cfe00f693 Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev 2014-12-02 07:26:07 +00:00
Sungsoo Lim
f8225d3dd5 am 628e5214: am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev 
* commit '628e52147bf2df00f180b4c9157398edaffb2b19':
  Missing Javadoc update while API review
 2014-12-02 06:47:08 +00:00
Sungsoo Lim
628e52147b am 1f35568d: am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev 
* commit '1f35568d075e8c0401e3b00591dde2f6f3218b48':
  Missing Javadoc update while API review
 2014-12-02 03:40:46 +00:00
Sungsoo Lim
5a7445b00d Merge "Missing Javadoc update while API review" into lmp-mr1-dev 2014-12-02 03:29:10 +00:00
Zhijun He
1b536b8d93 am 0fb8fbd2: am c8d1b107: am 217814bf: Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev 
* commit '0fb8fbd2dd782b6d18d7f1f40aef2ec77fbfb62a':
  ImageReader: free direct byte buffers once Image is returned
 2014-12-02 01:59:52 +00:00
Zhijun He
0fb8fbd2dd am c8d1b107: am 217814bf: Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev 
* commit 'c8d1b107b0c05157b102be61c43131dd6992aad2':
  ImageReader: free direct byte buffers once Image is returned
 2014-12-02 01:54:29 +00:00
Dongwon Kang
993f81e238 TIF: fix a race condition when TvInputManager is initialized 
Currently, TvInputManagerService notifies the initial state of each
input via TvInputManagetCallback#onInputStateChanged after TvInputManager
is created. However, this is racy because the client may call methods
like getTvInputState() before the initialization.

This patch makes sure that the client gets the control when the initialization
finishes completely.

Bug: 18419452
Change-Id: I5d8141c20984013e68f2809120710c670557c9ad
 2014-12-02 09:30:57 +09:00
Zhijun He
e09dcdba71 ImageReader: free direct byte buffers once Image is returned 
This can prevent apps from accessing an image byte buffer when it is closed.

Bug: 12528089
Change-Id: I04dccf1832204be2ae3aeb3bbe04f616886447e6
 2014-12-01 23:57:11 +00:00
John Spurlock
aac7a9f4c7 am 34c9ee1a: am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '34c9ee1af8980594df096e7759c50277270e658c':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:54:45 +00:00
Wally Yau
7d64195e50 am 4b187a28: am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true. 
* commit '4b187a28106257638cac25360b8bb59cbf497582':
  Set stream volume to max when userMasterVolume is set to true.
 2014-12-01 19:53:55 +00:00
John Spurlock
34c9ee1af8 am 23a99a3a: am 21d68f48: Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 
* commit '23a99a3ab09d90e3613b44a0962de7ed0028d620':
  Volume: Improve inline volume controls used in settings.
 2014-12-01 19:47:58 +00:00
Wally Yau
4b187a2810 am 5b4e2e02: am da392904: Set stream volume to max when userMasterVolume is set to true. 
* commit '5b4e2e02744c676f2d282388c0d901494fe8a5b9':
  Set stream volume to max when userMasterVolume is set to true.
 2014-12-01 19:46:11 +00:00
John Spurlock
21d68f4808 Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 2014-12-01 17:06:14 +00:00
Jinsuk Kim
336cdb488f audioservice: system audio control in master volume mode 
Volume control in master mode should be transformed to
CEC commands if system audio is activated to delegate
the control to the connected AV receiver.

Refactored to use the interface to CEC service for
both master and stream type volume control.

Bug: 18560079

Change-Id: I2aefdc94a1bc3091c14fab849f899a0dc37c47bc
 2014-12-01 07:17:17 +00:00
Jean-Michel Trivi
1b3541d5ee AudioMix address and type, rule exclusion API, dynamic source 
- Simplify API for defining an exclusion-based rule: don't define
  an exclusion rule, add instead a way to exclude a rule.
- API for defining rules for dynamic sources (rule match on capture
  preset).
- Verify mix type when creating AudioRecord or AudioTrack for a mix.
- Use hashcode of mix for generating the device address.
- AudioService dump prints info about registered policies.
- Annotate as SystemApi the audio policy-related APIs.
- Express mixing match and exclude rule constants as flags for
  future-proofness

Bug 16006090
Bug 16009464

Change-Id: I0dabe71204501acaffea7ef0ddbbab9700e1bd87
 2014-11-30 14:33:29 -08:00
Wally Yau
da39290460 Set stream volume to max when userMasterVolume is set to true. 
When useMasterVolume is set, we don't want to apply the volume
attenuation twice, once at the stream mixer and once at the master
volume control. It should only be applied once at the master volume
control.

Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0
Fixed: b/18460548
 2014-11-28 12:40:30 -08:00
John Spurlock
bcc1087af4 Volume: Improve inline volume controls used in settings. 
- Make the system internal ringer mode change signal available to
   other system components via a standard intent, instead of a
   volume-controller-only binder call.
 - Update sysui to use new intent for icon policy.
 - Add proper muting state to the volumizer, to look more like
   the associated volume panel slider.
 - Add basic ringer mode state tracking for the notification-ring
   slider setting.

Bug: 17899613
Change-Id: Ie2df52edb070055ef59c74039162a0e785d2fdbb
 2014-11-28 15:29:21 -05:00
Dongwon Kang
266143e1fb TIF: call tune() in HardwareSession 
Background: The underlying passthrough TV input expects tune() command
to show video on the screen and call notifyVideoAvailable().

Bug: 18551619
Change-Id: I257db321c09d621e6bd3c0e69bfe0abfca5742a9
 2014-11-28 19:40:36 +09:00
Sungsoo Lim
4e389e557e Missing Javadoc update while API review 
Bug: 18550989
Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf
 2014-11-28 16:57:16 +09:00
Jinsuk Kim
b62d4ee785 am f657463a: am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 
* commit 'f657463a500e90acb2fa9991cd67629199ef7ab4':
  Do not perform forceVolumeControlStream in master volume mode
 2014-11-26 21:45:22 +00:00