Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,371 Commits 3 Branches 0 Tags
4973cc90d9736bcadecc419820c4c03604f820f1
Commit Graph

661371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Treehugger Robot
55b8b87199 Merge "Add more OWNERS" am: ab72b30f19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965779

Change-Id: I5d15a9bb666379f54b67c4da43448aa2a56044e4
 2022-01-29 02:44:03 +00:00
Treehugger Robot
ab72b30f19 Merge "Add more OWNERS" 2022-01-29 02:26:39 +00:00
Pirama Arumuga Nainar
665796dd6d Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961919

Change-Id: I2c4c1d618174fef1a08cca712e259878719c13c4
 2022-01-28 20:31:44 +00: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
Paul Duffin
e9485a4144 Merge changes I58502249,I6db85a44 am: 4d6002c204 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965061

Change-Id: I8f2b5d9399c51cc591281ab1ad5abda779a83037
 2022-01-28 16:32:50 +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
26a716c74e Merge "base: add support for routing traces to reporters" am: 3a24d6bffb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918624

Change-Id: If2c06f5698f1952c02f5b449a6ab9fac9257c9b6
 2022-01-28 12:35:46 +00:00
Lalit Maganti
3a24d6bffb Merge "base: add support for routing traces to reporters" 2022-01-28 12:15:57 +00:00
Treehugger Robot
67105844ab Merge "Clear counters and delete tag data from NetworkStatsService." am: d2e67f24d0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962922

Change-Id: I124edaa4087280a66403bb0b6d8000b34aa73e37
 2022-01-28 12:08:05 +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
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
Treehugger Robot
f46434dea0 Merge "[MS76] Remove NetworkTemplate hidden api dependencies in NPMS" am: 51b03bb79c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958893

Change-Id: If4df10001b0c5562ef9f6009ff598b10906c1e55
 2022-01-28 04:22:34 +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
00559587f4 Merge "Add OWNERS file to omapi" am: 89b34a9b64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899034

Change-Id: Ifeff77be7e1971bdcd38fbc4a4aba8120c42eee8
 2022-01-28 03:52:36 +00:00
Treehugger Robot
89b34a9b64 Merge "Add OWNERS file to omapi" 2022-01-28 03:30:17 +00:00
Treehugger Robot
32d6425fd3 Merge "Update OWNERS for HardwareBuffer" am: 9fb33b71c4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1963734

Change-Id: Ibd6d60ece7a7cca89bb335705554872c91e98366
 2022-01-27 23:14:22 +00:00
Haoyu Zhang
c736a6f03a Merge "Update OWNERS file" am: 7c46ad5d1b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962024

Change-Id: I953f1327bb7a63c2f44b5af90b3e134ae83a667b
 2022-01-27 23:12:57 +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
afbb5462ff Merge "[DU12]Remove NetworkType Annotation" am: 7da58cca81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1963221

Change-Id: I5af8efe8e5e374519f799b15d48869126c43730e
 2022-01-27 21:11:39 +00: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
9fcba4d7c7 Merge "Do not initiate clip classification again when copying to profile." am: f11f031190 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956216

Change-Id: I2d80bdca01bc1bb5c72c12e59223aa77aab23e14
 2022-01-27 19:06:24 +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
0df14efb38 Merge "Dedupe default definitions slightly" am: 1dd24999da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956703

Change-Id: If90402a1e77d6de29f5016e3e2a27df4c66fa0d3
 2022-01-27 16:19:38 +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
e3ef18e4da Merge "Generate merged public and system stubs" am: 36a4915c86 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959342

Change-Id: I5a1fd70b0e4bdb66b23a61594d8cab62ea1aac3a
 2022-01-27 13:18:16 +00:00
Treehugger Robot
c75c2e1818 Merge "Revert "Changing readParcelable and readSerializable's method signatures."" am: de1df073cb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960781

Change-Id: I5dbae359a8c73864322beb44dbe6856af478df65
 2022-01-27 13:16:40 +00: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
Tom Bell
78647e84d2 Merge "Ensure shortcodes beginning 40xx are free of charge as per ITU spec" am: a1a71aaae4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1950076

Change-Id: I4bba5b21351637c08a135b6c0c6ba9f7abb2c7c1
 2022-01-27 12:46:37 +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