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

8795 Commits

Author SHA1 Message Date
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
RoboErik
e55300b14a am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev 
* commit '2fa604fc59ded63a416066a0bc66f63069cae7f3':
  Add missing break to switch statement
 2014-10-20 22:13:58 +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
a24b3a1233 am 7305b465: am d00e68c3: am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit '7305b46527164a6a39681c8f8b721da198a582ae':
  Set the metadata rating correctly in RCC
 2014-10-20 19:30:41 +00:00
RoboErik
d00e68c3b6 am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit '26a4309492f5af6828738a469ad8f18f42c44a61':
  Set the metadata rating correctly in RCC
 2014-10-20 19:20:32 +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
c0d8bc38e1 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:10:42 +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
95b9d04d74 am d3a62f1b: am a2d77ed7: am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit 'd3a62f1b6e9993d3a4a5f477ae541686e6b57ef4':
  Also consider secondary storage when verifying paths
 2014-10-16 18:05:03 +00:00
Marco Nelissen
a2d77ed7d7 am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev 
* commit '4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
  Also consider secondary storage when verifying paths
 2014-10-16 17:45:36 +00:00
John Spurlock
d20db2832e am c824a9d4: am 4f7eee43: am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit 'c824a9d444bf3a7df5f9003bd839fd609130be9e':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 06:54:52 +00:00
John Spurlock
4f7eee438b am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 
* commit '3d4aec1bb79caea6fadc36a942fb0c0f84a0f4f2':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).
 2014-10-16 05:51:45 +00:00
Marco Nelissen
9e93d37154 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:42:04 +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
67541eada7 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:57:50 +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
Dongwon Kang
ba766977f5 TIF: Define more cannonical genres in TvContract 
Background: while categorizing broadcast genres into cannonical genres,
it turned out that the existing 11 genres are not enough. 6 more genres
are added.

Bug: 17597747
Change-Id: I14c00771d69f1e30fc2c0e3978298c67066117e5
 2014-10-15 11:32:20 +09:00
Chong Zhang
6725305137 am 8dac6fe7: am d4410a19: am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit '8dac6fe7ae724549607b6400bdfc789f7a323472':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-10 16:59:22 +00:00
Chong Zhang
d4410a19bc am d25b996a: am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'd25b996a7ab2589f258d0006dda6589f53d98366':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:17:29 +00:00
Chong Zhang
d25b996a7a am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 19:11:11 +00:00
Chong Zhang
c81cccf8ab am a6ae8ba4: MediaHTTPConnection: do not use proxy for localhost 
* commit 'a6ae8ba4a59f3f893fe8893335e7517388123c10':
  MediaHTTPConnection: do not use proxy for localhost
 2014-10-09 12:52:00 +00:00
Chong Zhang
a6ae8ba4a5 MediaHTTPConnection: do not use proxy for localhost 
Bug: 17681512
Change-Id: Iba25d89636d8f96efc0eb90e0dd7a135c82ff16a
 2014-10-09 02:07:40 +00:00