Commit Graph

98728 Commits

Author SHA1 Message Date
Zach Johnson
ddeb2990a3 Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a am: 2fb54515a2
am: b39a419fa4

Change-Id: Ie90be956ab6e52602ee72fa224ef471bb7bade38
2019-12-06 15:40:42 -08:00
Zach Johnson
b39a419fa4 Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a
am: 2fb54515a2

Change-Id: Id6f1c11c447ff1896b5df81a7625a643ecebce46
2019-12-06 15:34:45 -08:00
Meng Wang
dfc2459c7c Merge "SubscriptionPlan: move out of telephony" am: c4090312df am: 3172db5841
am: 405e5f3c15

Change-Id: I1c3921c9f10ac744a42490f1258fc67f30385b25
2019-12-06 15:27:41 -08:00
Meng Wang
405e5f3c15 Merge "SubscriptionPlan: move out of telephony" am: c4090312df
am: 3172db5841

Change-Id: Id061cab31b2bf810a889abf0f31b39b322f346ae
2019-12-06 15:22:54 -08:00
Zach Johnson
bd4031de4a Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled"
* changes:
  Collapse the implementations of BluetoothDevice.createBond
  Call parameterized version of IBluetooth.enable
  Implement isEnabled in terms of getState
2019-12-06 23:20:07 +00:00
Treehugger Robot
c4090312df Merge "SubscriptionPlan: move out of telephony" 2019-12-06 23:12:58 +00:00
Makoto Onuki
63dbf254b5 Merge "Add SystemApi to handle "adb shell cmd"" 2019-12-06 23:07:56 +00:00
Meng Wang
4c17c814d8 Merge "SubscriptionPlan: move out of telephony" am: a11df59bb4 am: 968927d7ff
am: 088c61aaf4

Change-Id: Idefd8043655b3ab11b62f73a36989a149db35856
2019-12-06 14:03:31 -08:00
Kevin Chyn
f182a1e8d6 Merge "Update BIOMETRIC_ERROR_VENDOR javadoc" 2019-12-06 21:58:29 +00:00
Meng Wang
088c61aaf4 Merge "SubscriptionPlan: move out of telephony" am: a11df59bb4
am: 968927d7ff

Change-Id: Ia2bf315c236678d34d773e210e95d6d82efa0d32
2019-12-06 13:52:01 -08:00
TreeHugger Robot
bd52bdf8b7 Merge "Fix signedness of DisplayAddress.Physical ports" 2019-12-06 21:51:21 +00:00
Meng Wang
1ba2871a02 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I3bfb0ec699f46b0cc34c3bc2e13bfb242bc295bf
2019-12-06 13:50:15 -08:00
Meng Wang
a11df59bb4 Merge "SubscriptionPlan: move out of telephony" 2019-12-06 21:37:52 +00:00
Kevin Chyn
a73bfa27a9 Update BIOMETRIC_ERROR_VENDOR javadoc
Bug: 142157673

Test: Builds
Change-Id: I46f918806db3f50abfbe3aeb407f2e58e15edafd
2019-12-06 20:19:20 +00:00
Meng Wang
36673a4b44 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I4c7ae02f9f4f154c99263521e08265d6fb367272
2019-12-06 11:47:46 -08:00
Jeffrey Huang
77db950964 Merge "Rename writeToProto to be dumpDebug" 2019-12-06 18:53:15 +00:00
TreeHugger Robot
addd10c6d2 Merge "Binder API for native pulled atoms" 2019-12-06 18:30:36 +00:00
Nikita Dubrovsky
5bfa0bf08b Merge "Consolidate tracking of touch state in Editor (editable TextView)" 2019-12-06 16:13:39 +00:00
TreeHugger Robot
4f1d1ca772 Merge "Fix asset loading on ResourcesImpl swap" 2019-12-06 15:38:27 +00:00
TreeHugger Robot
99d990ec1b Merge "Trigger autofill service when a text field's text is set by the application." 2019-12-06 13:11:42 +00:00
Neil Fuller
ba5a0dfa5b Merge "TimeDetector improvements" am: 6e3020490d am: c72f796176
am: c186f60e8c

