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

8827 Commits

Author SHA1 Message Date
Eric Laurent
daccecb263 am d9764f1c: am 13e4928a: am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit 'd9764f1c233a3106ce11c4c48fb93b020a1061d4':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:15:55 +00:00
Eric Laurent
d9764f1c23 am 13e4928a: am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit '13e4928a49f6e86b5dd8c5a34b38550f110f1e99':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:09:57 +00:00
Eric Laurent
fe91d4e6a2 Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 2014-11-04 17:02:25 +00:00
Dongwon Kang
8f018e361b am 89ff8726: am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b 
* commit '89ff8726545e9cced824c655c8e46d1e8f82aa5e':
  TIF: Fix a typo and remove an unused method in TvInputService
 2014-11-04 03:28:22 +00:00
Eric Laurent
1a14ec04e3 am 12f6a11d: am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f 
* commit '12f6a11de637406a066c532a07f9d4466a652af0':
  AudioService: fix cross deadlock
 2014-11-04 03:28:16 +00:00
Dongwon Kang
89ff872654 am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b 
* commit 'e2e7e9df8b8db998d9d2cb2e43eae84df3edad64':
  TIF: Fix a typo and remove an unused method in TvInputService
 2014-11-04 03:16:30 +00:00
Eric Laurent
12f6a11de6 am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f 
* commit '8e264a7703c79fff52dedcd867b9f134d93199f6':
  AudioService: fix cross deadlock
 2014-11-04 03:16:23 +00:00
Dongwon Kang
085329b69a Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 2014-11-04 02:41:54 +00:00
Eric Laurent
adbe8bf85f AudioService: fix wired headset insertion delay. 
Do not systematically delay a device connection
message by 1 second if another message is still in the queue
but calculate delay based on last message insertion time.

Bug: 17882912.

Change-Id: Id86c338488f41eebfa1dfd926032468be0294cec
 2014-11-03 18:26:57 -08:00
Eric Laurent
8befd6fd05 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 2014-11-04 02:00:32 +00:00
Eric Laurent
8fa4d6f585 AudioService: fix cross deadlock 
Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
 2014-11-03 17:30:41 -08:00
Dongwon Kang
79d2b4c810 TIF: Fix a typo and remove an unused method in TvInputService 
Change-Id: I2c0233678c08a7070ffe507d9671e1ab669fdfd8
 2014-11-03 16:04:12 +09:00
Dongwon Kang
6dd6aac9ef am 099003bd: am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '099003bd20108ee5f2c5cdd00b78fc1779385714':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:23:57 +00:00
Dongwon Kang
099003bd20 am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '664eddfdc76cbe17f8b26d65528335d5430a6874':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:19:40 +00:00
Dongwon Kang
4dd56c93e3 TIF: Add more documentation on start/end time of TvContract.Program 
Bug: 18163685
Change-Id: Ifcd57330eb341adfbcb7fcf3482a701471bf729f
 2014-11-03 10:58:00 +09:00
Jean-Michel Trivi
34e62423f1 am 9e0fc95d: am 38b00a63: Merge "More AudioPolicy registration" into lmp-mr1-dev automerge: 5a51050 
* commit '9e0fc95d08652acaa4ab853917729922c40a734b':
  More AudioPolicy registration
 2014-10-31 16:50:10 +00:00
Jean-Michel Trivi
9e0fc95d08 am 38b00a63: Merge "More AudioPolicy registration" into lmp-mr1-dev 
automerge: 5a51050

* commit '5a51050519a3738488a4f7186e9822c448362a37':
  More AudioPolicy registration
 2014-10-31 16:42:48 +00:00
Jean-Michel Trivi
38b00a63c9 Merge "More AudioPolicy registration" into lmp-mr1-dev 2014-10-31 16:32:53 +00:00
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
Dongwon Kang
c86090ea0c am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d 
* commit 'c78d450b2ecc4668572ef6b312ff0d9d31cfd2f8':
  TIF: handle inputs holding the overlay view even after the session release
 2014-10-31 00:15:40 +00:00
Dongwon Kang
27219325d5 am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 
* commit '39567dd6480ae2527af8f53199e0f42e1de80b2c':
  TIF: Handle notifyXXX() calls requested before the session initialization
 2014-10-31 00:15:33 +00: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
Andre Eisenbach
1bf7bca511 am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev 
* commit '34964701e0ff9c07e8d3456fe6d1246d6e8078d1':
  Fix exception in AudioService when no BT Headset is connected.
 2014-10-30 23:42:40 +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
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
2577b3c0d8 Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev automerge: aab38b7 
automerge: e4c7a65

* commit 'e4c7a65140b5523325fd6ca86c196136fe183ee8':
  MediaCodec/Image: handle null cropRect correctly
 2014-10-28 06:23:59 +00:00
Mike Lockwood
bfdc6b50f4 Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev automerge: ac7d8c5 
automerge: 9f08a9f

* commit '9f08a9f08a3440e1f4a0b60c3e0cc5fe3dd71f27':
  Improve toString() methods for audio classes to help with debugging
 2014-10-28 00:29:57 +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
Eric Laurent
4ec1d430db am 670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev 
automerge: af93061

* commit 'af9306149323120d8098f5fdef15b923e36d9569':
  audioservice: fix default stream volume
 2014-10-27 21:32:52 +00: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
65c0d6ad0c am 14882cf3: am e828b6c0: Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev 
* commit '14882cf3773c7c142c9a8aa4eb7c95a80e5711f9':
  AudioService: Restore ringer-mode validation check.
 2014-10-27 13:41:18 +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
1c8317a539 am 39b15017: am f98fe42f: Merge "TIF: Notify of size change of the video in TvView" into lmp-mr1-dev 
* commit '39b150173ae3a2b6950553450648d5bb223542e3':
  TIF: Notify of size change of the video in TvView
 2014-10-24 18:34:30 +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
638cde9228 am 0fcddd51: am e41d967c: Merge "TIF: Cache the app private command and send it when connection is made" into lmp-mr1-dev 
* commit '0fcddd513868918215e889db07cdca126f942d89':
  TIF: Cache the app private command and send it when connection is made
 2014-10-24 17:14:23 +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