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

3578 Commits

Author SHA1 Message Date
Dongwon Kang
b6f66b4055 am c86090ea: am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d 
* commit 'c86090ea0ca6c9deaecd366d183d98ded71bd25b':
  TIF: handle inputs holding the overlay view even after the session release
 2014-10-31 00:25:56 +00:00
Dongwon Kang
7c1f55e6d3 am 27219325: am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 
* commit '27219325d5e83ad4c63ba3424fd99b24456b558a':
  TIF: Handle notifyXXX() calls requested before the session initialization
 2014-10-31 00:25:51 +00:00
Jean-Michel Trivi
8fdb0d4def More AudioPolicy registration 
Define new usage in AudioAttributes to describe "virtual" sources.
Maintain a registration string in AudioPolicy and AudioMix that
 is used for the address of the mix in the native policy manager.
AudioPolicy registration marks the audio policy configuration and
 the audio mixes as registered.
The AudioPolicy class is used as the factory for the AudioTrack
 and AudioRecord objects that are respectively used as the
 source and sink of the mixes created by the policy owner.

Bug 16009464

Change-Id: I8e5bd351495257597c513d22597e273fcabdbc55
 2014-10-30 17:22:34 -07:00
Andre Eisenbach
8d9a4da729 am 1bf7bca5: am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev 
* commit '1bf7bca511e3fdbb5e71bb71158d56400538b910':
  Fix exception in AudioService when no BT Headset is connected.
 2014-10-30 23:59:39 +00:00
Dongwon Kang
ce34c6d308 TIF: handle inputs holding the overlay view even after the session release 
Bug: 17336221
Change-Id: I7fb7890039bc3731b62410caa9802db5870ec2e2
 2014-10-30 13:37:03 +09:00
Dongwon Kang
c1f26faa2d Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 2014-10-30 04:32:30 +00:00
Dongwon Kang
3eefa59e37 TIF: Handle notifyXXX() calls requested before the session initialization 
Previously, we relied on a handler by posting runnables when the
session is not initialized yet. However, this trick was broken when we
separated the creation procedure into DO_CREATE_SESSION and
DO_NOTIFY_SESSION_CREATED.

Bug: 17909798
Change-Id: I46f610cb9673f8162266525ac0e343b61c6db9ec
 2014-10-30 09:34:56 +09:00
Andre Eisenbach
570cc5302a Fix exception in AudioService when no BT Headset is connected. 
If AudioManager.startBluetoothSco() is invoked with no Bluetooth Headset
connected, a NullPointerException will ensue.

Added check to make sure mBluetoothHeadsetDevice is set before accessing
it.

Bug: 17601845
Change-Id: Ia00bfffbea5484230b11a74787fe3309c18f824d
 2014-10-29 09:56:41 -07:00
RoboErik
563acea666 Post volume requests to the handler thread in MediaSession 
Volume requests should be getting sent on the same thread as other
callbacks, not on the binder thread.

bug:18156755
Change-Id: I35bceb3f8c74ccba35f3d08ff000a254fcbd04bb
 2014-10-28 13:26:26 -07:00
Lajos Molnar
53f1c8ba28 am 2577b3c0: Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev automerge: aab38b7 automerge: e4c7a65 
* commit '2577b3c0d82fc24ff9ae586ea4e976442be7c21e':
  MediaCodec/Image: handle null cropRect correctly
 2014-10-28 07:17:48 +00:00
Mike Lockwood
e889c8e393 am bfdc6b50: Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev automerge: ac7d8c5 automerge: 9f08a9f 
* commit 'bfdc6b50f49d6b0f352d0a8c0d63bbde0c6038e8':
  Improve toString() methods for audio classes to help with debugging
 2014-10-28 07:16:42 +00:00
Eric Laurent
972c42e34a am 4ec1d430: am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev automerge: af93061 
* commit '4ec1d430db6c9b564d9b78e3654507594e9dce8c':
  audioservice: fix default stream volume
 2014-10-28 07:16:21 +00:00
Lajos Molnar
5ea17442c5 MediaCodec/Image: handle null cropRect correctly 
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image

Bug: 18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
 2014-10-27 14:58:26 -07:00
Mike Lockwood
ac7d8c5cc8 Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev 2014-10-27 21:10:22 +00:00
Mike Lockwood
07cd124b09 Improve toString() methods for audio classes to help with debugging 
bug: 18139399

