Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,989 Commits 3 Branches 0 Tags
0827369def8ac6b8a4e4f3e4e4e2f2f1e5c8dcb6
Commit Graph

7994 Commits

Author SHA1 Message Date
Jim Miller
0827369def am 327d056d: am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '327d056dca4cc804db27ae9591e20c7026cf1bd2':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-20 02:26:01 +00:00
Ye Wen
fd3db01621 am 8535b51d: am 1100f339: am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '8535b51d0de6f3ac3bfa566fff2b386291f1dfc0':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-20 02:25:56 +00:00
Jim Miller
43096b2bba Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 2014-07-17 21:58:28 +00:00
Jim Miller
06e345089a Add DevicePolicyManager flag for fingerprint. 
Change-Id: Icb3e4b98d97487179acefabc7a3b747d3d0fa23a
 2014-07-18 20:48:34 +00:00
Ye Wen
2ab56b0d1f Unhide MMS APIs for MSIM (1/2) 
b/14095333

Change-Id: I26a7fa657ba44799d2fb3a75f49c600f4a02746a
 2014-07-18 14:16:59 -07:00
Andre Eisenbach
476e81bc0c am d19094c6: am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4) 
* commit 'd19094c6ec1cb5640f8d75cef55336e4f6284d90':
  LE: Add connection parameter update request API (4/4)
 2014-07-18 19:42:50 +00:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4) 
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
 2014-07-18 12:13:46 -07:00
Youngsang Cho
308bdaa76b am 4dcc320a: am 2ec6fb80: am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev 
* commit '4dcc320a1e2f7e3809115b5e20dfb456c2b1fd04':
  TIF: Add unblock content
 2014-07-18 19:06:18 +00:00
Youngsang Cho
24ee286752 am f845024c: am 7c8bbd53: am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 
* commit 'f845024c066381f26f4cca9ab72a8864cc48fead':
  TIF: Add onInputAdded and onInputRemoved
 2014-07-18 19:05:44 +00:00
Dan Sandler
9d1ebd82ba am d97d02e0: am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev 
* commit 'd97d02e090ee86675b34416e2be0c5a724790db0':
  Deprecate and stop generating tickerViews.
 2014-07-18 19:05:39 +00:00
Brian Attwell
ace692ef6d am 8f17b084: am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 
* commit '8f17b084f9d75c33ed2c5a74f755f37d030f9650':
  Mark social APIs stream APIs as deprecated
 2014-07-18 19:05:29 +00:00
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +00:00
Ihab Awad
007687b36a am 857a001f: am 012f470a: am 42c4a935: Merge "Wire up multi-SIM experience (1/4)" into lmp-dev 
* commit '857a001f32387211b3b06b82cb5ce275d02c63a2':
  Wire up multi-SIM experience (1/4)
 2014-07-18 17:33:12 +00:00
Niels Egberts
a2f65f95d6 am 80f946af: am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev 
* commit '80f946af928fad7f4f66adc99642e7451d1d5865':
  New TtsSpan builders for types measure, time, date, digits and verbatim.
 2014-07-18 16:03:31 +00:00
Jean-Michel Trivi
ce2ced1c83 am 873b041c: am f582d947: am 9319d51e: Merge "Unhide audio virtualizer capability query methods" into lmp-dev 
* commit '873b041cfc15de07ddece33bd6594438ec640ffc':
  Unhide audio virtualizer capability query methods
 2014-07-18 15:44:03 +00:00
Niels Egberts
0ee4208d40 am ebeaf8bb: am 50084b07: am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 
* commit 'ebeaf8bb6fd8d30f9c1188dbd5d7e405a133796d':
  Add builders for TtsSpans of type ordinal, decimal and fraction.
 2014-07-18 15:40:01 +00:00
Narayan Kamath
d18247ab2b am b157ce37: am 0a7a175b: am c2819ea1: Merge "Unhide." into lmp-dev 
* commit 'b157ce3757ac309c7769f85d3b9ca9e8630bfbc8':
  Unhide.
 2014-07-18 14:15:48 +00:00