Change-Id: I544b8e79ae31a478e3a8bad171db6e2bde63afff
2019-12-06 04:14:27 -08:00
Neil Fuller
c186f60e8c Merge "TimeDetector improvements" am: 6e3020490d
am: c72f796176

Change-Id: I76a5726953cd6dc7998e298c9d41e86a3b4f7c00
2019-12-06 04:08:26 -08:00
Neil Fuller
6e3020490d Merge "TimeDetector improvements" 2019-12-06 11:53:14 +00:00
TreeHugger Robot
104f3be5d9 Merge "Fix crash after destroyed" 2019-12-06 11:20:59 +00:00
Aaron Huang
df293c54ad Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0 am: 1abb8de060
am: d9b442b050

Change-Id: Iaf7fe6ba60048daecfde44c8348f68727b245d98
2019-12-06 03:19:38 -08:00
Aaron Huang
d9b442b050 Merge "Add TrafficStats methods to public APIs" am: 8aed6e69f0
am: 1abb8de060

Change-Id: Ib98dde2ae3b6cfee05e8d5536565ce72f6722e0b
2019-12-06 03:12:46 -08:00
Aaron Huang
8aed6e69f0 Merge "Add TrafficStats methods to public APIs" 2019-12-06 10:59:11 +00:00
Rahul Sabnis
18b3802b15 Merge "Make BluetoothUuid constants and some functions System Apis" am: f6ea5afa58 am: f9f689020c
am: 7232ba49c8

Change-Id: Ief860164e931a234ccc82417f645cee0d0be6235
2019-12-06 00:35:34 -08:00
Meng Wang
da2141d66a Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0 am: 484b1b87e0
am: d32f3a1db3

Change-Id: I63311ec4fecd388e595a864d94b3bbb4c1fe8b89
2019-12-06 00:32:55 -08:00
Rahul Sabnis
fb486c21d9 Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7 am: 12558824e4
am: c0efc04ea7

Change-Id: I9c3f6d5eedcb1197908c8a2cf208215a458cd25d
2019-12-06 00:32:21 -08:00
Meng Wang
5fce3f501b Merge "Move DataConnectionRealTimeInfo from telephony to core." am: 037b717fe8 am: d973a4b22c
am: cb7a8f3245

Change-Id: I0cf190f6e9e46b99ff14ff5b93ee82008a374f13
2019-12-06 00:27:48 -08:00
Meng Wang
0bcd19acdb Merge "Remove telephony API usage: PhoneConstants.SUBSCRIPTION_KEY" am: ddf215dd58 am: cb0d068f28
am: 4f47555359

Change-Id: Iafa9facfbb0759916cd414b23da19f9a3c367a55
2019-12-06 00:25:55 -08:00
Aaron Huang
29667d2942 Add TrafficStats methods to public APIs
Add methods to public APIs for mainline support.

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
      atest android.net.cts
      atest android.net.wifi.cts

Change-Id: I21a9c0dbdc79b1f1041fc9e23c6a4e1e97ecde92
2019-12-06 16:19:40 +08:00
lpeter
e28d6b0a98 Trigger autofill service when a text field's text is set by the application.
Some apps have an payment screen with a scan card button.
When a text field's text is set in this scenario, the autofill
service is never triggered because no field gets focused.

Currently this new behavior is implemented for normal view.
Add the check logic in these two functions of AutofillManager
(notifyValueChanged/notifyViewVisibilityChanged)
to check if it should trigger autofill automatically.

Bug: 142821537
Test: atest CtsAutoFillServiceTestCases
Change-Id: Ibde94791f49772dc19cb8566a9c3a48dfbf16a58
2019-12-06 13:43:29 +08:00
Peter Wang
5b0ee657e0 Merge "[Telephony Mainline] Refactored grantDefaultPermissionsToActiveLuiApp and revokeDefaultPermissionsFromLuiApps from PermissionManagerService to Permmission Manager" 2019-12-06 05:32:51 +00:00
TreeHugger Robot
14ec7e5938 Merge "StatsManager uses private object for synchronizing" 2019-12-06 04:01:35 +00:00
TreeHugger Robot
921b6080c9 Merge "Fix error handling in StatsEvent" 2019-12-06 03:31:13 +00:00
Tej Singh
2cf3ae3f06 StatsManager uses private object for synchronizing
StatsManager used to synchronize on "this", which is dangerous because
an app can get StatsManager and also sychronize on it, which would block
all calls. We now lock on a private final object.

