661159 Commits

Author SHA1 Message Date
Rambo Wang
293c5ebb47 Merge "Expose grouping and opportunistic carrier config keys." 2022-02-01 20:52:05 +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
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
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
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
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
853b6f6ede Merge "[MS59.3] Expose NetworkStatsDataMigrationUtils" 2022-01-29 03:55:41 +00:00
Treehugger Robot
ab72b30f19 Merge "Add more OWNERS" 2022-01-29 02:26:39 +00:00
Ian G. Clifton
bae29e0bc1 Minor JavaDoc grammar fix
Replaced "than" (comparative) with "then" (temporal) for the setTextSize JavaDoc. No functional change.

Change-Id: I84b5d1b250cb7a5d925cfbd0a86a2bfef55ade24
2022-01-29 01:37:43 +00:00
xshu
a8460ad918 Add NEARBY_WIFI_DEVICES to shell permissions for CTS
Bug: 197776854
Test: build
Change-Id: I51f8441e3744a4137042abe602d700a4ab757fe1
2022-01-28 17:05:48 -08:00
Pirama Arumuga Nainar
9f165ca3e1 Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" 2022-01-28 20:14:07 +00:00
John Reck
19a7ce9bb5 Add more OWNERS
Test: N/A
Change-Id: I23f4b0aad2251f607f0f98ed855dce6b19e8f536
2022-01-28 15:06:47 -05:00
Darwin Huang
7bd04e97a2 Fix misspelling in SurfaceTexture#attachToGLContext javadoc
I assume "unusued" was supposed to be "unused"...

Change-Id: Id44a21cca0aadb054e395450ab57b200b5f65a9d
2022-01-28 19:12:08 +00:00
Parvathy Shanmugam
be7c8dca0d Fix for crash while merging 2 audio calls for initiating conference call
Null pointer exception occured while calling callsessionupdated on listener object.
Listener turned null at the time of executor method is on run. Null check is present before setting the call to executor.
Modified the null checks to be inside of the executor.

Test: Conference call in oriole userdebug
Bug: 210701681
Change-Id: Iffeedb669b4abb9b4f32f015aaea4ba3b99c00f5
Merged-In: Iffeedb669b4abb9b4f32f015aaea4ba3b99c00f5
2022-01-28 18:31:13 +00:00
Paul Duffin
4d6002c204 Merge changes I58502249,I6db85a44
* changes:
  Merge system and module-lib APIs from conscrypt and i18n
  Merge annotations zip from conscrypt and i18n
2022-01-28 16:12:09 +00:00
Lalit Maganti
3a24d6bffb Merge "base: add support for routing traces to reporters" 2022-01-28 12:15:57 +00:00
Treehugger Robot
d2e67f24d0 Merge "Clear counters and delete tag data from NetworkStatsService." 2022-01-28 11:51:43 +00:00
junyulai
07c4c8657d [MS59.3] Expose NetworkStatsDataMigrationUtils
Test: TH
Bug: 204830222
Change-Id: I15a45fbadeb69b70a0e983b00de9e934d29749d6
2022-01-28 11:03:53 +00:00
Parvathy Shanmugam
add3b8d76e (IMS Threading refactoring) Telephony IMS classes to schedule IMS callback on the main thread
Modified to schedule callbacks on main thread or callback executor rather than on binder thread
Introducing utility api runWithCleanCallingIdentity to run the action in executor

Test: atest FrameworksTelephonyTests:ImsCallTest
Bug: 197989471
Change-Id: Icdb0750d63f242eb79351781a4b75ca745c30083
Merged-In: Icdb0750d63f242eb79351781a4b75ca745c30083
2022-01-28 08:58:24 +00:00
Paul Duffin
57533b4d83 Merge system and module-lib APIs from conscrypt and i18n
Previously, conscrypt and i18n were excluded from the list of modules
from which combined_apis retrieved system and module-lib API files as
they did not provide those files. They now provide those files so no
longer need to be treated specially.

The conscrypt and i18n (and art) are excluded from the
framework-updatable-stubs-module_libs_api as that is used with a
java_system_modules that already provides the conscrypt and i18n
and art APIs.

Bug: 216435117
Test: m all-modules-system-stubs
      m frameworks-base-api-system-current.txt
      m frameworks-base-api-module-lib-current.txt
Change-Id: I58502249c59b1faa65fb288ac11becd9496ff37e
2022-01-28 08:50:24 +00:00
Paul Duffin
a114f9899c Merge annotations zip from conscrypt and i18n
Previously, conscrypt and i18n were excluded from the list of modules
from which combined_apis retrieved annotation zip files as they did not
provide those files. They now provide those files so no longer need to
be treated specially.

