7998 Commits

Author SHA1 Message Date
Jae Seo
6057102dbb 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
2014-07-17 16:29:36 -07:00
Jean-Michel Trivi
7cdc0b58d6 Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev 2014-07-18 18:24:25 +00:00
Jean-Michel Trivi
7f6ee760b0 Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide AudioFormat.Builder
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Unhide the missing two channels that enable a 7.1 configuration

Change-Id: I60899548da1c688ebe561c25212877e0f3eedb34
2014-07-18 17:07:04 -07:00
Jean-Michel Trivi
044a5f51e5 Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 2014-07-17 21:58:28 +00:00
Jean-Michel Trivi
0daab220b2 Hide AudioManager.startBluetoothScoVirtualCall()
Not intended for public consumption.

Bug 16401631

Change-Id: I299a4719fef57a66a428ccf1902aefaf59d7e064
2014-07-18 16:47:25 -07:00
Chris Craik
f251bde890 Merge "Tweaks to outline API" into lmp-dev 2014-07-17 21:58:28 +00:00
Chris Craik
31ba192dd2 Tweaks to outline API
b/15283203
b/16142564

Remove boolean return value chaining, as it's redundant with
the data in the Outline itself.

Change-Id: I3116e57cd1b35c98b74e95195117edd7e39fb2df
2014-07-19 00:13:59 +00:00
Adam Powell
b7fae17a03 Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 2014-07-17 21:58:28 +00:00
Yorke Lee
a19d7bfacf Rename voicemail permissions
Rename READ_ALL_VOICEMAIL to READ_VOICEMAIL, and MANAGE_VOICEMAIL
to WRITE_VOICEMAIL

Bug: 16400686
Change-Id: I4c87a7e2fb3aa71d7de3865301f110bcfb29221b
2014-07-18 17:11:50 -07:00
Adam Powell
e49d939378 Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
This allows the calling app to supply a set of alternative extras to
be sent along with the target intent if the user chooses specific
items from the full set available on the device. When replacement
extras have the same key as extras in the initial intent, the
replacement extras dominate.

Change-Id: I5d64c80447386f22402b71291bb289a74015d619
2014-07-18 16:27:11 -07:00
Shishir Agrawal
5552cc5c9d Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 2014-07-17 21:58:28 +00:00
Shishir Agrawal
86578cca38 Adding the ability for carrier app to override SPN and carrier name.
The change allows system apps (holding MODIFY_PHONE_STATE permission) or
carrier apps to override the "carrier branding" on a per ICCID basis. The
override affects the service provider name as well as the network operator
name. The override is also saved as a SharedPreference and will persist for
the iccId across reboots.

Change-Id: I985ba247e10e2501e3d0d21567ccadc46f365879
2014-07-17 16:31:37 -07:00
Sreeram Ramachandran
64126bc3c3 Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 2014-07-17 21:58:28 +00:00
Sreeram Ramachandran
cc26b4cc09 Allow VPN interfaces to be put into blocking mode.
New API with stub implementation to be filled out later.

Bug: 12879610
Change-Id: Iff711994dec4598c74fe11447c8c670004c1188c
2014-07-18 16:46:13 -07:00
Ihab Awad
7522bbd652 Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
Change-Id: I91c0d6be76030117ed3cf6d6d5f7514b4d4802ad
2014-07-18 16:03:22 -07:00
Yin-Chia Yeh
8f8141e24f Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 2014-07-18 18:24:25 +00:00
Yin-Chia Yeh
12da140082 Camera2: add highSpeedVideoConfig wrapper and APIs
- Add wrapper class for highSpeedVideoConfiguration.
- Add APIs to query high speed video recording configurations in
  StreamConfigurationMap
- Fix ColorSpaceTransform unit test in CameraMetadataTest
- Fix a bug in HashCodeHelper

Change-Id: I192e57f6ab5dfbba6d958571352f067a9eaec7b2
2014-07-18 16:00:53 -07:00
Niels Egberts
5e413470e5 Merge "Add money as a new TtsSpan type." into lmp-dev 2014-07-17 19:55:10 +00:00
Adam Lesinski
0debc9aff4 First iteration of a public UsageStats API
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.

Bug: 15165667

Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
2014-07-18 15:24:20 -07:00
Niels Egberts
b1a092c772 Add money as a new TtsSpan type.
Added ARG_QUANTITY to decimal so money and measure can 'inherit' it.

Change-Id: I0f9f464d198a9875df4a01e8a5c95a3d19ed6f7f
2014-07-18 18:46:20 +01:00
Sailesh Nepal
e7127ff031 Merge "Add Connection.startActivityFromInCall" into lmp-dev 2014-07-17 21:09:48 +00:00
Sailesh Nepal
2ab88cc313 Add Connection.startActivityFromInCall
This CL adds a new public API to allow Connections
to start an activity on top of the in-call UI.