Change-Id: I6076f9f5daa3b485bc80a4ff1b16a583e6c93f67
 2014-10-27 14:07:35 -07:00
Eric Laurent
670a82cbb1 Merge "audioservice: fix default stream volume" into lmp-mr1-dev 2014-10-27 19:40:30 +00:00
Eric Laurent
91377de6f2 audioservice: fix default stream volume 
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.

Bug: 17507571.

Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
 2014-10-27 10:13:00 -07:00
John Spurlock
c58cabca58 am 65c0d6ad: am 14882cf3: am e828b6c0: Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 
* commit '65c0d6ad0c9413df9dae659eb7bc88f49c7c55c9':
  AudioService: Restore ringer-mode validation check.
 2014-10-27 13:46:31 +00:00
John Spurlock
e828b6c034 Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 2014-10-27 13:31:20 +00:00
John Spurlock
9755937ed9 AudioService: Restore ringer-mode validation check. 
Ensure the ringer-mode is valid when set, and forward client calls
to service method to centralize validation.

Bug: 17884168
Change-Id: I500f9beefbce5b7a8bc01ca9eb7b4a7a16114160
 2014-10-24 16:45:33 -04:00
Jae Seo
db8af33244 am 1c8317a5: am 39b15017: am f98fe42f: Merge "TIF: Notify of size change of the video in TvView" into lmp-mr1-dev 
* commit '1c8317a539d36054eefc216d5d16d5707daeb56a':
  TIF: Notify of size change of the video in TvView
 2014-10-24 18:39:10 +00:00
Jae Seo
6320fc490f TIF: Notify of size change of the video in TvView 
Put the necessary plumbing in place to notify of size change of the
video in TvView.
Put together the track related logic in TvInputManager.Session.
Protected track information with a lock.

Also modified debugging messages more consistently and fixed minor
warnings in TvView.

Bug: 17635300
Change-Id: I8d267d8a11056b5ccee1dacbf2d3391be16f811e
 2014-10-24 10:19:08 -07:00
Jae Seo
f3f9966a45 am 638cde92: am 0fcddd51: am e41d967c: Merge "TIF: Cache the app private command and send it when connection is made" into lmp-mr1-dev 
* commit '638cde9228b448c4f679f7d2c99f69a3f80ddc28':
  TIF: Cache the app private command and send it when connection is made
 2014-10-24 17:17:43 +00:00
Jae Seo
e41d967c5c Merge "TIF: Cache the app private command and send it when connection is made" into lmp-mr1-dev 2014-10-24 17:02:34 +00:00
Jae Seo
887f52144e TIF: Cache the app private command and send it when connection is made 
Bug: 17559793
Change-Id: If785d1ffceb5b5152381818efc4d1c8b5115143c
 2014-10-24 10:01:06 -07:00
Dongwon Kang
d53d07f6c4 am 27c7a7d0: Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf automerge: d048789 
* commit '27c7a7d06b488ad0b23ce02c88bc02b35ed8361e':
  TIF: Define more cannonical genres in TvContract
 2014-10-24 03:28:29 +00:00
Dongwon Kang
f6df7bff53 Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev 2014-10-24 02:24:18 +00:00
Wonsik Kim
937d5457df am fe86d924: Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev automerge: cfc7323 automerge: d651007 
* commit 'fe86d9247a4f0e52c2fb868479d78bc332ff3094':
  TIF: fix wrong config comparison & confusing method name
 2014-10-24 02:14:41 +00:00
Dongwon Kang
ebc8b2ceac am ef846dbe: Merge "TIF: exclude tuner TV input not having a setup activity in the input list." into lmp-mr1-dev automerge: f9f7acf automerge: 08fe9fb 
* commit 'ef846dbe99d3dd111641d3d78e5e470543d2f575':
  TIF: exclude tuner TV input not having a setup activity in the input list.
 2014-10-24 02:14:26 +00:00
Wonsik Kim
cfc73237e9 Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev 2014-10-24 01:34:05 +00:00
Dongwon Kang
5168a7a0d3 TIF: exclude tuner TV input not having a setup activity in the input list. 
By doing this, developers can notice the flaw of the input in advance.

Bug: 17647146
Change-Id: I123a5538566959320a6201a4d7952e205602a28a
 2014-10-24 10:23:13 +09:00
