Commit Graph

443918 Commits

Author SHA1 Message Date
Automerger Merge Worker
2cd526da2b Merge "test: ConnectivityService: Validate Route Add/Del" am: 23a3258189
Change-Id: I020c5cf1da94de7a68ec70cc1a38ea70aaf703d0
2020-02-27 01:06:34 +00:00
Automerger Merge Worker
ce708ae4f5 Merge "Quiet ds-docs-switched" am: 9407b63eb8
Change-Id: I04ee691ab5b0b81ae36ef273cfcdfda916015e4a
2020-02-27 01:06:04 +00:00
Lorenzo Colitti
23a3258189 Merge "test: ConnectivityService: Validate Route Add/Del" 2020-02-27 01:00:58 +00:00
Treehugger Robot
9407b63eb8 Merge "Quiet ds-docs-switched" 2020-02-27 00:53:47 +00:00
Automerger Merge Worker
721f99b99f Merge changes I36c6ef4b,I3c31394e am: be0d76d382
Change-Id: I60549c067c76bd2755150e1f920c4bd5624ce741
2020-02-26 21:52:13 +00:00
Automerger Merge Worker
8aa867e0fd Remove key from adb_keys if user forgets the key. am: f7378376ca
Change-Id: Ic9d70066ffc9012475e6d1e42039e53849b7c850
2020-02-26 21:52:07 +00:00
Joshua Duong
be0d76d382 Merge changes I36c6ef4b,I3c31394e
* changes:
  Allow UsbDeviceManager to start adbd again.
  Remove key from adb_keys if user forgets the key.
2020-02-26 21:39:39 +00:00
Colin Cross
a2410ebbb9 Quiet ds-docs-switched
The ds-docs-switched genrule was producing 18947 lines of output,
including a single line with 266986 bytes.  Quiet all the tools
used in the genrule.

Test: m ds-docs-switched
Change-Id: I5549c34f6310469e7791b56190d5b7c1f386a5f7
2020-02-26 13:10:07 -08:00
Automerger Merge Worker
c1ff7279d0 Merge changes from topic "Delete RcsMessage code" am: 32f87fc6fb
Change-Id: I19a4c8f9ce6715dae1799d6429c9a61efcc02e25
2020-02-26 18:04:13 +00:00
Automerger Merge Worker
41088f6456 Delete unused RcsMessage code for now. am: eed4a690ac
Change-Id: Icae62dd890a01f913d24083248c78f318eedb546
2020-02-26 18:04:10 +00:00
Automerger Merge Worker
4349d2d937 Move EXTRA_SERVICE_STATE from Intent to ServiceState. am: 3ee618bbf5
Change-Id: Ia1452df2cd70deeee8bac0d71f108404ac292725
2020-02-26 18:04:05 +00:00
Automerger Merge Worker
7e3f076b2c Merge "Add missing RequiresPermission annotations in BluetoothHidHost and BluetoothMap APIs, disallow null device input for setConnectionPolicy, getConnectionPolicy, and getConnectionState in BluetoothHidHost, and BluetoothMap implements AutoCloseable, its close() method is public, and utilizes a CloseGuard." am: a9e6a280f8
Change-Id: Iee457f25ea65b2507986f7e111341fc9924f56e3
2020-02-26 18:01:50 +00:00
Amit Mahajan
32f87fc6fb Merge changes from topic "Delete RcsMessage code"
* changes:
  Remove the usage of Downloads.* constants.
  Delete unused RcsMessage code for now.
  Move EXTRA_SERVICE_STATE from Intent to ServiceState.
2020-02-26 18:00:11 +00:00
Treehugger Robot
a9e6a280f8 Merge "Add missing RequiresPermission annotations in BluetoothHidHost and BluetoothMap APIs, disallow null device input for setConnectionPolicy, getConnectionPolicy, and getConnectionState in BluetoothHidHost, and BluetoothMap implements AutoCloseable, its close() method is public, and utilizes a CloseGuard." 2020-02-26 17:44:26 +00:00
Joshua Duong
eb6e5bc47b Allow UsbDeviceManager to start adbd again.
There's some weird state where if persist.sys.usb.config=none,adb, then
adbd won't get started. Give back adbd start permissions to
UsbDeviceManager to see if that fixes the issue.

Bug: 150130503

Test: adb shell su 0 setprop persist.sys.usb.config none,adb; adb reboot
adb should be online after.

Change-Id: I36c6ef4b20d58570a2d51ed70088ae5c54d6687d
Merged-In: I36c6ef4b20d58570a2d51ed70088ae5c54d6687d
Exempt-From-Owner-Approval: Fix adbd offline failure
2020-02-26 08:33:19 -08:00
Joshua Duong
f7378376ca Remove key from adb_keys if user forgets the key.
It was being removed from adb_temp_keys.xml but not adb_keys.

Bug: 150138676
Bug: 111434128

Test: atest AdbDebuggingManagerTest

