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

8920 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Hochi Huang
2a4425c172 am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
automerge: 8659bf1

* commit '8659bf1929ee2cc4b3c7fd8eaa43825b6d069fb1':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:39:36 +00:00
Dongwon Kang
27c7a7d06b Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf 
automerge: d048789

* commit 'd048789aeaf64779a7062faa3bd806c69652857a':
  TIF: Define more cannonical genres in TvContract
 2014-10-24 03:24:49 +00:00
Hochi Huang
35658cc42e am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
* commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:17:24 +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
fe86d9247a Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev automerge: cfc7323 
automerge: d651007

* commit 'd6510073e7c969c49713f57c0625bb445f8ea210':
  TIF: fix wrong config comparison & confusing method name
 2014-10-24 02:08:06 +00:00
Dongwon Kang
ef846dbe99 Merge "TIF: exclude tuner TV input not having a setup activity in the input list." into lmp-mr1-dev automerge: f9f7acf 
automerge: 08fe9fb

* commit '08fe9fbf56e8954ee4817c7ae69b1e6b059a864f':
  TIF: exclude tuner TV input not having a setup activity in the input list.
 2014-10-24 02:06:07 +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
Hochi Huang
4a7873f19a [FM]Fix FM App record fail Buganizer ID: 17975676 
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
    Review: https://partner-android-review.git.corp.google.com/#/c/185235

Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
 2014-10-24 00:47:54 +00:00
Jae Seo
39f2182732 am 7d2dcd6b: am 6c9b0847: Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev 
* commit '7d2dcd6b677f99da90d1cdb65fcfedcb03e54801':
  Update documentation for notifyTracksChanged() and notifyTrackSelected()
 2014-10-23 15:58:49 +00:00
Jae Seo
6c9b08478b Merge "Update documentation for notifyTracksChanged() and notifyTrackSelected()" into lmp-mr1-dev 2014-10-23 06:51:09 +00:00
Jae Seo
8ddb01ec7b Update documentation for notifyTracksChanged() and notifyTrackSelected() 
Bug: 18090857
Change-Id: I339a222454612e0111e79725de596a73f4d406b8
 2014-10-23 06:50:48 +00:00
Leon Scroggins III
b3d2a85b64 am 694fd58d: am fed9888e: Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev 
* commit '694fd58dd93b6360ec2204dab731d3c68847478b':
  Remove outdated tests for custom decoder.
 2014-10-22 22:39:30 +00:00
Leon Scroggins III
8e8a0d6eaf Remove outdated tests for custom decoder. 
These tests don't appear to be meaningful. We are comparing an
unused decoder against one that is used.

Keeping this test building (the primary changes to this directory
in a while) is not believed to be worth the effort.

BUG:17419670
Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
 2014-10-22 18:17:14 +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
37f3b0ada4 am a6372b3b: Merge "TIF: add more documentation on Hardware session." into lmp-mr1-dev 
automerge: 94e8b9d

* commit '94e8b9dc6e001b6d830caa5ff55f4baa809dbba6':
  TIF: add more documentation on Hardware session.
 2014-10-22 05:19:59 +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
5d2a142c4a am c5109b1f: am 01c9d330: am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit 'c5109b1ffe5fd8d8d95e233edf5e923ae0bbd9f6':
  Add missing break to switch statement
 2014-10-20 22:31:51 +00:00
RoboErik
01c9d330b7 am f0a28411: am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit 'f0a284115a8fb089806eb87db1a20468dd55ecd3':
  Add missing break to switch statement
 2014-10-20 22:19:54 +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