Commit Graph

661469 Commits

Author SHA1 Message Date
James Mattis
525001eeec Merge "Renaming Ethernet Network Management Classes" 2022-02-02 20:09:52 +00:00
Chienyuan
fd7f71ca5e SettingsLib: Add API to get identity address
Bug: 197044261
Test: build pass
Change-Id: Idd03d7777c8257986b03dd1ba19aac5514f4f18d
Merged-In: Idd03d7777c8257986b03dd1ba19aac5514f4f18d
(cherry picked from commit a393bf9d25)
2022-02-02 09:24:48 -08:00
Artur Satayev
5901c38224 Merge "Introduce Build.VERSION.KNOWN_CODENAMES." am: 4db55d2f36
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966780

Change-Id: Idc53bfb722ed8402a03aa43c13df60fc01fbb8a1
2022-02-02 17:08:55 +00:00
Artur Satayev
4db55d2f36 Merge "Introduce Build.VERSION.KNOWN_CODENAMES." 2022-02-02 16:52:37 +00:00
satayev
434ef186e6 Introduce Build.VERSION.KNOWN_CODENAMES.
See go/mainline-sdk-codenames-issue.

Known values are to be used to distinguish multiple pre-release
codenames, and to allow in development artifacts to be installable
on released versions of the platform for testing going forward.

This does not change pre-T behaviour at large however.

Bug: 211747008
Test: presubmit
Change-Id: I0c8df8e767ea61b27bb53da53fb6c9b2c842dbbc
2022-02-02 16:52:14 +00:00
Treehugger Robot
7d4245bc61 Merge "Support "Parcel.propagateAllowBlocking" for AIDL" am: bcefef7a8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964223

Change-Id: I25a4150a9b4f621cf636a60f2b7faef35d8a6a95
2022-02-02 16:16:59 +00:00
Treehugger Robot
bcefef7a8c Merge "Support "Parcel.propagateAllowBlocking" for AIDL" 2022-02-02 16:11:30 +00:00
Treehugger Robot
fd5bb81c8a Merge "Really expose the new NDK socket tagging functions added in T." am: cba72fc987
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1967301

Change-Id: I5be97f53054d23e68a8999d8e295a00bedc28b8d
2022-02-02 15:56:04 +00:00
Treehugger Robot
cba72fc987 Merge "Really expose the new NDK socket tagging functions added in T." 2022-02-02 15:41:41 +00:00
Lorenzo Colitti
2b9e8860ec Really expose the new NDK socket tagging functions added in T.
These functions were already exposed as part of libandroid_net,
but that is not really part of the NDK.

Expose them in libandroid as well, so apps can actually use them.
This is consistent with all the other native networking APIs,
which are exposed in both libandroid_net and libandroid.

Test: atest CtsNativeNetPlatformTestCases
Test: strings out/target/product/bramble/system/lib64/libandroid.so | grep android_tag
Change-Id: I2273cdd48b30a88b82eb3af838031d9fe8897442
2022-02-02 11:59:41 +00:00
hepengtao
985da1992e NSD: Specify on what interface to getAddrInfo
When discover two different host with same host name
from different network interface, specify on what
 interface to getAddrInfo.

Bug: 203453164
Test: build & manual

Signed-off-by: hepengtao <hept.hept.hept@gmail.com>
Change-Id: Ifaccb7f3fac6b1dd789cc9ce7c8d964102754508
2022-02-02 17:50:50 +09:00
James Mattis
50fe5ce680 Renaming Ethernet Network Management Classes
Renaming InternalNetwork* files and classes related to ethernet network
management to EthernetNetwork* as ethernet is the only trasnport these
particular files are used with.

Bug: 210485380
Test: atest EthernetServiceTests
Change-Id: Ieb3915c032ef5fcd6b36eb09878119de7668bb4b
2022-02-01 21:02:10 -08:00
James Mattis
1f9c0d6cf3 Merge "InternalNetworkManagementException Changes" am: 27c75f17a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952437

Change-Id: I272d569228edf6da00f55601d317b6c182746d89
2022-02-02 00:29:26 +00:00
Jooyung Han
14b9e5e7da Merge "Add Parcel APIs for fixed-size array" am: aa16747474
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958141

Change-Id: I7b7824d2cd0f500945f6123395f355988e9698c9
2022-02-02 00:29:04 +00:00
James Mattis
27c75f17a6 Merge "InternalNetworkManagementException Changes" 2022-02-02 00:15:24 +00:00
Jooyung Han
aa16747474 Merge "Add Parcel APIs for fixed-size array" 2022-02-02 00:12:49 +00:00
Makoto Onuki
a988435f43 Support "Parcel.propagateAllowBlocking" for AIDL
Bug: 216685683
Test: atest android.os.cts.ParcelTest
Change-Id: I9299632c8c4fd88afc6b539270c097b9c00188b3
2022-02-01 14:54:43 -08:00
Etienne Ruffieux
e9a0a82161 Replacing getActiveDevice by btAdapter.getActiveDevices()
BluetoothProfile.getActiveDevice() is hidden, packages
should call BluetoothAdapter.getActiveDevices(profile)
instead.