Test: make
Bug: 144315658
Fixes: 144315658
Change-Id: Ia34b1c586b09a48b244cc16dba77fe54e81f62cf
2019-12-05 18:42:30 -08:00
Andrew Chant
0cb0315c9d Merge "Revert "Window with FLAG_NOT_FOCUSABLE cant be IME target."" 2019-12-06 02:22:45 +00:00
Muhammad Qureshi
d265088259 Fix error handling in StatsEvent
Bug: 143286399
Test: bit FrameworksCoreTests:android.util.StatsEventTest
Change-Id: I2159bf138a307e45c44102a8feb7a69d0c793843
2019-12-05 18:07:12 -08:00
TreeHugger Robot
cf87cafa19 Merge "Bug report handler app via Bug Report Shortcut" 2019-12-06 01:45:31 +00:00
Rahul Sabnis
7232ba49c8 Merge "Make BluetoothUuid constants and some functions System Apis" am: f6ea5afa58
am: f9f689020c

Change-Id: Ie4e80f2682d0a4d18e9ee3f57dd457d9bd0ff6ff
2019-12-05 17:41:34 -08:00
Treehugger Robot
f6ea5afa58 Merge "Make BluetoothUuid constants and some functions System Apis" 2019-12-06 01:23:39 +00:00
Meng Wang
d32f3a1db3 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0
am: 484b1b87e0

Change-Id: I681dcc688aa1e66706c99cfa401c8b89cb6367c3
2019-12-05 17:20:49 -08:00
Winson
c932ff2100 Fix asset loading on ResourcesImpl swap
The ResourceLoaderManager reference was not being updated and
so any configuration change would drop loaders from the asset
search list.

Also re-enables and updates a test originally designed to catch
this kind of problem.

Test: atest ResourceLoaderChangesTest

Change-Id: I5d9bba2f85c516573d3da0c8f1a97a1d716b3a34
2019-12-05 16:52:13 -08:00
Meng Wang
392f3db6b0 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" 2019-12-06 00:32:40 +00:00
Rahul Sabnis
c0efc04ea7 Merge "Refactor BluetoothHeadset APIs used by Settings" am: b3de542cf7
am: 12558824e4

Change-Id: I70c293538b2b993800e8a77da8491237d21b0f9c
2019-12-05 16:25:12 -08:00
Treehugger Robot
b3de542cf7 Merge "Refactor BluetoothHeadset APIs used by Settings" 2019-12-06 00:11:52 +00:00
Nikita Dubrovsky
d63f2035bd Consolidate tracking of touch state in Editor (editable TextView)
The goal of these changes is to consolidate the state that needs to be
tracked for user motion events (touches, clicks, etc), in order to make
it easier to add/update functionality in the future.

These changes are intended to fully preserve existing behavior from the
user perspective. For the most part, the logic is completely unchanged
(just that the code is pulled out), but it's worth calling out the
following subtle changes to the logic. These changes don't affect any
user-visible behavior.

1) In Editor.onTouchEvent, the recorded position of the last down event
is now updated before SelectionModifierCursorController.onTouchEvent()
is invoked.

2) In Editor.updateTapState (now in EditorTouchState.update), instead
of using SystemClock.uptimeMillis() for the event time, we use
event.getEventTime().

Bug: 143852764
Test: Manual testing and unit test
  atest FrameworksCoreTests:EditorTouchStateTest
Change-Id: Ic40b5e53412294d365bc9d787e7013a44fe11ffa
2019-12-05 15:56:29 -08:00
Meng Wang
cb7a8f3245 Merge "Move DataConnectionRealTimeInfo from telephony to core." am: 037b717fe8
am: d973a4b22c

Change-Id: Ia2765a05104303e4d15b4f55ca8433759031dacc
2019-12-05 15:55:27 -08:00