Change-Id: I3c31394e4480e787c771e193b179a472d6ee4a62
Merged-In: I3c31394e4480e787c771e193b179a472d6ee4a62
2020-02-26 08:22:12 -08:00
Automerger Merge Worker
09bac39444 Merge changes I9ad74037,I50b29ef9 am: c8a2dbdb10
Change-Id: Ib320f47617d6521fdbece8b8960b4e2a7423ee30
2020-02-26 15:59:44 +00:00
Treehugger Robot
c8a2dbdb10 Merge changes I9ad74037,I50b29ef9
* changes:
  Avoid interface name copy in HwParcel
  Avoid allocation on Java Binder fast path
2020-02-26 14:46:57 +00:00
Automerger Merge Worker
64500d8f20 Merge "Revert "Disable BootImageProfileTest presubmit"" am: 3e6b337bf4
Change-Id: I2d4b2c6417fe91ac4d88e88e6b92dfce66e0cbd0
2020-02-26 00:11:38 +00:00
Mathieu Chartier
3e6b337bf4 Merge "Revert "Disable BootImageProfileTest presubmit"" 2020-02-25 23:58:56 +00:00
Automerger Merge Worker
65886069ed Merge "Add compat annotation processor for services/core." am: b1597060fc
Change-Id: I3bc1694a19abde6804385bdfbdf15da3f5094db9
2020-02-25 22:43:35 +00:00
Peter Collingbourne
b1597060fc Merge "Add compat annotation processor for services/core." 2020-02-25 22:27:49 +00:00
Automerger Merge Worker
0c1e585a7d Merge "tethering: transitive deps from jni_libs" am: 20b4ccfef8
Change-Id: Iae7da87bbcd81d33e4f2db30348cf0ed4378dd5e
2020-02-25 22:22:57 +00:00
Automerger Merge Worker
c3f22ed19d Merge "Do not statically link ike-stubs" am: d63c9d71b1
Change-Id: I9c04f27b5cfd4f5ff0cb0021a79d253e0f13b7de
2020-02-25 22:22:33 +00:00
Treehugger Robot
20b4ccfef8 Merge "tethering: transitive deps from jni_libs" 2020-02-25 22:13:19 +00:00
Yan Yan
d63c9d71b1 Merge "Do not statically link ike-stubs" 2020-02-25 22:05:37 +00:00
Amit Mahajan
89a6069758 Remove the usage of Downloads.* constants.
Replaced them with local constants as it is only for
internal use.

Test: basic sanity
Bug: 140908357
Merged-in: Icebabc4d16c2e6d5b6e2fb311fee697e8acfa285
Change-Id: Icebabc4d16c2e6d5b6e2fb311fee697e8acfa285
(cherry picked from commit 113d4543ad)
2020-02-25 12:40:52 -08:00
Amit Mahajan
eed4a690ac Delete unused RcsMessage code for now.
This feature is incomplete and will be worked on later. For now
since it uses hidden APIs its better to delete it.

Test: basic sanity
Bug: 140908357
Merged-in: I4a11d5440dca1b98275bfd2b18f3ef5dae65e95a
Change-Id: I4a11d5440dca1b98275bfd2b18f3ef5dae65e95a
(cherry picked from commit db6aa1a4f7)
2020-02-25 12:35:09 -08:00
Amit Mahajan
3ee618bbf5 Move EXTRA_SERVICE_STATE from Intent to ServiceState.
This extra is not exposed and is not used by anyone as such.
Leaving it there for internal use/unsupported app usage.

Test: basic sanity
Bug: 140908357
Merged-in: I9fe6e904291affb1cd7b705212d47525b61a5679
Change-Id: I9fe6e904291affb1cd7b705212d47525b61a5679
(cherry picked from commit bb61b17cd9)
2020-02-25 12:28:02 -08:00
Rahul Sabnis
f9e92a836f Add missing RequiresPermission annotations in BluetoothHidHost and
BluetoothMap APIs, disallow null device input for setConnectionPolicy,
getConnectionPolicy, and getConnectionState in BluetoothHidHost, and
BluetoothMap implements AutoCloseable, its close() method is public, and
utilizes a CloseGuard.

Bug: 149238030
Test: Manual
Change-Id: I8add9e26afcaf1a988c15e3cc7f8c446491f0686
2020-02-25 12:03:48 -08:00
Peter Collingbourne
7cb1eae174 Add compat annotation processor for services/core.
We have compat annotations in services/core (specifically
NATIVE_HEAP_POINTER_TAGGING and CTS_SYSTEM_API_CHANGEID, and soon
NATIVE_MEMORY_TAGGING) so we need to add the processor.

