Brad Ebinger
f5001109c5
Merge "Move @SystemApi access to ImsService" into oc-dev am: 509a311976
...
am: 442d7645a2
Change-Id: I215d2ba6dd947a3979aa17b6695a77cb7b50288f
2017-04-11 23:29:11 +00:00
Brad Ebinger
442d7645a2
Merge "Move @SystemApi access to ImsService" into oc-dev
...
am: 509a311976
Change-Id: I98a548a4a7f2df635d8132a93948ece3fb70be0a
2017-04-11 23:20:16 +00:00
Brad Ebinger
509a311976
Merge "Move @SystemApi access to ImsService" into oc-dev
2017-04-11 23:12:11 +00:00
Amit Mahajan
3afaab9090
Merge "Add p2 option in openLogicalChannel." am: f954f2d5cc am: 7c6fa75512 am: 9c113787a4
...
am: ef23fff630
Change-Id: I6ebee0796c58bb6716285c3bb10d3bd7056efea1
2017-04-11 21:59:03 +00:00
Amit Mahajan
ef23fff630
Merge "Add p2 option in openLogicalChannel." am: f954f2d5cc am: 7c6fa75512
...
am: 9c113787a4
Change-Id: Iad26507830edceb39433766d7b6e3f0bb708c0e2
2017-04-11 21:50:19 +00:00
Amit Mahajan
f954f2d5cc
Merge "Add p2 option in openLogicalChannel."
2017-04-11 21:25:43 +00:00
Nathan Harold
4e745fd4e9
Merge "Deprecate TelephonyManager.getCellLocation()" into oc-dev
2017-04-11 20:58:34 +00:00
Svetoslav Ganov
29beb7f0ce
Merge "Keep a removed API to not break GCore presubmit" into oc-dev am: c62250ad52
...
am: 436bb48e56
Change-Id: I3aa39f68abe16659760fb243217d2ca84df4d046
2017-04-11 19:42:22 +00:00
Svetoslav Ganov
436bb48e56
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
...
am: c62250ad52
Change-Id: I92b682ac25bd6460a0e10237faf6aed081b6c3c6
2017-04-11 19:35:51 +00:00
Jakub Pawlowski
2d7d617e6a
Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev
...
* changes:
Remove enable from PeriodicAdvertisingPariameters (1/2)
Bluetooth 5 fix default AdvertisingSetParameters values
Bluetooth: fix comment wording
2017-04-11 19:19:36 +00:00
Svetoslav Ganov
c62250ad52
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
2017-04-11 18:58:56 +00:00
Makoto Onuki
1e13f26f80
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev am: a2ea59c9bb
...
am: 538a42da3a
Change-Id: Ia8a8847b3f6033b3256269313806b49d20c21cce
2017-04-11 18:56:42 +00:00
Svet Ganov
fc4a3004e3
Keep a removed API to not break GCore presubmit
...
Change-Id: Ica38b7aad2a5a8792917d0da1d497f373b118077
2017-04-11 11:40:14 -07:00
Tyler Gunn
76679ead10
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev
2017-04-11 18:37:03 +00:00
Makoto Onuki
538a42da3a
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev
...
am: a2ea59c9bb
Change-Id: Ic9eebe67290f7dcd7ff59bb40c81d39bf2a8d82d
2017-04-11 18:11:20 +00:00
Makoto Onuki
a2ea59c9bb
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev
2017-04-11 17:51:48 +00:00
Romain Guy
e5f46a433a
Merge "Hide ColorSpace.Renderer" into oc-dev am: 5094caafc2
...
am: 3509d1f790
Change-Id: Ic7bb2ee6326a9152bbd3bb015025d8f39d7a2527
2017-04-11 16:51:25 +00:00
Romain Guy
3509d1f790
Merge "Hide ColorSpace.Renderer" into oc-dev
...
am: 5094caafc2
Change-Id: I74dad14a0881a69a69ec3f25e111897c29269fdd
2017-04-11 16:37:14 +00:00
TreeHugger Robot
5094caafc2
Merge "Hide ColorSpace.Renderer" into oc-dev
2017-04-11 16:22:57 +00:00
Jakub Pawlowski
326996916d
Remove enable from PeriodicAdvertisingPariameters (1/2)
...
Instead of setting enable to true, one can just pass null
PeriodicAdvertisingParameters and achieve same result when starting the
set.
Passing the "enable" when updating the parameters make no sense, and
might be confusing.
Experience with "timeout" field, which was a part of AdvertiseSettings
show that merging fields that go into different HCI commands can cause
problems during processing, so keep enable as separate field.
Test: manual
Bug: 30622771
Change-Id: Ida02c59eb8433537179b4d22202fe745f8b4bb3e
(cherry picked from commit e6c453d828 )
2017-04-11 09:13:38 -07:00
Makoto Onuki
cb8936eae9
Expose UserHandle.getIdentifier() to CTS.
...
This allows CTS to pass user IDs returned by APIs as UserHandle to various
ADB commands.
Test: Exposing as TestApi only; m -j
Change-Id: Iedba6d83b717baacf9e7cf97f1d32f93c191a5ca
2017-04-11 08:42:57 -07:00
Romain Guy
66d7da6a41
Hide ColorSpace.Renderer
...
Bug: 37073273
Test: Compile, make sure CTS does not rely on this API
Change-Id: Ia5d2638676be44464a173f904a21158c554b9ebf
2017-04-11 16:24:56 +02:00
Jakub Pawlowski
3ba6943778
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1 am: 131cc43a2c am: 6b1228a556
...
am: 143e94d94f
Change-Id: I07b4ca8eec512187758549f28873719c4d9459b1
2017-04-11 06:49:29 +00:00
Jakub Pawlowski
143e94d94f
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1 am: 131cc43a2c
...
am: 6b1228a556
Change-Id: I58a18a01d88db5f3edc9a15cc304ad561440d3fb
2017-04-11 06:41:21 +00:00
Svet Ganov
ffa27feeb4
Merge "Move API for disabling an autofill service to the manager" into oc-dev am: 7a6df3b777
...
am: de369349a0
Change-Id: I2d48598f8e685591a88882aa1ba81a4e65268e3b
2017-04-11 06:26:32 +00:00
Jakub Pawlowski
e6c453d828
Remove enable from PeriodicAdvertisingPariameters (1/2)
...
Instead of setting enable to true, one can just pass null
PeriodicAdvertisingParameters and achieve same result when starting the
set.
Passing the "enable" when updating the parameters make no sense, and
might be confusing.
Experience with "timeout" field, which was a part of AdvertiseSettings
show that merging fields that go into different HCI commands can cause
problems during processing, so keep enable as separate field.
Test: manual
Bug: 30622771
Change-Id: Ida02c59eb8433537179b4d22202fe745f8b4bb3e
2017-04-11 06:18:44 +00:00
Svet Ganov
de369349a0
Merge "Move API for disabling an autofill service to the manager" into oc-dev
...
am: 7a6df3b777
Change-Id: I4805b84a3f585b6828307a32dd6d475e8d94de1a
2017-04-11 06:17:05 +00:00
Nathan Harold
33dd867f86
Deprecate TelephonyManager.getCellLocation()
...
This API has been long-marked for deprecation. It has numerous problems:
-It does not support LTE
-It returns a limited subset of information
-It uses old (and poorly-chosen) sentinel values for fields that are
not provided.
Bug: 36076138
Test: compilation
Change-Id: I87004710e5d046d4534ad3a0a938540440b0e83b
(cherry picked from commit c12d6c5983 )
2017-04-10 18:04:39 -07:00
Svet Ganov
f20a037ba2
Move API for disabling an autofill service to the manager
...
Test: the topic has a CTS test
bug:37170723
Change-Id: I2be18968ea8df0fd3fb070fe2efc3e811b0e5a76
2017-04-10 17:43:44 -07:00
nharold
fddda44b19
Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a am: 599a4c7326" into oc-dev-plus-aosp
...
am: 74568130ce
Change-Id: I3112e4d98738b7b00e290ced238c3878e4ad51b1
2017-04-11 00:00:55 +00:00
nharold
f72fd56b06
Merge "Deprecate TelephonyManager.getCellLocation()" am: bc0f610b25 am: a51173943a
...
am: 599a4c7326
Change-Id: I243647791bc08dbc2653d6d51af07a41c8ba3f97
2017-04-10 23:31:06 +00:00
nharold
bc0f610b25
Merge "Deprecate TelephonyManager.getCellLocation()"
2017-04-10 22:50:01 +00:00
Tyler Gunn
1c80ac52fe
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am: c4ea961f91 am: 1fb1c39838
...
am: b428268052
Change-Id: Ib0eae364d2fff21e80d04e740c34421d42c85c57
2017-04-10 22:18:01 +00:00
Tyler Gunn
b6ce026fd1
Add getSelfManagedPhoneAccounts() TelecomManager API.
...
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug: 34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
2017-04-10 13:29:21 -07:00
Tyler Gunn
4774fb36d0
Add getSelfManagedPhoneAccounts() TelecomManager API.
...
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug: 34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
(cherry picked from commit 8931707058 )
2017-04-10 20:20:47 +00:00
Tyler Gunn
7b4ed6466d
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
2017-04-10 20:03:51 +00:00
Selim Gurun
a64ebd5727
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am: c922c4827a
...
am: e7534f48ce
Change-Id: I8c01b72d5f593070eebbac1f5271ca166e6abf7b
2017-04-10 16:56:06 +00:00
Selim Gurun
e7534f48ce
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
...
am: c922c4827a
Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b
2017-04-10 16:48:28 +00:00
TreeHugger Robot
c922c4827a
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
2017-04-10 16:36:48 +00:00
Tyler Gunn
8931707058
Add getSelfManagedPhoneAccounts() TelecomManager API.
...
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug: 34159263
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
2017-04-10 08:54:10 -07:00
Treehugger Robot
7a12f7efc7
Merge "Add an API hint for metered multipath traffic."
2017-04-10 05:40:10 +00:00
Andrii Kulian
4cab4b3a6a
Merge "Use feature instead of hidden config for multi-display" into oc-dev am: 72790bade5
...
am: 2d27f1c538
Change-Id: I2f8c876f53c021e4eca8fb50b4de8f7d5390e673
2017-04-08 02:07:08 +00:00
Andrii Kulian
2d27f1c538
Merge "Use feature instead of hidden config for multi-display" into oc-dev
...
am: 72790bade5
Change-Id: I557c1b47e960ff2b7715dc71827ac200a21952db
2017-04-08 02:00:57 +00:00
Andrii Kulian
72790bade5
Merge "Use feature instead of hidden config for multi-display" into oc-dev
2017-04-08 01:51:29 +00:00
Selim Gurun
ec0a1f2599
Add an API to enable disable safebrowsing in WebView
...
WebView safebrowsing can be opted in using a manifest value. However,
we also need to control individual WebViews.
Bug:37158813
Test: See change I71e813bccc2fab73d100384661128c7311dd396c
Change-Id: I647dc304787d6406691b5cbadf1c9a4f13ac5604
2017-04-07 18:46:18 -07:00
Wei Jia
66acecdb03
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev am: e79081aeaa
...
am: 1dccc5841d
Change-Id: I06503dd272057c20d6ba2cdf4f2410d3030491ba
2017-04-08 00:42:54 +00:00
Wei Jia
1dccc5841d
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev
...
am: e79081aeaa
Change-Id: Ia96dc51f195e6bb42fb64acca3b33225eff01cfc
2017-04-08 00:33:57 +00:00
TreeHugger Robot
e79081aeaa
Merge "MediaPlayer: add 2 more info notifications for playback error" into oc-dev
2017-04-08 00:24:12 +00:00
Felipe Leme
d10879d146
Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev am: 5c8d88e855
...
am: 49b37310ab
Change-Id: I5967cd823a11dc049a593918c29b5950f36ef0e4
2017-04-08 00:06:53 +00:00
Felipe Leme
49b37310ab
Merge "Autofill Partitioning: support multiple SaveInfos." into oc-dev
...
am: 5c8d88e855
Change-Id: Ia363ebbbf73514936776b7b0a9ca7ba0f65bf1bc
2017-04-08 00:01:51 +00:00