Dongwon Kang
5d86c32fc3 am b4a88032: am 46c65057: am 0e02f53c: TIF: introduce TvContract.buildChannelUriForPassthroughTvInput() 
* commit 'b4a88032576e4af0deefc5415710f019031daaba':
  TIF: introduce TvContract.buildChannelUriForPassthroughTvInput()
 2014-07-18 13:13:42 +00:00
Wonsik Kim
25d39bc334 am e1b81079: am 480dd588: am 5fec7afe: Merge "TIF: change onCreateSession() method signature" into lmp-dev 
* commit 'e1b810793924956eb5517cd4e2c57a721e8f750e':
  TIF: change onCreateSession() method signature
 2014-07-18 13:13:37 +00:00
Youngsang Cho
f5eb7e4870 am 860ba40c: am f6a118b2: am ad67fc6f: Fix a build breakage 
* commit '860ba40c471521489fc5d6f753f93045ed088618':
  Fix a build breakage
 2014-07-18 13:13:33 +00:00
Dongwon Kang
eea9743ba5 TIF: introduce TvContract.buildChannelUriForPassthroughTvInput() 
This change adds a way to get a dummy channel for starting pass-through
TV inputs which don't have real channels in TvProvider.
Bug: 15496325

Change-Id: I7a6b99964319f12a0f8692b4e307e03480119a69
 2014-07-18 16:24:57 +09:00
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved 
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
 2014-07-18 15:35:25 +09:00
Youngsang Cho
3b0f928475 Fix a build breakage 
Updated current.txt.

Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
 2014-07-17 21:27:00 -07:00
Youngsang Cho
c941837cc1 am a2fb0d77: am 33b7885e: am d81f1075: Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 
* commit 'a2fb0d77795c4129382fcf930f03a79bd0cf76c2':
  TIF: Change the parameter of TvInputInfo.loadLabel/Icon
 2014-07-18 03:45:52 +00:00
Youngsang Cho
96cdc2327c am 38683808: am eede71e5: am aa5dbe63: Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev 
* commit '38683808a6b14a1a26ebddcba60f2261ff997054':
  TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
 2014-07-18 03:45:48 +00:00
Youngsang Cho
32e9d53123 am 9f4847e1: am 9dc7566a: am 57df5b3d: Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 
* commit '9f4847e138f5b5fd641b20cf4fd98f2eabe12d3a':
  TIF: Add a notification for surface change from TvView to TvInputService
 2014-07-18 03:45:43 +00:00
Jae Seo
2bf0cf0207 am 326896be: am eb39352e: am cd12bfc7: TIF: Add a method to get TvInputInfo for a given TV input 
* commit '326896be4943dc33965a13bd57eacf41b18ba11c':
  TIF: Add a method to get TvInputInfo for a given TV input
 2014-07-18 03:41:34 +00:00
Jae Seo
136a546099 am 0d9329d2: am e2ef18ce: am 27d12ca6: TIF: Add buildInputId() 
* commit '0d9329d24cf6c6f01576cf276bdd995f2f53eed4':
  TIF: Add buildInputId()
 2014-07-18 03:41:25 +00:00
Jae Seo
c2809b7597 am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
  TIF: Add TvParentalControlManager
 2014-07-18 03:37:10 +00:00
Jae Seo
b375805f3b TIF: Add a method to get TvInputInfo for a given TV input 
This is going to be needed by applications to get information about the
inputs that are just added thus not included in the previously retrieved
input list.

Bug: 16166859, Bug: 15838097
Change-Id: Icecd03fcea208a0c4d41caab1eec64e574f40877
 2014-07-17 20:25:01 -07:00
Jae Seo
5507bd7688 TIF: Add buildInputId() 
A recent change mandated that we should provide "input ID" instead of
ComponentName when building URIs for channels/programs while there is no
direct way to get one to use with. This CL added a method to build an ID
from a ComponentName.

