Chalard Jean
e2bbcc1837
Merge "Add PCSCF to LinkProperties." am: 64e495b274
...
am: 40c9e752ac
Change-Id: I491e99f7225233d5841b61ce383325e7a1c43fa0
2019-01-09 22:19:14 -08:00
Chalard Jean
40c9e752ac
Merge "Add PCSCF to LinkProperties."
...
am: 64e495b274
Change-Id: Ia153067765ea39430f4dfbc49da3cbd92054b8a9
2019-01-09 22:06:46 -08:00
Chalard Jean
64e495b274
Merge "Add PCSCF to LinkProperties."
2019-01-10 05:55:05 +00:00
Jack He
17d71033ab
Merge "Deprecate BluetoothHealth APIs" am: c792b78f71
...
am: 672b984fa6
Change-Id: I60d6429fc07cf4a2dccf5773a5c18016523d2762
2019-01-09 21:05:45 -08:00
Jack He
672b984fa6
Merge "Deprecate BluetoothHealth APIs"
...
am: c792b78f71
Change-Id: I77b50a8b929553ca04d57f63df516ef11d25364b
2019-01-09 20:55:24 -08:00
Jack He
6b73b32c7a
Deprecate BluetoothHealth APIs
...
* Mark all BluetoothHealth related APIs as deprecated
* Make BluetoothAdapter#getProfileProxy(context, BluetoothProfile.HEALTH)
always return false
* Remove all logic behind BluetoothHealth APIs and add deprecation error log
* Health Device Profile (HDP) and MCAP protocol has been largely
replaced by BLE. New applications should use Bluetooth Low Energy
instead of legacy Bluetooth Health Device Profile
Bug: 111562841
Test: make, unit test, use Bluetooth
Change-Id: If99a9d79e9e1b89b75b9b74bd3b1c965247a1892
Merged-In: If99a9d79e9e1b89b75b9b74bd3b1c965247a1892
(cherry picked from commit 2be70a11a2 )
2019-01-09 18:09:21 -08:00
Tetsutoki Shiozawa
3c2cafb1cb
Merge "Remove unnecessary right padding from time picker" am: 71a1e5cfe1
...
am: 314a239612
Change-Id: Ie5896c17bb41efbd4a627b14876abca0f177771e
2019-01-09 05:41:49 -08:00
Remi NGUYEN VAN
4bdc06e174
Merge "Move DhcpServer to NetworkStack app" am: 94e5b22985
...
am: d495691bd5
Change-Id: Ib25c0422fda31c5df7743b481d5f50da209c38fa
2019-01-09 05:27:59 -08:00
Tetsutoki Shiozawa
314a239612
Merge "Remove unnecessary right padding from time picker"
...
am: 71a1e5cfe1
Change-Id: Idac6b702027f8e8f73ce5f752a71f2ed67f3e9c9
2019-01-09 04:10:43 -08:00
Treehugger Robot
71a1e5cfe1
Merge "Remove unnecessary right padding from time picker"
2019-01-09 11:50:36 +00:00
Remi NGUYEN VAN
d495691bd5
Merge "Move DhcpServer to NetworkStack app"
...
am: 94e5b22985
Change-Id: I5ed78d8b4b9fc5bc8f50bfa77d60e19bd3815a6d
2019-01-09 02:53:48 -08:00
Remi NGUYEN VAN
94e5b22985
Merge "Move DhcpServer to NetworkStack app"
2019-01-09 10:42:48 +00:00
Remi NGUYEN VAN
0e3d0923a6
Move DhcpServer to NetworkStack app
...
Test: atest FrameworksNetTests && atest NetworkStackTests
Bug: b/112869080
Change-Id: I96c40e63e9ceb37b67705bdd4d120307e114715b
2019-01-09 15:42:16 +09:00
Chalard Jean
0b08cd3e1a
Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db
...
am: 59c8590f7b
Change-Id: If2e704e1f8ddf504be9e777ec226b2ce524438dc
2019-01-08 00:19:52 -08:00
Chalard Jean
59c8590f7b
Merge "Add nullability annotations to public methods of ConnManager."
...
am: 805e2ad9db
Change-Id: I8f5cc35869b4b76404190709206cccd895a1d4b4
2019-01-08 00:10:38 -08:00
Chalard Jean
805e2ad9db
Merge "Add nullability annotations to public methods of ConnManager."
2019-01-08 07:58:13 +00:00
Tetsutoki Shiozawa
7cbd19435c
Remove unnecessary right padding from time picker
...
Symptom:
When the device language was set to Spanish, "A.M." label was not fully
displayed on the time picker widget. "M." was lacked.
Root cause:
There are unnecessary right paddings on the layout definition of time
picker. It uselessly consumes the room for ampm_layout.
Bug: 64498105
Change-Id: Ie52fafc0fb7d6d6ea5b0ca2eaeb53755d4aebc19
2019-01-08 12:14:05 +09:00
Remi NGUYEN VAN
815bd36c07
Merge "Add parceling for DhcpServingParams" am: f6209cf0dd
...
am: 133f281d12
Change-Id: Icab36165187d204de5fdbc4f4271e758ebaebed8
2019-01-07 18:16:49 -08:00
Remi NGUYEN VAN
133f281d12
Merge "Add parceling for DhcpServingParams"
...
am: f6209cf0dd
Change-Id: I3462d829ea5aca3e2d8a76db3c522f355da36153
2019-01-07 18:07:51 -08:00
Remi NGUYEN VAN
f6209cf0dd
Merge "Add parceling for DhcpServingParams"
2019-01-08 01:53:19 +00:00
Abodunrinwa Toki
adcd10f10f
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
...
am: a69950ce18
Change-Id: I0830e1c1a1cea2fd93f0b1ed8a1a792260201bb2
2019-01-07 17:10:30 -08:00
Chalard Jean
50bea3d084
Add nullability annotations to public methods of ConnManager.
...
This is mainly for Kotlin compatibility.
https://android-developers.googleblog.com/2018/08/android-pie-sdk-is-now-more-kotlin.html
Bug: 122437895
Test: no logic changes
Change-Id: Ic1b9a774aee0099397b1ccfd958ff3b61d69a7fb
2019-01-07 19:35:09 +09:00
Manpreet
e9fe937245
Merge "Null locale causing the VTS fail." am: 179f30a443
...
am: 9568191633
Change-Id: Iab284dfc831a9079e339c8c23fba8f3e7e4ec04d
2019-01-06 20:44:13 -08:00
Manpreet
9568191633
Merge "Null locale causing the VTS fail."
...
am: 179f30a443
Change-Id: I8ae92392e70c046194df1c8ebee0bd32ed9513cf
2019-01-06 20:30:46 -08:00
Treehugger Robot
179f30a443
Merge "Null locale causing the VTS fail."
2019-01-07 04:19:22 +00:00
Remi NGUYEN VAN
761198a05d
Add parceling for DhcpServingParams
...
Introduce a stable AIDL parcel class, DhcpServingParamsParcel, and
methods to convert to and from that class to DhcpServingParams.
This will be used to move DhcpServer to the NetworkStack app.
Test: atest FrameworksNetTests
Bug: b/112869080
Change-Id: I276b7affccb938059769c90a53f0f6beb26e6ede
2019-01-07 12:07:18 +09:00
Eric Holk
9b9c255b88
Merge "Add tryCreateView to LayoutInflater" am: aa8f1b7033
...
am: 07b293f8af
Change-Id: Ia835f7a7488a084c72fd5722c91d01ddb427ea19
2019-01-04 17:27:45 -08:00
Eric Holk
07b293f8af
Merge "Add tryCreateView to LayoutInflater"
...
am: aa8f1b7033
Change-Id: Ib89a1d1b292aca7404d646ff61974558422fc959
2019-01-04 17:17:28 -08:00
Treehugger Robot
aa8f1b7033
Merge "Add tryCreateView to LayoutInflater"
2019-01-05 01:02:28 +00:00
Ruchi Kandoi
a33da54c8d
Merge "Deprecate Android beam APIs and create a feature flag to gate them" am: 6a3d45c4b2
...
am: d0c8a165d8
Change-Id: I886941a5011fdf204fe62c1162dd2ad69d466f62
2019-01-04 14:06:55 -08:00
Ruchi Kandoi
d0c8a165d8
Merge "Deprecate Android beam APIs and create a feature flag to gate them"
...
am: 6a3d45c4b2
Change-Id: I6305379f787de122e35a9a2a12eb9f99385da4df
2019-01-04 13:57:48 -08:00
Ruchi Kandoi
96fe50bc1b
Deprecate Android beam APIs and create a feature flag to gate them
...
Test: Test application trying to invoke the API
Bug: 117519147
Change-Id: Icd3187e4f3e0f180cb42d36011f60895fb395002
2019-01-04 21:49:00 +00:00
Eric Holk
29d0cd6fa1
Add tryCreateView to LayoutInflater
...
This method is needed so that precompiled layouts can reuse the factory logic
from the LayoutInflater.
Bug: 111895153
Test: atest android.view.cts.LayoutInflaterTest
Change-Id: Ifd1028906b655af2bd14247d586dc16b35550c82
2019-01-04 12:57:14 -08:00
Ruchi Kandoi
650ff88a4c
Merge changes from topic "multi-se-support" am: 54502d68ea
...
am: 9c0ec9be9f
Change-Id: Ieca9b142094c8c568409290fdf690fad529ef604
2019-01-04 12:25:13 -08:00
Ruchi Kandoi
9c0ec9be9f
Merge changes from topic "multi-se-support"
...
am: 54502d68ea
Change-Id: I10dad203c4e46b28546f1bb3c721e5d4e7fb0aec
2019-01-04 12:10:50 -08:00
Ruchi Kandoi
54502d68ea
Merge changes from topic "multi-se-support"
...
* changes:
Add a mechanism to register AIDs to specific off-host SE
Add Off-Host Card Emulation Features
2019-01-04 19:56:41 +00:00
Junyu Lai
3c6bc9b14d
Merge "Ignore ipv6 tx traffic on clat uid." am: bd73798585
...
am: cb53e78f56
Change-Id: I0f289ce46462f494adb99628bd504cafb584eeeb
2019-01-04 08:30:44 -08:00
Junyu Lai
cb53e78f56
Merge "Ignore ipv6 tx traffic on clat uid."
...
am: bd73798585
Change-Id: I181c3c812caa9bcd359fbddf74d14adeb7e83419
2019-01-04 08:13:29 -08:00
Junyu Lai
bd73798585
Merge "Ignore ipv6 tx traffic on clat uid."
2019-01-04 09:29:10 +00:00
Ruchi Kandoi
44bb579621
Add a mechanism to register AIDs to specific off-host SE
...
Test: manual
Bug: 117253962
Change-Id: Id34bf84dcff7789548eac19478010838bebd9758
2019-01-04 01:14:50 +00:00
Ruchi Kandoi
ebf267a2a4
Add Off-Host Card Emulation Features
...
Test: CTS test; manual
Bug: 117253962
Change-Id: I7c35b1bffbc57870bb8c67704811a2649854d94e
2019-01-03 23:00:59 +00:00
Abodunrinwa Toki
a69950ce18
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
...
Also don't show smart actions for selections in text with unsupported
characters.
Bug: 116321860
Test: atest android.view.textclassifier.TextClassificationManagerTest \
android.text.util.cts.LinkifyTest \
android.text.util.LinkifyTest \
android.widget.TextViewActivityTest
Change-Id: I01b5e936aa4dfc937a98f50e9fc8171666861a61
2019-01-03 14:20:30 +00:00
Nate Fischer
23a006b6e2
Merge "WebView: no bars in javadoc" into pi-dev
...
am: 002c637337
Change-Id: I093585bdc5beaff3f6479b660d9d6d7b5577a5d2
2019-01-02 18:00:02 -08:00
Tobias Thierer
4c6f437438
Merge "Fix @NonNull -> Nullable for Intent.replaceExtras()." am: 645a9d1253
...
am: a2cc0fbeec
Change-Id: Idd0c12ea791db459dbba39115c38eae843634bb9
2019-01-02 15:16:07 -08:00
Tobias Thierer
a2cc0fbeec
Merge "Fix @NonNull -> Nullable for Intent.replaceExtras()."
...
am: 645a9d1253
Change-Id: Ia09f8a945159951a2a098dc88001d9509f704335
2019-01-02 15:06:01 -08:00
Treehugger Robot
645a9d1253
Merge "Fix @NonNull -> Nullable for Intent.replaceExtras()."
2019-01-02 22:49:30 +00:00
Eric Holk
6abf873683
Merge "[LayoutInflater] Cleanup - remove some nesting" am: 3a0fe2cdab
...
am: a261d6e664
Change-Id: I8f6bb61ffc085ff224f631c916e19e05216faeed
2019-01-02 14:31:25 -08:00
Eric Holk
a261d6e664
Merge "[LayoutInflater] Cleanup - remove some nesting"
...
am: 3a0fe2cdab
Change-Id: I5f44de5983793c1a8e089977934d48bf032d0686
2019-01-02 14:13:34 -08:00
Eric Holk
bfc687007c
[LayoutInflater] Cleanup - remove some nesting
...
The parseInclude method had some deep nesting that could be improved by
rearranging things a little.
Test: atest android.view.cts.LayoutInflaterTest
Change-Id: I2ee13c2ee80bcb220371d39a5a6da6044cfa245c
2019-01-02 11:11:24 -08:00
Mathew Inwood
8501ae1763
Merge "Limit access to suspected false positives." am: aeda49d185
...
am: 152d5a5dcd
Change-Id: I8e10322e69d2d479079df5cf8fec0287c7c117f1
2019-01-02 05:00:54 -08:00