Commit Graph

374573 Commits

Author SHA1 Message Date
Brad Ebinger
608fa51d55 Merge "Fix docs comment for ACTION_SECRET_CODE" 2018-08-30 21:10:49 +00:00
Brad Ebinger
8b05d8b40d Fix docs comment for ACTION_SECRET_CODE
Test: makeg doc-comment-check-docs
Bug: 112440728
Change-Id: I0c953ce2112e30534847fafc8ab9d286e82a102f
2018-08-30 21:10:02 +00:00
Joel Fernandes
84b5650315 Merge "Rename map names in read_mapinfo" 2018-08-30 19:30:58 +00:00
Philip P. Moltmann
a0a67862aa Merge "UsbDeviceManager: Check PTP FileDescriptor properly" 2018-08-30 19:16:21 +00:00
David Brazdil
a264c2c83e Merge "Rewrite hidden API list generation in Python" 2018-08-30 17:59:02 +00:00
David Brazdil
8503b9045b Rewrite hidden API list generation in Python
Generating hidden API lists has grown in complexity and the original
Makefile rule has become a bottleneck for build times. Rewrite the
logic in Python.

Bug: 113278235
Bug: 73736106
Test: frameworks/base/tools/hiddenapi/generate_hiddenapi_lists_test.py
Change-Id: I63f03133d70260d06c55f482b844a4980dc6f734
2018-08-30 16:19:26 +01:00
Treehugger Robot
9137ecafbd Merge "Add @UnsupportedAppUsage annotations" 2018-08-30 15:18:18 +00:00
Cassie Han
47c7675ae4 Merge "Move SECRET_CODE_ACTION from Telephony.Sms.Intents to TelephonyManager." 2018-08-30 15:15:27 +00:00
Mathew Inwood
71da3a1fe4 Add @UnsupportedAppUsage annotations
For all remaining unannotated code.

This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 110868826
Test: m
Change-Id: I32861fa341a08f11a9c50c07a1ef7404dadf6bb6
Merged-In: I67c8b71ea535ebffb10bf577948bd4ccb8ca069d
2018-08-30 13:38:01 +01:00
Remi NGUYEN VAN
6717a6f930 Merge changes I58f904d5,Ie0bf7804
* changes:
  Fix DHCP options sent by DHCP server
  Fix BOOTP fields for server-generated DHCP packets
2018-08-30 09:24:29 +00:00
Ian Zerny
b0896e61f8 Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"" 2018-08-30 08:29:58 +00:00
Ian Zerny
e72a524590 Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"
This reverts commit 3284e35061.

Reason for revert: breaks most branches

Bug: 112867975
Change-Id: Icb27e193529f523f4cf07ef55e19625c402a2d3b
2018-08-30 08:29:25 +00:00
Mathew Inwood
fa4ccace61 Merge "Add @UnsupportedAppUsage annotations" 2018-08-30 07:55:39 +00:00
Remi NGUYEN VAN
6557a2464e Fix DHCP options sent by DHCP server
Add Android metered option, rebinding time option (T2), and match
current order of options.  Current DHCP server uses subnet_mask,
broadcast_address, router, name_server in this order.

Test: DhcpServerTest.py:test_discover_paramrequestlist passes
      atest FrameworksNetTests passes

Bug: b/109584964
Change-Id: I58f904d5fac306f704c16234fd69c2440fe0803d
2018-08-30 16:13:20 +09:00
Remi NGUYEN VAN
e59d031fb9 Fix BOOTP fields for server-generated DHCP packets
Set siaddr to the server address instead of zero in DHCPOFFER
Set siaddr to zero instead of the server address in DHCPNAK
Set giaddr to the relay address instead of the server address in
DHCPNAK
Set giaddr to the relay address instead of zero on DHCPACK and
DHCPOFFER
Set server identifier option in DHCPNAK

Current code is not compliant with RFC2131 and does not match dnsmasq
behavior. It was not an issue until now since the packets were only used
by the DHCP client, which does not send DHCPOFFER or DHCPNAK.

Bug: b/109584964
Test: following DhcpServerTest.py regression tests pass:
      test_discover_bootpfields
      test_request_selecting_inuse
      test_request_rebinding_relayed
      test_discover_relayed_broadcastbit
      test_request_rebinding_wrongaddr_relayed
      Also: atest FrameworksNetTests