Change-Id: Ia7f868cf241bb44ca0d4f689dc15326ce6944468
 2014-07-17 20:23:52 -07:00
Tyler Gunn
439a6f9644 am 612354c2: am 6edbc6ed: am 1a0365fd: Merge "Wiring video state through from Connection" into lmp-dev 
* commit '612354c2967226daa41334faea060da61d7eb033':
  Wiring video state through from Connection
 2014-07-18 03:19:12 +00:00
Marcin Kosiba
b04162ab75 am 6ee098ec: am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API. 
* commit '6ee098ec1ebc15e8816eebd519fbe90c40c7c90d':
  Add a WebView.zoomBy API.
 2014-07-18 03:18:54 +00:00
Marcin Kosiba
3ee06efef3 Add a WebView.zoomBy API. 
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.

BUG: 13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
 2014-07-18 02:18:44 +01:00
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +00:00
Jaewan Kim
903d6b72cd TIF: Add unblock content 
When a TV content is blocked by the parental control settings,
TV input service will notify TV to request user's PIN code verification.

If the verification succeeds, TV input service will be notified back
that content is unblocked so it can keep playing the content.

Bug: 13172379
Change-Id: I7b31d762eb54612c4d8779ee133211f32fb73b05
 2014-07-18 11:11:38 -07:00
Youngsang Cho
2b8aa9903a Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
abebf6df87 TIF: Change the parameter of TvInputInfo.loadLabel/Icon 
Labels and icons will be extracted from URI in the future.
To acheive it, we need Context rather than PackageManager.

Bug: 16166859
Change-Id: I20f0506fba5876a6cf21b70e44bb3a2265f723d7
 2014-07-17 17:49:29 -07:00
Youngsang Cho
c66ca1267c Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
e821d711db TIF: Add a notification for surface change from TvView to TvInputService 
Bug: 15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
 2014-07-17 17:30:36 -07:00
Ihab Awad
f93769c4ce Merge "Wire up multi-SIM experience (1/4)" into lmp-dev 2014-07-17 21:09:48 +00:00
Ihab Awad
94cf4bff13 Wire up multi-SIM experience (1/4) 
Change-Id: Ib63843267f06b329a675e7ea86167b2cbb554f1b
 2014-07-18 10:02:25 -07:00
Jean-Michel Trivi
010150a136 Merge "Unhide audio virtualizer capability query methods" into lmp-dev 2014-07-17 21:09:48 +00:00
Jean-Michel Trivi
2e7dd4bfc2 Unhide audio virtualizer capability query methods 
Unhide the new method to query the Virtualizer effect implementation
 about its capabilities in terms of input, device support, and
 virtual speaker angles.

Change-Id: I4478f7837efe8c9d52978244a3402c7f8590e585
 2014-07-18 08:01:07 -07:00
Wonsik Kim
5b2295a521 Merge "TIF: change onCreateSession() method signature" into lmp-dev 2014-07-17 21:07:39 +00:00
Wonsik Kim
1032f034ff TIF: change onCreateSession() method signature 
Bug: 16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
 2014-07-18 12:00:20 +09:00
Niels Egberts
7a56ea350f Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev 2014-07-17 19:45:26 +00:00
Niels Egberts
6e7c8995dd New TtsSpan builders for types measure, time, date, digits and verbatim. 
Change-Id: I60022aa72c64f454261a0b69c21c45ce6351b9e7
 2014-07-18 16:36:11 +01:00
Niels Egberts
f976abe700 Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 2014-07-17 19:45:26 +00:00
Niels Egberts
a896363400 Add builders for TtsSpans of type ordinal, decimal and fraction. 
Also document the possibility to give phone numbers in parts.

Change-Id: Ie1cdf56cc3b6c221c9410fb02dcba2568ea337b7
 2014-07-18 13:43:22 +01:00