Commit Graph

530663 Commits

Author SHA1 Message Date
Xiao Ma
a88adc48fc Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 8e8460b4b3 am: aa24ca0106
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265

Change-Id: Ibfd085b283caf6a531cbdf752e009317eb105287
2020-10-29 06:35:46 +00:00
Xiao Ma
e26d6ebc1c Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes""" am: 42c643a2e5 am: 1145cdcefe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460264

Change-Id: Ie6b10f73ac6508b83e240e74a215edbe58901be3
2020-10-29 06:35:44 +00:00
Xiao Ma
aa24ca0106 Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 8e8460b4b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265

Change-Id: I49ce3e1c7794dc6db0e410cba481eb98144bc4e5
2020-10-29 06:17:22 +00:00
Xiao Ma
1145cdcefe Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes""" am: 42c643a2e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460264

Change-Id: Ie13b2bb8037d85ab4782e06cfc31e108397fc78b
2020-10-29 06:09:44 +00:00
Chiachang Wang
84aa44d22b Merge changes I6a51d803,I162fae5c am: b524e17519 am: 18013cefe3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228

Change-Id: I61cdda413fe21a46ac075a0abba2b9affa015149
2020-10-29 05:52:33 +00:00
Chiachang Wang
a6b1b5722a Merge "Replace hidden NMS interface to network API" am: 2a40529747 am: 667b09128d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473224