Change-Id: Ie0bf780498e38945444bff66ca499cff5983a97f
2018-08-30 15:54:02 +09:00
Wang Han
e030a09023 UsbDeviceManager: Check PTP FileDescriptor properly
* A typo causes MTP one to be checked twice

Change-Id: If16bf5df43b6d51f6717aa7994b2f428fb3f1a69
2018-08-30 06:28:36 +00:00
Shaotang Li
b825510b80 Merge "Add new metrics constants for emergency dialer" 2018-08-30 02:24:22 +00:00
Treehugger Robot
d8523f3c01 Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT" 2018-08-30 02:16:38 +00:00
Treehugger Robot
7bd321ca25 Merge "Convert aapt to Soong" 2018-08-30 02:12:30 +00:00
Remi NGUYEN VAN
846c80acf5 Merge "Switch DHCP server based on global setting" 2018-08-30 02:01:31 +00:00
Treehugger Robot
7aae482135 Merge "Simply logic for connect and disconnect in HeadsetProfile" 2018-08-30 01:55:56 +00:00
Treehugger Robot
8593fc6c06 Merge "Remove connected device check logic in getConnectionState" 2018-08-30 01:55:27 +00:00
Pengquan Meng
adbe45e0ca Merge "Add new Telephony API for settings migration" 2018-08-30 00:39:37 +00:00
Dan Willemsen
5d12935f35 Convert aapt to Soong
See build/soong/README.md for more information.

Test: cd frameworks/base/tools/aapt; mma
Test: aapt version
Change-Id: Ice97e9b32c53cfed30d68acd5717d8c66712df4c
2018-08-29 17:24:18 -07:00
Oscar Shu
5add10333d Merge "Fix some fields in WifiInfo are not written into Parcel" 2018-08-30 00:13:51 +00:00
Treehugger Robot
05d5ec7842 Merge "Add new team member to owners file." 2018-08-29 23:45:12 +00:00
Pengquan Meng
ad224b637e Add new Telephony API for settings migration
Bug:111453847
Test: build test
Change-Id: Ia4468664453e532e80b8834e53d386fabeb11c41
Merged-In: Ia4468664453e532e80b8834e53d386fabeb11c41
2018-08-29 22:19:15 +00:00
Tyler Gunn
87a1397ee0 Add new team member to owners file.
Bug: 113528087
Test: Manual
Change-Id: I17d82d53386c14cfd0324d455b892ca17e07a079
2018-08-29 14:07:42 -07:00
Treehugger Robot
cdf75c3cc8 Merge changes from topic "androidx-settings-aosp"
* changes:
  Migrated various apps under frameworks/base/packages/Shell  to androidx
  Migrated SystemUI & SettingsLib to androidx
2018-08-29 18:31:09 +00:00
Chienyuan
c129df807f Remove connected device check logic in getConnectionState
From current code, it will check if the device connected before
getConnectionState. We can remove this check logic because
HidHostService will do it.

Bug: 111812003
Test: manual - connect/disconnect HID keyborad from Settings UI
Change-Id: Ib512b3f15109b6f4cacf1f1c517b69d17ddd5ac4
2018-08-29 23:14:55 +08:00
Chienyuan
edd44ec292 Simply logic for connect and disconnect in HeadsetProfile
* connect: remove debug log of connect connected device. HeadsetService
  will check it and print related log.
* disconnect: remove connected device check logic. HeadsetService will
  check it.
* getConnectionStatus: remove connected device check logic.
  HeadsetService will check it.
* wrap if/else statement in curly brackets.

Bug: 111812003
Test: manual - connect/disconnect headset from Settings UI

Change-Id: I2c58362c236a26b38c8aa67eb3a3433d76f97e45
2018-08-29 20:40:06 +08:00
Jakub Pawlowski
13d6540956 Merge "BLE: Add service solicitation uuid feature in scan filter" 2018-08-29 11:26:51 +00:00
Dario Freni
17115bdb02 Merge "Include NOTICE from /product and /product_services" 2018-08-29 09:12:52 +00:00
Treehugger Robot
0c7343ccd7 Merge "Also copy-construct multinetwork policy preference" 2018-08-29 08:06:34 +00:00
Erik Kline
397f8110b5 Also copy-construct multinetwork policy preference
Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - manual bluetooth tethering testing doesn't seem to trigger any
      actual tethering, since bt-pan interface keeps going down on
      test device (IpClient never really starts up fully)
