8232 Commits

Author SHA1 Message Date
Evan Charlton
a37cb8b6e3 Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev 2014-07-18 22:16:50 +00:00
Evan Charlton
7800fb7518 @hide CAPABILITY_CALL_PROVIDER
Until this API is fleshed out, leave ourselves room to tweak it.

Change-Id: Iddedb629d6fa02a56cd2041686dbe54ea5e4793b
2014-07-20 18:18:23 -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
Jesse Hall
7f51706265 Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A
Bug: 15593761
Change-Id: Id1865cbf27c98a611cc6414fe47ee979c1d7cee2
2014-07-18 14:24:36 -07:00
Evan Charlton
e954426494 Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev 2014-07-18 18:24:25 +00:00
Evan Charlton
8c8a062f52 Rename PhoneAccountMetadata to PhoneAccount
Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
2014-07-20 15:12:16 -07:00
Jae Seo
31380e8424 Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev 2014-07-18 18:24:25 +00:00
Jae Seo
bbcd206a79 TIF: Add a way to notify whether the current program content is allowed
Now we have a complete set of API to tell the entire cases (allowed and
blocked), which makes possible for the application to rely more on
actions taken by TV input services transferring the responsibility for
parental control.

Bug: 13172379
Change-Id: I7b0dcf16b870782c76a428a1dac6ef1a528b7d40
2014-07-18 17:13:07 -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
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
Dongwon Kang
9f7c25ebeb Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev 2014-07-17 22:03:23 +00:00
Dongwon Kang
fe9259e6a7 TIF: Revisit types in TvInputInfo and TvContract.Channels.
For the types in TvInputInfo, TYPE_TUNER represents all the TV inputs
having channels in TvProvider. Also, String is used for the types in
TvContract.Channels for further extension.

Change-Id: Iee1163b449d9f9723ff665178f2967bb8c0ad71d
2014-07-22 16:58:51 +09: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
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
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
Youngsang Cho
6f306e21f4 Merge "TIF: Add unblock content" into lmp-dev 2014-07-17 21:58:28 +00:00
Youngsang Cho
427f74293b Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 2014-07-18 18:24:25 +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
Jaewan Kim
8e6b51b0fb TIF: Add onInputAdded and onInputRemoved
Bug: 16166859
Change-Id: I51bd87aded3e8619e36be200009e924e73cd348e
2014-07-18 15:35:25 +09:00
Evan Charlton
2c4b812a29 Merge "Rename setDestroy() to destroy()" into lmp-dev 2014-07-17 21:15:46 +00:00
Evan Charlton
36a713431c Rename setDestroy() to destroy()
Change-Id: I6bb46e679f55547b902d5850ab450e5d3818fa63
2014-07-20 15:20:29 -07: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
Ye Wen
2ab56b0d1f Unhide MMS APIs for MSIM (1/2)
b/14095333

Change-Id: I26a7fa657ba44799d2fb3a75f49c600f4a02746a
2014-07-18 14:16: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
Dongwon Kang
c8cd55a30c Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev 2014-07-17 21:07:39 +00:00
Dongwon Kang
4b662d1b98 TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
This change adds a class which will be used for the TV input which controls an external device
which is connected to the pass-through TV input.

Bug: 15496325
Change-Id: I52d48c45570c2d62d759a9da2ab96ec8461c13f7
2014-07-19 13:36:07 +09:00
Niels Egberts
5e413470e5 Merge "Add money as a new TtsSpan type." into lmp-dev 2014-07-17 19:55:10 +00: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
Santos Cordon
2f42b11d40 InCallService to inherit directly from Service. (1/2)
Bug: 16416927
Change-Id: I31584556c79e49132c628a0f8f25c372eb4e9b3c
2014-07-19 13:21:35 -07:00
Dan Sandler
5598216931 Merge "Deprecate and stop generating tickerViews." into lmp-dev 2014-07-17 19:20:15 +00:00
Dan Sandler
5fcdf6e81d 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
2014-07-18 12:11:58 -04:00
Narayan Kamath
b91ca2d880 Unhide.
Change-Id: Ie5788bfdde7ec7394dbd6e11e63e3044ccc5a802
2014-07-18 14:54:24 +01: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
John Spurlock
9bc41d44d6 Merge "Add audioAttributes to Notification." into lmp-dev 2014-07-17 19:13:40 +00:00