Change-Id: Ifc403211281b58bf25c9e7c652a863368b80deae
2020-10-29 05:52:12 +00:00
Xiao Ma
8e8460b4b3 Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ"
* changes:
  Add jarjar rule for IPv6ProvisioningLossQuirk.
  Revert "Revert "Test IPv6ProvisioningLossParcelable in the NetworkAttributes"""
2020-10-29 05:39:16 +00:00
Chiachang Wang
18013cefe3 Merge changes I6a51d803,I162fae5c am: b524e17519
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228

Change-Id: I1ed98a5295891da0eef007960e4260dfd047de2b
2020-10-29 05:22:37 +00:00
Chiachang Wang
667b09128d Merge "Replace hidden NMS interface to network API" am: 2a40529747
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473224

Change-Id: Ia5c064f19e2736b77d85400f7f5da5b81c766a1e
2020-10-29 05:17:49 +00:00
Chiachang Wang
b524e17519 Merge changes I6a51d803,I162fae5c
* changes:
  Replace hidden NMS API for setting MTU
  Replace hidden NMS default network configuration API
2020-10-29 05:03:43 +00:00
Chiachang Wang
2a40529747 Merge "Replace hidden NMS interface to network API" 2020-10-29 05:02:21 +00:00
Treehugger Robot
d325e02efc Merge "CEC: Add range validator for one byte parameters" am: e7d24dad51 am: 0d776820b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433919

Change-Id: Idfa0eda9272717b82d6f1fadda38d26e9f8b7cfe
2020-10-29 01:53:28 +00:00
Hall Liu
44435a2175 Merge "Update docs for TelephonyManager#getServiceState" am: 66917569e1 am: a29952e222
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1474964

Change-Id: I18936e40ac9bb19ac91b50f4294aabb3b683320a
2020-10-29 01:49:27 +00:00
Treehugger Robot
396079ce63 Merge "CEC: Add unit test for Record Status Validator" am: 5fee207876 am: 96750a088c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460268

Change-Id: I34a76caeb245e9a47ecd187c6a00084b49acd532
2020-10-29 01:49:14 +00:00
Yuchao Zhou
35e7e24870 Merge "Remove outdated bluetooth tests" am: 2dc2ac6ac7 am: 33f9ffcc66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477677

Change-Id: I1433a0cb67de4e39696f911dac253ee5510e7908
2020-10-29 01:48:28 +00:00
Treehugger Robot
0d776820b1 Merge "CEC: Add range validator for one byte parameters" am: e7d24dad51
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433919

Change-Id: I8d523ce663641787a07a6d935124b3a4a0903044
2020-10-29 01:47:46 +00:00
Hall Liu
a29952e222 Merge "Update docs for TelephonyManager#getServiceState" am: 66917569e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1474964

Change-Id: I52ff5c80758a9ab2c5ba4f5d0f501642d54d1666
2020-10-29 01:38:39 +00:00
Treehugger Robot
96750a088c Merge "CEC: Add unit test for Record Status Validator" am: 5fee207876
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460268

Change-Id: Ic8bfe4896f88a1aab797eb6426f9d4ba7ec49523
2020-10-29 01:34:17 +00:00
Yuchao Zhou
33f9ffcc66 Merge "Remove outdated bluetooth tests" am: 2dc2ac6ac7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477677

Change-Id: Iaf14cfd004f588ef936f93458fdb4bf077cecb4a
2020-10-29 01:25:36 +00:00
Treehugger Robot
e7d24dad51 Merge "CEC: Add range validator for one byte parameters" 2020-10-29 01:22:48 +00:00
Treehugger Robot
0207b41506 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." am: 5ba504f179 am: 09b112ff93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444676

Change-Id: I0eee659fed87c632038e976f5a592515fe4b54e3
2020-10-29 01:22:31 +00:00
Hall Liu
66917569e1 Merge "Update docs for TelephonyManager#getServiceState" 2020-10-29 00:58:29 +00:00
Treehugger Robot
5fee207876 Merge "CEC: Add unit test for Record Status Validator" 2020-10-29 00:00:51 +00:00
Yuchao Zhou
2dc2ac6ac7 Merge "Remove outdated bluetooth tests" 2020-10-28 23:47:01 +00:00
Treehugger Robot
09b112ff93 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." am: 5ba504f179
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444676

Change-Id: Ie5cc73ee5ab28225529bbc8165c9ba3ef0490839
2020-10-28 21:10:49 +00:00
Treehugger Robot
5ba504f179 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." 2020-10-28 19:44:40 +00:00
Rahul Sabnis
57835f979c Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from
the non-SDK API list to the blocklist in Android 11 back to the non-SDK
API list.

Tag: #feature
Bug: 168812851
Test: atest BluetoothHostTest#testCodecMethodsAccessible
Merged-In: I29983284b1a1c271d983c99b286e204604abdc72
Change-Id: I29983284b1a1c271d983c99b286e204604abdc72
2020-10-28 18:35:25 +00:00
Shraddha Basantwani
4c38e53fed CEC: Add range validator for one byte parameters
Test: atest HdmiCecMessageValidatorTest
Bug: 170811408
Change-Id: I83463d058ae6e3dd0f8f0fad04106264e50cc4c9
2020-10-28 15:49:40 +05:30
Shraddha Basantwani
a0da8e5114 CEC: Add unit test for Record Status Validator
Test: atest HdmiCecMessageValidatorTest
Bug: 170811408
Change-Id: Iec05a2ea267f420a3705bb4bec122d8375999cb5
2020-10-28 15:39:31 +05:30
Chiachang Wang
8d39f189d5 Replace hidden NMS API for setting MTU
Replace the hidden NMS setMtu API with calling INetd directly
for incoming ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect network
Change-Id: I6a51d8033b3354824d4cfb953c2bbe3055d00102
2020-10-28 14:38:18 +08:00
Chiachang Wang
1ee4a7485c Replace hidden NMS interface to network API
Replace the hidden NMS addInterfaceToNetwork and
removeInterfaceFromNetwork with calling INetd directly for
incoming ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect network
Change-Id: I0f1f866be2f8084b992b340aeabfb5d62420686b
2020-10-28 14:38:18 +08:00
Chiachang Wang
ffa7b2f12c Replace hidden NMS default network configuration API
Replace the hidden setDefaultNetId and clearDefaultNetId NMS
APIs with accessing INetd directly for the incoming
ConnectivityService mainline.

Bug: 170598012
Test: atest FrameworksNetTests
Test: manually connect and disconnect wifi
Change-Id: I162fae5ca444207a037e5ac4bf8fa0a77a648ca1
2020-10-28 14:38:18 +08:00
Amit Mahajan
db305ea9d7 Remove unused telephony api files.
Test: TH
Bug: 170906882
Merged-in: Idbd05aeef055291fc50008129c30c4ae272c1ac0
Change-Id: Ie91e11a23988729a63b6bf6a7ba965552b241748
2020-10-27 21:45:17 -07:00
Kohsuke Yatoh
fad0f95f46 Merge "Fix typo in documentation." am: dcaacee8af am: 1d04ebf79b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469677

Change-Id: I80eceb871ecd8bf02316e38551d8cc66fb82bb7c
2020-10-27 23:57:28 +00:00
James Mattis
689181f342 Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472326

Change-Id: I3eeeb071bf77c9f71ba54a680b7d43936200b12e
2020-10-27 23:57:19 +00:00
Yuchao Zhou
37584b66cd Remove outdated bluetooth tests
These tests were developed for Wear platform test many years ago and
haven't been used for long time. Removed to prevent risks.

Test: Removing code.
Bug: 170730828
Change-Id: I71cc4a3959bd2b195723c0a04928d7566f8a23ed
2020-10-27 16:37:56 -07:00
Kohsuke Yatoh
1d04ebf79b Merge "Fix typo in documentation." am: dcaacee8af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469677

Change-Id: I7cdf03edbbe71733672e19258a98c4476fd16a91
2020-10-27 23:28:30 +00:00
Kohsuke Yatoh
dcaacee8af Merge "Fix typo in documentation." 2020-10-27 23:24:31 +00:00
James Mattis
32fbc09bd0 Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472326

Change-Id: I3c1adf377b08bfce35ca0d341035462ee3dbd2c6
2020-10-27 23:19:20 +00:00
James Mattis
7415f6f9b5 Merge "Add OEM_PRIVATE NetworkCapability" 2020-10-27 22:53:42 +00:00
Michael Sun
3bf1e46421 Merge "BatteryStats: update to use new notifyWakeup with wakeup reasons" am: 6f000144cd am: 42f35b5081
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464467

Change-Id: Ie636060b04704b07f242bb68fc934371b9beba48
2020-10-27 21:26:26 +00:00
Michael Sun
42f35b5081 Merge "BatteryStats: update to use new notifyWakeup with wakeup reasons" am: 6f000144cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1464467

Change-Id: I4c49a8986be837fad68c3893d6a901c00a19998d
2020-10-27 21:10:06 +00:00
Michael Sun
6f000144cd Merge "BatteryStats: update to use new notifyWakeup with wakeup reasons" 2020-10-27 20:40:45 +00:00
James Mattis
13135f3003 Add OEM_PRIVATE NetworkCapability
Adding network capability to be used with networks to be only used by
OEM apps.

Bug: 171505922
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ib55ebec0e178b6317d92f17e1aff060dacdfb2b1
2020-10-27 13:14:06 -07:00
Treehugger Robot
0c6faf40fd Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73 am: ed29b2da3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471402

Change-Id: I57d108c24027a44fcadee9ee54c69df9696916c8
2020-10-27 18:47:13 +00:00
JW Wang
125259951c Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a19 am: 68569ea618
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470701

Change-Id: I229063cf0f85a110a15c9aa4dd6ca013f1c06a96
2020-10-27 18:47:10 +00:00
JW Wang
167b921a80 Add #connectWithTimeout (1/n) am: 67c91c405c am: 4fba545a90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470700

Change-Id: Ib1d6e7967c63e1e3af632d1ca1760cba705f4a09
2020-10-27 18:47:05 +00:00
Treehugger Robot
ed29b2da3c Merge changes from topic "BackportUiAutomatorRetry" am: ff062f6e73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471402

Change-Id: I0de90a96abe80db87569aa7a8d53baf0135812e3
2020-10-27 18:31:59 +00:00
JW Wang
68569ea618 Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470701

Change-Id: I8ae08884980d978306ac2b0e9b81fe2c9addad51
2020-10-27 18:29:46 +00:00
JW Wang
4fba545a90 Add #connectWithTimeout (1/n) am: 67c91c405c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470700

Change-Id: Idab13ed7ae1e20e8a9b064727485db40c3aadd9d
2020-10-27 18:22:24 +00:00