OSDN Git Service
Ji-Hwan Lee [Mon, 21 Jul 2014 08:18:53 +0000 (08:18 +0000)]
Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev
Ji-Hwan Lee [Sat, 19 Jul 2014 13:20:31 +0000 (22:20 +0900)]
TIF: Extend multiple TV input per service for HDMI logical devices
Remove ITvInputManager.registerTvInputInfo() and let addTvInputInfo*()
cover the registration.
Bug:
15570939
Change-Id: Ic36701de96696e7fe32fc1faa0d5f6fde53f6666
Santos Cordon [Mon, 21 Jul 2014 02:06:29 +0000 (19:06 -0700)]
Change telecomm APIs from protected to public (1/3)
Bug:
16416927
Change-Id: I859c80a120fa59bba12a5c6bfca17fa57613a6aa
Jinsuk Kim [Mon, 21 Jul 2014 05:47:48 +0000 (05:47 +0000)]
Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
Joe Onorato [Sun, 20 Jul 2014 01:25:47 +0000 (18:25 -0700)]
Move android.bluetooth and android.telephony to framework2.jar.
Change-Id: I53cdd2a07165427c4dea037893ade3049f57f584
Jinsuk Kim [Mon, 21 Jul 2014 04:31:45 +0000 (13:31 +0900)]
Invoke callback for HdmiControlService.deviceSelect() for internal source
The call should be always successful if device to switch to is internal
TV source as setting it as the active source doesn't require communication
with other devices. Added the missing callback invocation.
Change-Id: I9968098316a955509f4de0e7af6f4407087ad4a2
Santos Cordon [Mon, 21 Jul 2014 00:44:37 +0000 (00:44 +0000)]
Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev
Santos Cordon [Sat, 19 Jul 2014 21:57:05 +0000 (14:57 -0700)]
Change incoming call intent to a TelecommManager method. (1/3)
Also moves a few constants from TelecommConstants to TelecommManager.
Bug:
16416927
Change-Id: I8e74feb228523ed1c186b2f06784d04cb9141f86
Jean-Michel Trivi [Mon, 21 Jul 2014 00:37:52 +0000 (00:37 +0000)]
Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev
Youngsang Cho [Sat, 19 Jul 2014 01:07:54 +0000 (18:07 -0700)]
TIF: update documentation of TvInputInfo.getParentId()
Change-Id: I5c0733d28621486ec0ff0f093c22eb1cc05f785d
Jean-Michel Trivi [Sun, 20 Jul 2014 23:52:11 +0000 (16:52 -0700)]
Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition
Bug
16401631
Change-Id: I522e7c7030a71b528a484d4d8ae517b4b09460bf
Sandeep Siddhartha [Sun, 20 Jul 2014 19:22:56 +0000 (12:22 -0700)]
Fix synchronization issues in AlwaysOnHotwordDetector
- Remove unnecessary recognition status from AlwaysOnHotwordDetector
- Remove unnecessary recognition started callback from IRecognitionStatusCallback
- Fix a bug around the fact that we weren't picking up enrollment at runtime because
we were storing the availability at instantiation time.
- Handle 0-length arrays in SoundTrigger classes while parceling/unparceling
- Fix issue in SoundTrigger helper where we were not comparing binders for start/stop calls
- Unload the previous model when starting a new recognition
- Add more debug logging
Change-Id: Icc56d7f3dd1ffa49a8cfeea49080e3ab4d342c32
Evan Charlton [Sun, 20 Jul 2014 22:40:38 +0000 (22:40 +0000)]
Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev
Evan Charlton [Sun, 20 Jul 2014 19:31:00 +0000 (12:31 -0700)]
Rename PhoneAccountMetadata to PhoneAccount
Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
Baligh Uddin [Sun, 20 Jul 2014 20:19:37 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iad977cd9e130e353572188f6cac5c004268fc28d
Auto-generated-cl: translation import
Jean-Michel Trivi [Sun, 20 Jul 2014 20:20:31 +0000 (20:20 +0000)]
Merge "API for audio session ID generation" into lmp-dev
Jean-Michel Trivi [Sat, 19 Jul 2014 01:45:32 +0000 (18:45 -0700)]
API for audio session ID generation
Expose the value used by the framework to generate an audio
session ID when a value isn't known.
Rename allocateAudioSessionId() to generateAudioSessionId()
as this operation doesn't "allocate" anything, and there is
no allocated resource to free after this operation.
Bug
16401631
Change-Id: I7a7bc05b39ea0b024ff225254eb755a9c85a2ad9
Jungshik Jang [Mon, 21 Jul 2014 06:13:07 +0000 (06:13 +0000)]
Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
Jinsuk Kim [Mon, 21 Jul 2014 04:58:50 +0000 (04:58 +0000)]
Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev
Jinsuk Kim [Fri, 18 Jul 2014 08:22:26 +0000 (17:22 +0900)]
TIF: Register IHdmiInputChangeListener to physical input manager
This lets the manager receive the callback from HdmiControlService
when a CEC device requests that it shall be the active source. It will be
transformed to an intent with a channel URI associated with
the corresponding TV input.
Change-Id: I02d4b24d5d05ad7a093e3b996942cbc43fd1ce8b
Jesse Hall [Mon, 21 Jul 2014 04:51:53 +0000 (04:51 +0000)]
Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev
Santos Cordon [Mon, 21 Jul 2014 02:31:57 +0000 (02:31 +0000)]
Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev
Jae Seo [Sat, 19 Jul 2014 05:16:08 +0000 (22:16 -0700)]
TIF: Add sendAppPrivateCommand()
Added a way to send a private command from the application to the TV
input. This can be used to provide domain-specific features that are
only known between certain TV inputs and their clients.
Change-Id: I7548311a64147b8ff27562ec680b941e2ec10bc0
Santos Cordon [Mon, 21 Jul 2014 00:47:12 +0000 (17:47 -0700)]
Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)
Bug:
16416927
Change-Id: If2d1c19134d2245677f7e0b3d94b118d9b50e751
Evan Charlton [Mon, 21 Jul 2014 01:36:53 +0000 (01:36 +0000)]
Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev
Evan Charlton [Mon, 21 Jul 2014 01:09:38 +0000 (18:09 -0700)]
@hide CAPABILITY_CALL_PROVIDER
Until this API is fleshed out, leave ourselves room to tweak it.
Change-Id: Iddedb629d6fa02a56cd2041686dbe54ea5e4793b
Santos Cordon [Sat, 19 Jul 2014 20:10:40 +0000 (13:10 -0700)]
Rename InCallCall to ParcelableCall (1/2)
Bug:
16416927
Change-Id: Iae97d83ce74b4395d6877cc167d7e5057dac201b
Jesse Hall [Fri, 18 Jul 2014 18:54:41 +0000 (11:54 -0700)]
Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
Bug:
15593761
Change-Id: Id1865cbf27c98a611cc6414fe47ee979c1d7cee2
Winson Chung [Fri, 18 Jul 2014 01:39:02 +0000 (18:39 -0700)]
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug
16322100)
Youngsang Cho [Fri, 18 Jul 2014 18:42:59 +0000 (18:42 +0000)]
Merge "TIF: Add unblock content" into lmp-dev
Youngsang Cho [Fri, 18 Jul 2014 18:42:33 +0000 (18:42 +0000)]
Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev
Jaewan Kim [Wed, 16 Jul 2014 02:28:56 +0000 (11:28 +0900)]
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
Jaewan Kim [Tue, 15 Jul 2014 04:01:57 +0000 (13:01 +0900)]
TIF: Add onInputAdded and onInputRemoved
Bug:
16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
Evan Charlton [Mon, 21 Jul 2014 01:08:20 +0000 (01:08 +0000)]
Merge "Rename setDestroy() to destroy()" into lmp-dev
Evan Charlton [Sat, 19 Jul 2014 23:31:02 +0000 (16:31 -0700)]
Rename setDestroy() to destroy()
Change-Id: I6bb46e679f55547b902d5850ab450e5d3818fa63
Wonsik Kim [Fri, 18 Jul 2014 04:34:51 +0000 (04:34 +0000)]
Merge "TIF: change onCreateSession() method signature" into lmp-dev
Youngsang Cho [Fri, 18 Jul 2014 04:24:06 +0000 (21:24 -0700)]
Fix a build breakage
Updated current.txt.
Change-Id: Ib1434da2345aa349e5fc3112bf38dbba9955c885
Wonsik Kim [Fri, 18 Jul 2014 02:36:59 +0000 (11:36 +0900)]
TIF: change onCreateSession() method signature
Bug:
16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
Youngsang Cho [Fri, 18 Jul 2014 03:30:55 +0000 (03:30 +0000)]
Merge "TIF: Change the parameter of TvInputInfo.loadLabel/Icon" into lmp-dev
Youngsang Cho [Thu, 17 Jul 2014 22:24:22 +0000 (15:24 -0700)]
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
Dan Sandler [Fri, 18 Jul 2014 18:00:17 +0000 (18:00 +0000)]
Merge "Deprecate and stop generating tickerViews." into lmp-dev
Dan Sandler [Fri, 18 Jul 2014 15:31:15 +0000 (11:31 -0400)]
Deprecate and stop generating tickerViews.
Tickers have been replaced in the UI by heads-up
notifications (and not creating the tickerView will save
memory, almost 150k if you have an xhdpi largeIcon).
Update docs to explain that tickers are just for
accessibility now.
Bug:
16395266
Change-Id: Ib1372b34c1c261f64228bbe705d174675cd007dc
Narayan Kamath [Fri, 18 Jul 2014 13:57:23 +0000 (13:57 +0000)]
Merge "Unhide." into lmp-dev
Narayan Kamath [Fri, 18 Jul 2014 13:54:24 +0000 (14:54 +0100)]
Unhide.
Change-Id: Ie5788bfdde7ec7394dbd6e11e63e3044ccc5a802
Ji-Hwan Lee [Fri, 18 Jul 2014 12:39:57 +0000 (21:39 +0900)]
Fix android_system_stubs build
Change-Id: I52c42b5d781b5c07481cdce598d2ebc340d57850
Christoph Studer [Fri, 18 Jul 2014 11:10:27 +0000 (11:10 +0000)]
Merge "Cancel notification group children when summary is canceled" into lmp-dev
Bryan Mawhinney [Fri, 18 Jul 2014 09:36:20 +0000 (09:36 +0000)]
Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev
Bryan Mawhinney [Fri, 18 Jul 2014 09:35:12 +0000 (10:35 +0100)]
Default MediaStyled notifications to CATEGORY_TRANSPORT
This makes it easier to identify them later (e.g., for filtering).
The developer can always specify a different category if preferred.
Also fixed some javadoc related to setMediaSession()
Change-Id: I5f28514758218ff66fdbaa9fd37ccb19f12d4852
Dongwon Kang [Tue, 15 Jul 2014 12:36:43 +0000 (21:36 +0900)]
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
Dan Sandler [Fri, 18 Jul 2014 17:54:23 +0000 (17:54 +0000)]
Merge "Actually show secret notifications sometimes." into lmp-dev
Dan Sandler [Fri, 18 Jul 2014 16:43:45 +0000 (12:43 -0400)]
Actually show secret notifications sometimes.
Factor out the "should we be hiding sensitive data"
predicate so we get it right everywhere.
Show visibility stuff in Notification.toString().
Bug:
16307122
Change-Id: Ifd16d073c4595add2ac3582ffc0d0179e55246e5
Dan Sandler [Fri, 18 Jul 2014 13:49:59 +0000 (13:49 +0000)]
Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev
Dan Sandler [Thu, 17 Jul 2014 20:01:28 +0000 (16:01 -0400)]
Shrink user profile bitmaps to 48dp^2.
Can save megabytes of memory.
Bug:
16371371
Change-Id: Ifec5cff3a3376d045ee4e3b605edeb8d9ac93799
Tyler Gunn [Fri, 18 Jul 2014 02:30:22 +0000 (02:30 +0000)]
Merge "Wiring video state through from Connection" into lmp-dev
Tyler Gunn [Thu, 17 Jul 2014 14:50:22 +0000 (07:50 -0700)]
Wiring video state through from Connection
Bug:
16285417
Bug:
16013178
Change-Id: Ia48959248ca22f4569b0ffd01a1716470aa0a711
Marcin Kosiba [Tue, 15 Jul 2014 16:59:51 +0000 (17:59 +0100)]
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
Sandeep Siddhartha [Fri, 18 Jul 2014 02:28:55 +0000 (02:28 +0000)]
Merge "Test hotword flow" into lmp-dev
Sandeep Siddhartha [Thu, 17 Jul 2014 06:55:41 +0000 (23:55 -0700)]
Test hotword flow
- Also fix a few StrictMode violations in DatabaseHelper
Change-Id: I93f27407dae34cc0dca5e9f891d4ca718d6010a5
RoboErik [Fri, 18 Jul 2014 01:26:21 +0000 (18:26 -0700)]
Fix crash when calling MediaSession callback
bug:
16311395
Change-Id: Ice52d2da63933af881dd95fa8c6f59a6fe27e0df
Wonsik Kim [Fri, 18 Jul 2014 02:19:12 +0000 (02:19 +0000)]
Merge "TIF: one-to-many relationship for TvInputService to TvInputInfo" into lmp-dev
Wonsik Kim [Wed, 25 Jun 2014 05:12:48 +0000 (14:12 +0900)]
TIF: one-to-many relationship for TvInputService to TvInputInfo
The scope of this change is to provide a skeleton code for supporting
multiple TV input per service.
Bug:
16138420
Change-Id: Ic51355902d5e0424b8fc8a75c495d4781a7ed744
Zhijun He [Fri, 18 Jul 2014 01:02:20 +0000 (01:02 +0000)]
Merge "Camera2: partialResultCount should be optional" into lmp-dev
Zhijun He [Fri, 18 Jul 2014 00:45:54 +0000 (17:45 -0700)]
Camera2: partialResultCount should be optional
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
Jinsuk Kim [Fri, 18 Jul 2014 00:24:09 +0000 (00:24 +0000)]
Merge "Remove system audio output option for HdmiControlService" into lmp-dev
Craig Stout [Thu, 17 Jul 2014 18:32:09 +0000 (11:32 -0700)]
Fix timepicker double done buttons.
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.
Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
Filip Gruszczynski [Thu, 17 Jul 2014 23:20:24 +0000 (16:20 -0700)]
resolved conflicts for merge of
bbc49941 to lmp-dev
Change-Id: If8e607ab1946c3ca5bb8960d32fdefebbfb21ffe
Filip Gruszczynski [Thu, 17 Jul 2014 19:55:27 +0000 (19:55 +0000)]
am
a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
* commit '
a76164e1d0d283baf412c18999e680d93bd50f01':
Only use bottom outset for main display.
John Spurlock [Thu, 17 Jul 2014 23:10:44 +0000 (23:10 +0000)]
Merge "Shade: Hide status icons, take 2." into lmp-dev
Christopher Tate [Thu, 17 Jul 2014 22:58:12 +0000 (15:58 -0700)]
Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).
Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
John Spurlock [Thu, 17 Jul 2014 22:22:45 +0000 (18:22 -0400)]
Shade: Hide status icons, take 2.
Restore visibility logic (for mirrored view) and remove a bad
optimization from the clipping calculation.
Bug:
16337935
Change-Id: I7eb82ef6c87f30da9d8b70136e05dab3abdbdead
Youngsang Cho [Fri, 18 Jul 2014 03:28:46 +0000 (03:28 +0000)]
Merge "TIF: Hide TvContract.Channels.COLUMN_BROWSABLE" into lmp-dev
Youngsang Cho [Thu, 17 Jul 2014 01:45:09 +0000 (18:45 -0700)]
TIF: Hide TvContract.Channels.COLUMN_BROWSABLE
TODO: Remove BROWSABLE in TvContract, TvProvider and TV app.
Bug:
16195951
Change-Id: I20e8e1e2f93e0133eba3694e0c1724d443250e59
Youngsang Cho [Fri, 18 Jul 2014 03:28:15 +0000 (03:28 +0000)]
Merge "TIF: Add a notification for surface change from TvView to TvInputService" into lmp-dev
Jae Seo [Sun, 13 Jul 2014 02:25:24 +0000 (19:25 -0700)]
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
Youngsang Cho [Wed, 16 Jul 2014 21:22:19 +0000 (14:22 -0700)]
TIF: Add a notification for surface change from TvView to TvInputService
Bug:
15447352
Change-Id: I3e91609c5eb03be84cc7c88507457b9e74750de8
John Spurlock [Fri, 18 Jul 2014 03:24:34 +0000 (03:24 +0000)]
Merge "Volume: Rocker animation + style updates." into lmp-dev
Jae Seo [Thu, 17 Jul 2014 23:53:13 +0000 (16:53 -0700)]
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
John Spurlock [Fri, 18 Jul 2014 03:09:40 +0000 (23:09 -0400)]
Volume: Rocker animation + style updates.
- Add more spacing at the top
- Update window animations to fades
- Improve style for alarm warnings
Bug:
16200897
Change-Id: I7a64e235eff1f9a77fc697a98a4440bc69043386
Zhijun He [Thu, 17 Jul 2014 20:36:21 +0000 (20:36 +0000)]
Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev
Zhijun He [Wed, 16 Jul 2014 18:32:59 +0000 (11:32 -0700)]
Camera2: replace partial quirks with normal partial result
Change-Id: I56550748478bf0aa1a7bf9a350b4fdc7bbd6af86
John Spurlock [Thu, 17 Jul 2014 19:57:32 +0000 (19:57 +0000)]
Merge "QS: Fix crash switching users." into lmp-dev
John Spurlock [Thu, 17 Jul 2014 19:53:32 +0000 (15:53 -0400)]
QS: Fix crash switching users.
Bug:
16375449
Change-Id: I971c5b043edcffe669c29bbc566b80696b6251b2
Filip Gruszczynski [Thu, 17 Jul 2014 19:52:25 +0000 (19:52 +0000)]
Merge "Only use bottom outset for main display." into klp-modular-dev
Filip Gruszczynski [Wed, 16 Jul 2014 23:35:18 +0000 (16:35 -0700)]
Only use bottom outset for main display.
Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee
Chris Craik [Thu, 17 Jul 2014 22:38:57 +0000 (22:38 +0000)]
Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev
henry.uh_chen [Wed, 2 Jul 2014 11:36:56 +0000 (19:36 +0800)]
[HWUI]: fix residual line on FrameBuffer
Symptom: If app applies animation to enlarge a bitmap, there will be an residual
line on the screen
Root Cause: On platform which has Tile Rendering implementation (ex. Qualcomm
CPU), startTiling() call will restrict the framebuffer region which
GPU can affect. So the expansion of clear region by 1 will not take
effect if startTiling region is not expanded.
Solution: Expand the startTiling region by 1, too.
Reproduce steps: Apply animation to enlarge (and then shrink) a bitmap icon.
Cherry-pick of
20adb6ce4d52b15472e7e5ee953e06cc349a827c from AOSP
Change-Id: I163b898b87b74d221dc4210b7fa657aa93c82c19
Michael Wright [Thu, 17 Jul 2014 21:59:19 +0000 (21:59 +0000)]
Merge "Add MediaProjection APIs." into lmp-dev
Michael Wright [Wed, 9 Jul 2014 01:07:36 +0000 (18:07 -0700)]
Add MediaProjection APIs.
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.
The screen sharing case is implemented, but all of audio capturing
is still forthcoming.
Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
destradaa [Thu, 17 Jul 2014 20:58:46 +0000 (20:58 +0000)]
Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
Craig Stout [Thu, 17 Jul 2014 18:25:52 +0000 (11:25 -0700)]
Fix legacyMode for leanback timepicker
Change-Id: Idcd9627f330918d8b2de144af28e749c47602769
Andres Morales [Thu, 10 Jul 2014 22:40:24 +0000 (15:40 -0700)]
Permit settings to "wipe" the persistent partition
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.
This adds one last API method that allows settings
to wipe the partition.
Bug:
14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
Jae Seo [Fri, 18 Jul 2014 03:21:38 +0000 (03:21 +0000)]
Merge "TIF: Add TvParentalControlManager" into lmp-dev
Jae Seo [Mon, 14 Jul 2014 23:07:19 +0000 (16:07 -0700)]
TIF: Add TvParentalControlManager
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.
Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.
Bug:
13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
Ben Murdoch [Thu, 17 Jul 2014 21:36:20 +0000 (21:36 +0000)]
Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev
Ying Wang [Thu, 17 Jul 2014 21:30:54 +0000 (14:30 -0700)]
Fix sdk build.
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
Ben Murdoch [Thu, 17 Jul 2014 13:55:00 +0000 (14:55 +0100)]
Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.
bug:
16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
destradaa [Wed, 16 Jul 2014 21:28:06 +0000 (14:28 -0700)]
Fix exceptions in ActivityRecognition platform stack.
b/
16348349
Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
Jeff Sharkey [Thu, 17 Jul 2014 18:08:38 +0000 (18:08 +0000)]
Merge "Support cluster-style installs for bundled apps." into lmp-dev
Jeff Sharkey [Thu, 17 Jul 2014 17:56:48 +0000 (10:56 -0700)]
Support cluster-style installs for bundled apps.
Bug:
16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
Joe Fernandez [Thu, 17 Jul 2014 18:04:47 +0000 (18:04 +0000)]
am
e1e81a9e: am
e287cf33: docs: Update ADT-1 page with supported apps
* commit '
e1e81a9ee0f3632898eff1056fd2283b79789e23':
docs: Update ADT-1 page with supported apps