Tag: #feature
Bug: 200202780
Test: build
Change-Id: If7275488406ceebc9ccf6cee87d4963174de103d
2022-02-01 21:41:54 +00:00
Antonio Kantek
74927c2995 Merge "(TouchMode Permission) Update shell permission" am: 9d625f5392
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959747

Change-Id: I97452f64d140acfa428639390311c3d24a1c6ea0
2022-02-01 21:14:10 +00:00
Rambo Wang
761c8c15ad Merge "Expose grouping and opportunistic carrier config keys." am: 293c5ebb47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317034

Change-Id: I6208f9e520c30a7d3091a02573ded7762578c261
2022-02-01 21:13:51 +00:00
Antonio Kantek
9d625f5392 Merge "(TouchMode Permission) Update shell permission" 2022-02-01 21:02:36 +00:00
Rambo Wang
293c5ebb47 Merge "Expose grouping and opportunistic carrier config keys." 2022-02-01 20:52:05 +00:00
Treehugger Robot
2b08d4ce08 Merge "identity: Specify that challenges can be up to 32 bytes in length." am: 6bf721e811
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1963461

Change-Id: I9eb5ecbe68a47a23a0898484101072a00b92a0d3
2022-02-01 19:45:39 +00:00
Treehugger Robot
6bf721e811 Merge "identity: Specify that challenges can be up to 32 bytes in length." 2022-02-01 19:31:17 +00:00
James Mattis
e3fdb3f869 InternalNetworkManagementException Changes
Update to InternalNetworkManagementException in order to allow all
members to be parcelable.

Bug: 210485380
Test: atest EthernetServiceTests
Change-Id: I17f119a66face8a927546657490969aa3073c54b
2022-02-01 09:21:09 -08:00
Antonio Kantek
e06f3d2e3f (TouchMode Permission) Update shell permission
Update shell permission with MODIFY_TOUCH_MODE_STATE

Bug: 198487159
Test: manual
Change-Id: Ib5d5fd6298f281fe1339781026f4a2f471267747
2022-02-01 17:00:54 +00:00
Nathalie Le Clair
605ba8fdb2 Merge "CEC: Respond to GIVE_FEATURE message even in standby mode" am: 87ece80a27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956018

Change-Id: I60e720ced001dbf33db087f792166dc5024f6eaf
2022-02-01 16:14:33 +00:00
Nathalie Le Clair
87ece80a27 Merge "CEC: Respond to GIVE_FEATURE message even in standby mode" 2022-02-01 15:56:00 +00:00
Hunter Knepshield
73161658fe Expose grouping and opportunistic carrier config keys.
These have been fully functional since Q, but were not a part of the
public API at that time. This makes the keys public with a note that
they'll work all the way back to Q (API 29).

The security concern has been resolved in b/181053462.

Fix: 130676550
Test: m update-api && m offline-sdk-docs && m -j
Change-Id: Ie2e4370999d48543517346e933ac35f6d298a127
2022-02-01 07:42:50 -08:00
Nathalie Le Clair
e90b5a3efc Merge "CEC: Change vendor command handling" am: 134f59f851
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1807376

Change-Id: Ia4d1dda5058b8fa8ec452a3556cf5b76cf7f642e
2022-02-01 13:03:01 +00:00
Treehugger Robot
b12be450bb Merge "Delete NetworkManagementSocketTagger." am: c2d8b9b074
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1967419

Change-Id: Ib2ab35889a35f8e9f89c28f1305e69462f98c82a
2022-02-01 12:56:30 +00:00
Nathalie Le Clair
134f59f851 Merge "CEC: Change vendor command handling" 2022-02-01 12:56:13 +00:00
Treehugger Robot
c2d8b9b074 Merge "Delete NetworkManagementSocketTagger." 2022-02-01 12:32:04 +00:00
Lorenzo Colitti
c57a9b005b Delete NetworkManagementSocketTagger.
This code is no longer used:

- Clearing counters and deleting tag data was moved to
  NetworkStatsService in aosp/1962922 .
- Tagging and untagging sockets was moved to TrafficStats in
  aosp/1964912 . That CL deleted the .cpp file, but forgot to
  delete the .java file.

Test: m
Change-Id: Idc9acea09cf75295e22fba5904cce7f3acdd6342
2022-02-01 20:09:45 +09:00
William Escande
ac11d77264 BtProfileConnectionInfo update api review
BtProfileConnectionInfo: rename class to BluetoothProfileConnectionInfo
<>.hearingAidInfo: rename to createHearingAidInfo
<>.leAudio: rename to createLeAudio
<>.getIsLeOutput: rename to isLeOutput
<>.getSuppressNoisyIntent: rename to isSuppressNoisyIntent

Did a bit more to keep consistency with a2dp & a2dpSink