Bug: 62476366
Bug: 113136023
Change-Id: I3265f60f8ae125eba4545cb652c95a2f70049058
2018-08-29 16:55:47 +09:00
Nitin Shivpure
1555eae7fa BLE: Add service solicitation uuid feature in scan filter
Adding service solicitation uuid feature in
scan filter, So BLE Scanner can set scan filter for
advertising packets that includes the Service Solicitation
uuid, which can be one of the below types.
 - List of 16 bit Service UUIDs
 - List of 32 bit Service UUIDs
 - List of 128 bit Service UUIDs

Test: BLE Scanner can do filter scan for advertising packets that
includes the Service Solicitation uuid.

Bug: 78483310
Change-Id: I3d83c50e446fca06a76db002dad716759c145d6e
2018-08-29 07:40:29 +00:00
Remi NGUYEN VAN
ef7432f245 Merge "Ignore DHCP packet sent from non-68 client port" 2018-08-29 06:25:06 +00:00
Remi NGUYEN VAN
64dda3cf18 Merge "Add global setting to use new DHCPv4 server" 2018-08-29 06:24:40 +00:00
Shaotang Li
b9a9a2f224 Add new metrics constants for emergency dialer
Bug: 111378820
Test: build
Change-Id: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6
2018-08-29 13:45:16 +08:00
Remi NGUYEN VAN
e3bb5c5a71 Switch DHCP server based on global setting
The newer implementation is disabled by default with this CL. Ultimately
the intention is to enable it by default.

Bug: b/109584964
Test: set tether_enable_legacy_dhcp_server to 0, ran DhcpServerTest.py,
      observed new behavior. Added tests in CL also pass.

Change-Id: I0f830b9804b8956c127057e66ab75a21ca29dc57
2018-08-29 12:36:24 +09:00
Remi NGUYEN VAN
e3a0f42e8e Merge "Add DhcpServer" 2018-08-29 03:19:27 +00:00
Treehugger Robot
0e1621296f Merge "Remove ResolveUtil from frameworks/base callers" 2018-08-29 02:58:08 +00:00
Treehugger Robot
c96760f4f3 Merge "[java9] Convert hiddenapi-list target to Metalava" 2018-08-28 23:46:02 +00:00
keigo, nishira
f53446deca Fix some fields in WifiInfo are not written into Parcel
Some fields in WifiInfo are not written into Parcel so
these fields will not be carried over process boundaries.

cherry-picked from: ag/4820524

Bug: 79889311
Test: compile & verified fields are filled from app
Test: Unit tests

Change-Id: I0d8f453c49212fc6d12d28537454c9a9657c1ef7
2018-08-28 16:24:01 -07:00
Jack Yu
c5a00e0957 Merge "Added access networks manager" 2018-08-28 22:09:47 +00:00
Treehugger Robot
08bd9bdbb3 Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" 2018-08-28 21:54:01 +00:00
KOUSHIK PANUGANTI
ec8d258c60 Migrated various apps under frameworks/base/packages/Shell to androidx
Bug: 76692459
Test: make Shell
Change-Id: If11159cac1bd5aa61c46a346647b97a661abbf11
Merged-In: If11159cac1bd5aa61c46a346647b97a661abbf11
(cherry picked from commit e92135a6e9)
(cherry picked from commit 474df059db)
(cherry picked from commit e0efaddbeb)
2018-08-28 14:20:24 -07:00
Aurimas Liutikas
b8616dc4d1 Migrated SystemUI & SettingsLib to androidx
Test: make SystemUI SettingsLib
Bug:76692459
Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95
Merged-In: I248fdf4042a0a97bc6349091da21c936c2d37c95
(cherry picked from commit fd52c1433c)
(cherry picked from commit d366771e84)
(cherry picked from commit a14377a450)
2018-08-28 14:19:51 -07:00
Victor Khimenko
46e75a69e8 Merge "Add fallback case to layers_extensions.cpp" 2018-08-28 20:24:33 +00:00
hjchangliao
5b02a33069 DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for BluetoothA2dp

Remove BluetoothA2dpWrapper,
Use BluetoothA2dp to replace all of them.

Bug: 76167422
Test: RunSettingsLibRoboTests

Remove wrapper for LocationManager

Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsLibRoboTests
2018-08-28 12:38:44 -07:00