Bug: 216435117
Test: m sdk-annotations.zip
Change-Id: I6db85a44715362dfb288ddf9010e2289233acf78
2022-01-28 08:47:13 +00:00
Lorenzo Colitti
94fb93765c Clear counters and delete tag data from NetworkStatsService.
Currently, NetworkStatsService deletes tag data by calling
NetworkManagementSocketTagger, which then calls into libcutils
"qtaguid" code. Instead, make NetworkStatsService call into
libcutils directly and delete the NetworkManagementSocketTagger
code.

In the future, this will make it easier for NetworkStatsService
to perform this operation by calling directly into BpfNetMaps.

Because the unit test does not yet have working JNI code, provide
an internal TagStatsDeleter interface that can be mocked out via
the Dependencies class. This is a bit ugly but it will be deleted
as soon as the code uses BpfNetMaps directly.

Delete NetworkManagementSocketTagger#setKernelCounterSet since it
was replaced in aosp/1958917.

Also remove unused includes and make formatting changes suggested
by clang-format.

Test: m
Test: atest NetworkStatsServiceTest
Test: atest NetworkUsageStatsTest
Test: atest TrafficStatsTest
Test: stats deleted when CtsUsageStatsTestCases completes and test APK is uninstalled
Change-Id: I62987000afc185199821580232bfb7668c8e301e
2022-01-28 13:02:48 +09:00
Treehugger Robot
51b03bb79c Merge "[MS76] Remove NetworkTemplate hidden api dependencies in NPMS" 2022-01-28 04:01:55 +00:00
Treehugger Robot
89b34a9b64 Merge "Add OWNERS file to omapi" 2022-01-28 03:30:17 +00:00
Treehugger Robot
9fb33b71c4 Merge "Update OWNERS for HardwareBuffer" 2022-01-27 22:52:44 +00:00
Haoyu Zhang
7c46ad5d1b Merge "Update OWNERS file" 2022-01-27 22:48:54 +00:00
John Reck
419064b6f2 Update OWNERS for HardwareBuffer
Test: N/A
Change-Id: Id258e99bb3e2d1a553165aeaa0d6520d4f5afb20
2022-01-27 16:35:54 -05:00
Junyu Lai
7da58cca81 Merge "[DU12]Remove NetworkType Annotation" 2022-01-27 20:55:00 +00:00
Lalit Maganti
4b7d9b148b base: add support for routing traces to reporters
Change-Id: I4ff55e9c211bfedada85234ee86f7484acf633ee
2022-01-27 20:48:38 +00:00
Treehugger Robot
f11f031190 Merge "Do not initiate clip classification again when copying to profile." 2022-01-27 18:49:27 +00:00
Anton Hansson
1dd24999da Merge "Dedupe default definitions slightly" 2022-01-27 15:59:16 +00:00
Frank
c507cdc91a [DU12]Remove NetworkType Annotation
Bug: 216619447
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsSubscriptionsMonitorTest
Change-Id: I58689201a684f581a4b88df058a5e0683da61926
2022-01-27 22:28:20 +08:00
Anton Hansson
36a4915c86 Merge "Generate merged public and system stubs" 2022-01-27 12:55:33 +00:00
Treehugger Robot
de1df073cb Merge "Revert "Changing readParcelable and readSerializable's method signatures."" 2022-01-27 12:52:47 +00:00
Junyu Lai
e385ac2a06 [MS76] Remove NetworkTemplate hidden api dependencies in NPMS
Test: atest NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: I8b81be7d590049e992dd80b70152d5ea8c3400f9
2022-01-27 20:38:10 +08:00
Anton Hansson
c6e9d2ffe2 Generate merged public and system stubs
Eliminate another two enumerations of all modules.

Bug: 169103987
Test: m android_{,system_}stubs_current && diff intermediates (no diffs)
Merged-In: I0d35f1e76320356ee4e5535a40614cf7d8ff4486
Change-Id: I0d35f1e76320356ee4e5535a40614cf7d8ff4486
2022-01-27 12:34:37 +00:00
Tom Bell
a1a71aaae4 Merge "Ensure shortcodes beginning 40xx are free of charge as per ITU spec" 2022-01-27 12:28:01 +00:00
lucaslin
110b5a96d5 Add a new API startProvisionedVpnProfileSession()
Add a new API to return a unique key corresponding to a specific
VPN session, so that when VPN sends ACTION_VPN_MANAGER_ERROR
intent, the app can know if this intent is sent for the session
that the app is using.

Bug: 191413541
Test: atest CtsNetTestCases
Change-Id: I372308f7f4d20acf3ea17a322bc5f39e0bac460f
2022-01-27 19:04:15 +08:00