The Connection passes a PendingIntent to Telecomm which
then forwards it on to InCallUI. The Connection can cancel
the operation by calling PendingIntent.cancel().

This allows services like SIP and Hangouts to show dialogs
to the user when making a call.

Change-Id: I65119a89c925a93467d1b27304ffec9b088b172f
2014-07-18 14:59:30 -07:00
Jean-Michel Trivi
a3ee6642d8 Unhide Virtualizer.getVirtualizationMode()
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
  helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
2014-07-18 21:34:39 +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
Dianne Hackborn
8ca1fdc10b Merge "Fix issue #16400873: Apps that show ads as new tasks stay in recents..." into lmp-dev 2014-07-17 17:59:02 +00:00
Dianne Hackborn
13420f2311 Fix issue #16400873: Apps that show ads as new tasks stay in recents...
...even when I hit back or close the activity in UI

Change the semantics of NEW_DOCUMENT to have the recents entry be
removed by default when its activity is finished, with various ways
to explicitly turn off this behavior.

Change-Id: Idc717706d27de80f28b53ad76f9e375d85118d71
2014-07-20 15:58:11 -07:00
Jean-Michel Trivi
89c3b29a9b Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
AudioAttributes: rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE to
  USAGE_NOTIFICATION_RINGTONE in the list of usage values.
Temporarily keep the old definition to prevent transient build
  breakages, will be removed after telephony packages have been
  updated.

Bug 16401631

Change-Id: I9398443fd7ba3c30e9d371c5c5a2934b9ea6f30a
2014-07-20 20:58:47 +00:00
Brian Attwell
891f5b2638 Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 2014-07-17 17:59:02 +00:00
Brian Attwell
bdb13c8c07 Mark social APIs stream APIs as deprecated
Bug: 14490632
Change-Id: I6b54613514e52f34cfcc37d25493a7ea7d636a86
2014-07-18 10:43:31 -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
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
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
Sandeep Siddhartha
055897208d Move sound trigger calls to VoiceInteractionManagerService
- This ensures that any data being loaded on the DSP comes from the framework

Change-Id: Ie15f0994850ba8f298ca07c49fe0b89e066d9e2b
2014-07-20 11:22:55 -07:00
Evan Charlton
6eb262c351 Rename PhoneAccount to PhoneAccountHandle
Change-Id: I2e97b348e6316a8b3ccc39fd81013e7f514a2889
2014-07-20 10:34:59 -07:00
Wonsik Kim
61acf46d6a Merge "TIF: revise API names" into lmp-dev 2014-07-17 21:07:39 +00:00
Sungsoo Lim
9bf671f8ee TIF: revise API names
- TvInputManager: TvInputCallback -> TvInputListenter
- TvParentalControlManager: ParentalControlCallback -> ParentalControlListener
- TvView: unblockContent -> requestUnblockContent

Change-Id: I58220e86a4e59ee7d8f28fab833f09cd603b1e38
2014-07-19 21:22:16 +09:00
Wonsik Kim
6b11ea1ab1 Merge "TIF: Reorder TvInputInfo types from old to new." into lmp-dev 2014-07-17 21:07:39 +00:00
Dongwon Kang
1034df8c63 TIF: Reorder TvInputInfo types from old to new.
This change is internal cleanup change. The purpose of this change is
to reorder the types so that new types can be added at the end of the
type list later.

Change-Id: I377c98dc397ef75c3473ee5133b2ffb49d278a50
2014-07-19 18:48:32 +09:00
Lajos Molnar
b58dc31322 Extend MediaCodecInfo to describe usable codec limits and features
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
2014-07-19 02:14:00 -07:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4)
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
2014-07-18 12:13:46 -07:00
Jeff Brown
7139645049 Merge "Allow dreams to wake up gently." into lmp-dev 2014-07-17 17:59:02 +00:00
Jeff Brown
f6d466895b Allow dreams to wake up gently.
This change adds a new DreamService.wakeUp() method to allow a
dream to wake itself up gently and perform a transition before
finally finishing.  The power manager will ask a dream to wake
up gently in most cases but may force it to happen immediately
when necessary.

If the dream takes too long to finish itself then the dream
controller will douse it with water summarily after 5 seconds.

Change-Id: Ib0564c5650cd5a454e1acc5aa91fe46995eecfa7
2014-07-18 21:56:08 -07:00
Jeff Brown
5dc219142a Add new Display.STATE_DOZE_SUSPEND power state.
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07:00