Bug: 135754954
Bug: 135772972
Change-Id: I134c67907abdba1dee971111498c6e50da68a768
Merged-In: I25c6339c6adeb907878596332f57e2fa229bfda9
2020-02-25 10:41:01 -08:00
Automerger Merge Worker
cdf0080354 Merge changes I756b5834,Idce09cff am: a7fdceeba2
Change-Id: I7c5e83f83518086a57525360ea25921e438bfe95
2020-02-25 18:32:29 +00:00
Automerger Merge Worker
81c9a924d0 Delete unused reference of a hidden constant. am: 306ae9551a
Change-Id: I893cfa7d28a46c7485ea5a3288126fb9326b85a2
2020-02-25 18:32:25 +00:00
Amit Mahajan
a7fdceeba2 Merge changes I756b5834,Idce09cff
* changes:
  Move euicc related file to telephony.
  Delete unused reference of a hidden constant.
2020-02-25 18:15:58 +00:00
Automerger Merge Worker
3049edac01 Merge "Set min_sdk_version for com.android.sdkext" am: f00c5483ae
Change-Id: I1f710d3ede720528888add5c1491225dd9f11d3a
2020-02-25 15:49:07 +00:00
Colin Cross
f00c5483ae Merge "Set min_sdk_version for com.android.sdkext" 2020-02-25 15:34:26 +00:00
Automerger Merge Worker
4b67009cb2 Merge "Update javadoc to reflect that BluetoothPbap#setConnectionPolicy returns true on successfully setting the connection policy instead of on disconnection. It also now indicates that if BluetoothProfile#CONNECTION_POLICY_FORBIDDEN is passed in, the profile will be disconnected." am: a09e9e4fe1
Change-Id: I576a4f4f233f2e84d623d739090141e862db38d8
2020-02-25 09:56:24 +00:00
Treehugger Robot
a09e9e4fe1 Merge "Update javadoc to reflect that BluetoothPbap#setConnectionPolicy returns true on successfully setting the connection policy instead of on disconnection. It also now indicates that if BluetoothProfile#CONNECTION_POLICY_FORBIDDEN is passed in, the profile will be disconnected." 2020-02-25 09:46:25 +00:00
Automerger Merge Worker
eebf830623 Merge "[SP19] Reduce log when set limit and request stats update" am: aefe8de138
Change-Id: I961e44130c623192142c3614560f312b853aca43
2020-02-25 09:33:30 +00:00
Treehugger Robot
aefe8de138 Merge "[SP19] Reduce log when set limit and request stats update" 2020-02-25 09:14:24 +00:00
Jooyung Han
9618b66f28 tethering: transitive deps from jni_libs
The build system collects transtive deps from jni_libs for APKs.
No need to list them explicitly in android_app definition.

Bug: 146992436
Test: m com.android.tethering
      deapexer extract com.android.tethering.apex apex
      unzip apex/priv-app/Tethering/Tethering.apk -u apk
      ls apk/lib/arm64-v8a

Change-Id: Icba6ea3611c443cbf22ad6363d0239377d16ac9e
2020-02-25 17:35:18 +09:00
Automerger Merge Worker
10d8d7109f Merge "Change checking rule in startArcAction(false) for HDMI CTS" am: 3adddd63a7
Change-Id: Ia4a6cd36b0404f24768a432802395d2d34277b44
2020-02-25 08:26:40 +00:00
Austin Shin
3adddd63a7 Merge "Change checking rule in startArcAction(false) for HDMI CTS" 2020-02-25 08:17:07 +00:00
junyulai
dc1cf02ac5 [SP19] Reduce log when set limit and request stats update
setLimit can be ignored if the quota is unlimited and not
changed, and the log could be omitted since it will still be
logged in HAL. Request stats update will print error log in
service if it is not correctly responded in time.

Test: atest TetheringTests
Test: manual
Fix: 149735152

Change-Id: I01c0191d5b89942fa69b167b8a6b40ed2821300b
2020-02-25 15:02:10 +08:00
Automerger Merge Worker
ced462a325 Merge "ADD new enum NetworkType to identify multiple transport type" am: b4562568c8
Change-Id: I6139c33252cae0a9b041fe3b47e12ceadfe6367f
2020-02-25 06:59:48 +00:00
Frank Li
b4562568c8 Merge "ADD new enum NetworkType to identify multiple transport type" 2020-02-25 06:49:59 +00:00
Automerger Merge Worker
a081a0cbab Merge changes I4a624ea4,I8626932e am: d813aaa279
Change-Id: I287935bd8023f13033d53bdef79a7e2027114d40
2020-02-25 04:00:34 +00:00
Automerger Merge Worker
3a4324ef8b Merge "Add API docs for permission SECURE_ELEMENT_PRIVILEGED" am: c779bbce18
Change-Id: I58cfdae8da99d505c4b4c91f53d3329a5bec0b58
2020-02-25 04:00:06 +00:00
Automerger Merge Worker
43bfaf2fda Merge "Fix Race Condition" am: 1d9f60bccc
Change-Id: Ia13cbf8e1afa085c09883a049d375c2916021525
2020-02-25 03:58:54 +00:00
Lorenzo Colitti
d813aaa279 Merge changes I4a624ea4,I8626932e
* changes:
  Fix a logic error in IpServerTest#addRemoveipv6ForwardingRules
  Clear IPv6 forwarding rules when losing upstream or stopping.
2020-02-25 03:54:59 +00:00