Test: build
Test: atest frameworks/base/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/BluetoothProfileConnectionInfoTest.java
Fix: 216294722
Tag: #refactor
Change-Id: I2c4cf8d93b1a8840da1bf92c26d4e76140d0d8da
2022-01-31 19:11:07 +01:00
Siyamed Sinir
fa264ae28b Merge "Minor JavaDoc grammar fix" am: 86e1a45b56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964582

Change-Id: I34dabcc644b099137daaa730aa0a4c8165a559a4
2022-01-31 16:22:00 +00:00
Siyamed Sinir
86e1a45b56 Merge "Minor JavaDoc grammar fix" 2022-01-31 16:03:30 +00:00
David Zeuthen
fbb1cca01a identity: Specify that challenges can be up to 32 bytes in length.
Bug: 216177025
Test: atest CtsIdentityTestCases
Change-Id: I507ab6b9ecd095ec53caaf859b236a8fdc7bfce9
2022-01-31 10:11:45 -05:00
Remi NGUYEN VAN
4973cc90d9 Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966441

Change-Id: I9c82ab5e998212d52fd512e4ea7affe010d86d4a
2022-01-31 14:06:16 +00:00
Xinyi Zhou
56f293dba5 Add NearbyService am: 17c5caf93e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966440

Change-Id: I5910c86f27b340f94307af7c41da818e4f83a576
2022-01-31 14:06:15 +00:00
Lorenzo Colitti
101bbfd2a2 Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline" am: ec7461850f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964912

Change-Id: I57a58eb215f17da6ce58607600ab322766f00b69
2022-01-31 14:04:58 +00:00
Lorenzo Colitti
b9e2b370fb Move kernelToTag to NetworkStatsFactory. am: 09d2a4b175
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964913

Change-Id: Ib763cf77b54e4583e51a337d4261069621e65f56
2022-01-31 14:04:49 +00:00
Remi NGUYEN VAN
3789826e68 Merge changes I5ee56ddd,Ib9ef2a7b
* changes:
  Expose Conext.NEARBY_SERVICE as SystemApi
  Add NearbyService
2022-01-31 13:46:21 +00:00
Lorenzo Colitti
ec7461850f Merge changes from topics "move-kerneltotag", "move-socket-tagging-to-mainline"
* changes:
  Move socket tagging implementation to mainline.
  Move kernelToTag to NetworkStatsFactory.
2022-01-31 13:35:30 +00:00
Xinyi Zhou
48f1bb60fb Expose Conext.NEARBY_SERVICE as SystemApi
(cherry-pick from downstream branch)

Merged-In: Ie9fb547e166e6c881dfd04383050375a11f84a9b
Test: Built successfully
Bug: 189954300
Change-Id: I5ee56ddd84d38ee24b559fea278c263d424508ed
2022-01-31 17:40:36 +09:00
Xinyi Zhou
17c5caf93e Add NearbyService
(cherry-pick from downstream branch)

Test: loaded on device.
Bug: 189954300
Merged-In: I399cdba08846a3eca1d7cd9378607b30fa8fd72d
Change-Id: Ib9ef2a7b34abe18b1a7a4b48f9a09bc2d5856ac6
2022-01-31 17:39:19 +09:00
Lorenzo Colitti
d0a17ee9d5 Move socket tagging implementation to mainline.
Currently, socket tagging is implemented in the framework. The
Java code is in NetworkManagmentSocketTagger.java and the JNI is
in libandroid and loaded by the general framework JNI loader.

- Move the Java implementation to TrafficStats, which is the only
  caller of NetworkManagmentSocketTagger. This simplifies the
  code a bit because a number of methods can be deleted.

- Move the JNI code to a new JNI library in the APEX. The library
  depends only on the NDK and statically links the NDK-only
  version of libnativehelper. Its size is only 5k on ARM and 10k
  on ARM64.

- Temporarily make the framework depend on this library until the
  rest of the T connectivity code moves to the APEX.

Test: atest NetworkUsageStatsTest CtsNetTestCases:TrafficStatsTest
Change-Id: I050c7c515237f68b78d08987bc443f50a7949c06
2022-01-30 15:59:44 +09:00
Lorenzo Colitti
09d2a4b175 Move kernelToTag to NetworkStatsFactory.
... to prepare for the deletion of NetworkManagementSocketTagger.

Test: atest FrameworksNetTests
Change-Id: Id3ad67fa640ddb9ab446e10dcf8e6a588d661dd9
2022-01-29 21:54:15 +09:00
Junyu Lai
cfb860d019 Merge "[MS59.3] Expose NetworkStatsDataMigrationUtils" am: 853b6f6ede
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961599

Change-Id: Ia1f7f14a2b53876530c394ade949fc8847eab806
2022-01-29 04:13:53 +00:00
Junyu Lai
853b6f6ede Merge "[MS59.3] Expose NetworkStatsDataMigrationUtils" 2022-01-29 03:55:41 +00:00