Jae Seo
119b38e01f am 39f21827: am 7d2dcd6b: am 6c9b0847: Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev 
* commit '39f218273204ab21ddb2b3ab33b41590b00bfaed':
  Update documentation for notifyTracksChanged() and notifyTrackSelected()
 2014-10-23 19:47:31 +00:00
Jae Seo
8ddb01ec7b Update documentation for notifyTracksChanged() and notifyTrackSelected() 
Bug: 18090857
Change-Id: I339a222454612e0111e79725de596a73f4d406b8
 2014-10-23 06:50:48 +00:00
Wonsik Kim
8f24a8b60f TIF: fix wrong config comparison & confusing method name 
TvStreamConfig should do deep comparison in TvInputHardwareManager
where the object gets created from binder calls. In addition to this
fix, modify [aA]ddStream to [aA]ddOrUpdateStream so that the method
name better reflects what it does.

Bug: 18027719
Change-Id: I43fa668f91cb9433beee97ee31b4b1f58f21bfcf
 2014-10-22 16:27:39 +09:00
Dongwon Kang
98feebe511 am a6372b3b: Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev automerge: 94e8b9d 
automerge: 37f3b0a

* commit '37f3b0ada474366073fc02585558f87d6385e392':
  TIF: add more documentation on Hardware session.
 2014-10-22 05:52:43 +00:00
Dongwon Kang
a6372b3be4 Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 2014-10-22 01:46:33 +00:00
RoboErik
c1012af764 am 5d2a142c: am c5109b1f: am 01c9d330: am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '5d2a142c4a1e24e97513475e51a4e13a811cd097':
  Add missing break to switch statement
 2014-10-20 22:37:00 +00:00
RoboErik
f0a284115a am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '2fa604fc59ded63a416066a0bc66f63069cae7f3':
  Add missing break to switch statement
 2014-10-20 22:14:10 +00:00
RoboErik
59759903a9 Add missing break to switch statement 
the skip to queue item case was falling through when it shouldn't.

bug: 18058515
Change-Id: Ica20b59efad12a58ad16501146fc9a0d4595e184
 2014-10-20 14:56:32 -07:00
RoboErik
9e74f807f5 am a24b3a12: am 7305b465: am d00e68c3: am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit 'a24b3a1233dbd5b8c226d89e098eda4cacddd49f':
  Set the metadata rating correctly in RCC
 2014-10-20 19:35:30 +00:00
RoboErik
26a4309492 am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit '578fbe898f1652b3166bd4e20647572dec9dfb14':
  Set the metadata rating correctly in RCC
 2014-10-20 19:13:20 +00:00
RoboErik
38696ba77d Set the metadata rating correctly in RCC 
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.

bug:18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
 2014-10-20 09:48:13 -07:00
Dongwon Kang
49c1b69a56 TIF: add more documentation on Hardware session. 
Bug: 17909341
Change-Id: Ie537eb77b6ac4b63e4e9306c1781f84dd4be2719
 2014-10-20 18:26:50 +09:00
Marco Nelissen
cddd127d7f am 95b9d04d: am d3a62f1b: am a2d77ed7: am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '95b9d04d74e47f4e13ad6941155d2227767ff026':
  Also consider secondary storage when verifying paths
 2014-10-16 18:12:52 +00:00
John Spurlock
382fa09178 am d20db283: am c824a9d4: am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'd20db2832ee868212546d386e5652c09ffd29dc4':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 07:00:28 +00:00
Marco Nelissen
4683a10f9c am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e':
  Also consider secondary storage when verifying paths
 2014-10-16 00:41:10 +00:00
Marco Nelissen
36c931b31a Merge "Also consider secondary storage when verifying paths" into lmp-dev 2014-10-16 00:38:03 +00:00
John Spurlock
3d4aec1bb7 am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'b2344c81bcf49129d303a2919cfffd7a720c261b':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-15 23:40:07 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths 
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
 2014-10-15 15:36:50 -07:00
John Spurlock
e5b42d97f6 Leave zen when apps set ringer-mode = non-silent (normal/vibrate). 
Apps can end up in priority mode by setting ringer-mode = silent.

Now they can leave priority mode by setting ringer-mode = non-silent.
  (normal or vibrate)

Bug: 17884168
Change-Id: I54c853885f4ae9ee618041dd7ac6ab0663fc7b37
 2014-10-15 13:32:31 -04:00