Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,780 Commits 3 Branches 0 Tags
12a44ca6f4e86cbf5d281eeb063df16ecc6abc27
Commit Graph

3520 Commits

Author SHA1 Message Date
Eric Laurent
7a27bc3a76 am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 21:57:35 +00:00
Michael Wright
18a635c2a1 am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53 
* commit '584674c39dad11be182ea3763df557d35554157b':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-10 21:32:45 +00:00
Jeff Sharkey
f16df1f34d am 236dc2c8: am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev automerge: 8650c35 
* commit '236dc2c81d9bb2a38b29dd1a4c7e23be25290ef2':
  Throw IOException when missing default ringtone.
 2014-12-10 21:32:39 +00:00
Ruben Brunk
fe6a5ae924 am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265 
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-10 17:44:36 +00:00
Eric Laurent
65bc1125b4 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev 2014-12-10 01:33:09 +00:00
Michael Wright
c6de3212c2 Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev 2014-12-09 23:39:50 +00:00
Jeff Sharkey
1102e712c1 Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev 2014-12-09 23:34:07 +00:00
Jeff Sharkey
87d76f6a3e Throw IOException when missing default ringtone. 
This is caught by Ringtone, and we then fall back to built-in
ringtone, which matches the expected CTS behavior.

Bug: 18610451
Change-Id: I234d17f7cf623b9b0af434e5d367aed28f203b14
 2014-12-09 15:27:25 -08:00
John Spurlock
b4b5c28c7d am 9cfdb4f6: am 967e19a4: am 2f47eaff: Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev 
* commit '9cfdb4f658b7f366780ccd1102959afcb76640b1':
  Volume: Only play the new vibrate hint once per volume-down.
 2014-12-09 23:18:40 +00:00
Ruben Brunk
3ef5033cda Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 2014-12-09 23:09:52 +00:00
Michael Wright
f32bd3c5cd Don't try to scale the bitmaps for null MediaMetadata. 
Bug: 18586572
Change-Id: I133e58eeb05136ca82cbd35840b68ebedd9ec365
 2014-12-09 13:23:44 -08:00
Ruben Brunk
f4a637d0be Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode. 
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
 2014-12-09 11:56:22 -08:00
Jean-Michel Trivi
b3f390fe86 am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev 
* commit '83d0c86b869fe84b3172028a5598ebd87ce7745b':
  Support collaborative audio focus handling
 2014-12-09 11:06:11 +00:00
Jeff Tinker
6d4c6db5cf am f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev 
* commit 'f062d8d7df6b6ca72f103d133a3483cd91c95c60':
  Unhide secure stop APIs
 2014-12-09 00:59:55 +00:00
RoboErik
9053ce8c20 am b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit 'b22eea724b4f1d1ccbb1fd7ddd2eb3d9eb3204c8':
  Route mute key events through MediaSessionService
 2014-12-09 00:59:30 +00:00
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
John Spurlock
795a514697 Volume: Only play the new vibrate hint once per volume-down. 
Bug: 18666334
Change-Id: Idfa1d0c104bb310548fde533932bffc2b41eafff
 2014-12-08 14:09:35 -05:00
Eric Laurent
7f5eb9fe3c AudioSystem JNI: Add audio policy custom mixes registration 
Bug: 16009464.

Change-Id: I3763e79f4fa0331acb56d1d6f575c7a36e0bebd5
 2014-12-08 09:37:30 -08:00
Jean-Michel Trivi
8638877f14 Merge "Support collaborative audio focus handling" into lmp-mr1-dev 2014-12-07 01:14:30 +00:00
Jean-Michel Trivi
0212be5150 Support collaborative audio focus handling 
Add new flag for an app to define it doesn't duck, but rather
  pauses when losing focus with AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK.
  This flag is to be used when requesting focus.
Add support for AudioPolicy to specify whether it will implement
  ducking itself, rather than it being handled by an app.
When ducking is handled by a policy, do not notify focus owners
  when they lose audio focus with LOSS_TRANSIENT_CAN_DUCK, unless
  they would have paused, as expressed with the
  AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS flag.
Add a focus listener for a policy to be notified of focus changes
  so it can properly implement its own ducking.

Bug 16010554

Change-Id: I11d7cdb85c52fd086128a44f4d938aaa44db5c25
 2014-12-05 18:41:28 -08:00
Jeff Tinker
846e712dc7 Unhide secure stop APIs 
Change-Id: If25406a6657c8f9d558e659bf5af73bac9bc434c
related-to-bug: 18053197
related-to-bug: 18076411
 2014-12-05 15:44:17 -08:00
RoboErik
d386d0f391 Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 2014-12-05 23:16:41 +00:00
RoboErik
7c82ced4fc Route mute key events through MediaSessionService 
This sends mute keys to the MediaSessionService and handles them
by toggling the appropriate stream. Muting remote playback is still
not supported.

bug:17501993
Change-Id: I18c5b037cde2175acbb64b118dd708514acfd8c9
 2014-12-05 12:41:34 -08: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
Lajos Molnar
610e288de6 media: allow full range of Vorbis sampling rates 
Bug: 18615604
Change-Id: I51f0c5c81145b94626f2b7e4505b905b63a572bf
 2014-12-04 09:50:54 -08: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
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
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
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
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
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
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
21d68f4808 Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev 2014-12-01 17:06:14 +00:00