Commit Graph

531574 Commits

Author SHA1 Message Date
Hall Liu
e9f06ec2af Merge "Move usage of Runnable::run to TelephonyUtils" am: 9f52302f07 am: e4a53f30bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496999

Change-Id: I642f31c361f32b963554ca7d64e68cf51ce6dae3
2020-11-12 19:47:29 +00:00
Hall Liu
e4a53f30bb Merge "Move usage of Runnable::run to TelephonyUtils" am: 9f52302f07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496999

Change-Id: Ie76344b6e292e9d71b0603db22405aee27421c6a
2020-11-12 19:30:12 +00:00
Hall Liu
9f52302f07 Merge "Move usage of Runnable::run to TelephonyUtils" 2020-11-12 19:11:58 +00:00
Treehugger Robot
ccd1a25b3e Merge "Use name instead of package name" am: 9b2537195c am: 0b307f3272
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457859

Change-Id: Iadb7e41739f934a149612d941a1dc6964cc22c27
2020-11-12 19:09:37 +00:00
Treehugger Robot
5427aff46d Merge "Keystore 2.0 SPI: Add forEach for int arrays to ArrayUtils" am: 47e0d9e30b am: 7afe866370
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470092

Change-Id: I410f60138361e46fe9b333da9759549efe7fbb85
2020-11-12 19:09:19 +00:00
Treehugger Robot
0b307f3272 Merge "Use name instead of package name" am: 9b2537195c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1457859

Change-Id: I2c658618b0662578bf8753434549fc74c5dbb666
2020-11-12 18:26:51 +00:00
Treehugger Robot
7afe866370 Merge "Keystore 2.0 SPI: Add forEach for int arrays to ArrayUtils" am: 47e0d9e30b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470092

Change-Id: I69695bb8ae5e276178fc645bc0d6dfeea27107f1
2020-11-12 18:14:50 +00:00
Treehugger Robot
9b2537195c Merge "Use name instead of package name" 2020-11-12 18:00:33 +00:00
Treehugger Robot
47e0d9e30b Merge "Keystore 2.0 SPI: Add forEach for int arrays to ArrayUtils" 2020-11-12 17:57:42 +00:00
Allen Su
21604689d0 Merge "Declare audio codec bitrate and bandwidth" am: b04ef45226 am: 1bb3473fdf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494041

Change-Id: Ie0d7a2ae62fd2d79637870fa96cb26a30ee9e95f
2020-11-12 17:48:52 +00:00
Allen Su
1bb3473fdf Merge "Declare audio codec bitrate and bandwidth" am: b04ef45226
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494041

Change-Id: I629aef718f1783f51e929d937d1997a0a4865a75
2020-11-12 17:40:01 +00:00
Allen Su
b04ef45226 Merge "Declare audio codec bitrate and bandwidth" 2020-11-12 17:08:42 +00:00
Zhuying Li
eac499d10d Use name instead of package name
Can't get package setting info with wrong package name.
The API toStaticSharedLibraryPackageName will build correct package name
with correct information.

Bug: 170699390
Bug: 172232086
Test: manual test pass.
Change-Id: Iad97a3adf19ec37797123070a0662bfc7fc3337c
2020-11-12 16:34:28 +00:00
Janis Danisevskis
cbab0d133b Keystore 2.0 SPI: Add forEach for int arrays to ArrayUtils
This patch adds a forEach function for int arrays to
android.security.keystore.ArrayUtils. A utility function with the
intendet use in Keystore 2.0 Key paramter handling.

Test: None
Change-Id: I2c02b300ee68fcd548c128deb0266fe603226807
2020-11-12 08:03:25 -08:00
Andrei-Valentin Onea
fe2b1a414c Merge "Migrate FILTER_APPLICATION_QUERY" am: 714960f745 am: 9aa009684b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492847

Change-Id: Ic839aef9eaa7f6cc37ddced323b4a30692fd2e9d
2020-11-12 14:32:01 +00:00
Andrei-Valentin Onea
9aa009684b Merge "Migrate FILTER_APPLICATION_QUERY" am: 714960f745
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492847

Change-Id: I3579dadeec330fc1c1097d617191e451f6518c52
2020-11-12 13:36:49 +00:00
Anton Hansson
4d6f4e1374 Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b am: cca63b3099
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496267

Change-Id: I17702d355bf1df961cb1b65332a83eb183567f5f
2020-11-12 13:36:38 +00:00
Andrei-Valentin Onea
714960f745 Merge "Migrate FILTER_APPLICATION_QUERY" 2020-11-12 13:09:53 +00:00
Anton Hansson
cca63b3099 Merge "Remove the system-api-stubs-docs target" am: d0fb632e4b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496267

Change-Id: I5bd6ddf615d32ad6c7cb4aabadbfe9434c8ab78e
2020-11-12 13:00:06 +00:00
Anton Hansson
d0fb632e4b Merge "Remove the system-api-stubs-docs target" 2020-11-12 12:28:16 +00:00
Junyu Lai
9672f71a14 Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 02bd168520 am: de83629fc1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617

Change-Id: I11a56ed8d67f321a66fecc7550383db7d9f9c897
2020-11-12 09:35:38 +00:00
Junyu Lai
de83629fc1 Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 02bd168520
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490617

Change-Id: I5545dddcb5c8499ac9c53325cbafd424124429e1
2020-11-12 09:02:13 +00:00
Junyu Lai
02bd168520 Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5
* changes:
  Remove unused variables
  Return offloaded traffic when querying from TrafficStats API
  Add hardware tethering traffic in testTethering test
  Remove unused getTetherStats
2020-11-12 08:45:15 +00:00
junyulai
845f3a61ae Remove unused variables
From aosp/537809, variables that used to fetch realtime
stats are defined in NetworkStatsService. These varialbles
are filled by JNI in boot up stage in order to keep
definitions sync with native layer.

However, there is still a copy in TrafficStats.java, and this
copy cannot be filled in boot-up stage since it is in app
process. Besides, making a binder call to fetch these
constants from service is considered an overkill.

Thus, since there is no caller to these variables and callers
should use definitions in TrafficStats, remove these variables.

Test: atest FrameworksNetTests
Bug: 16229221
Change-Id: I6a48d4dbb1b824cfc6c4a47395b2a76aa28cf5c9
2020-11-12 14:22:31 +08:00
junyulai
e5d0585e2c Return offloaded traffic when querying from TrafficStats API
TrafficStats API are being used for querying realtime network
statistics for years. However, on certain devices, some network
traffic are produced by hardware components and not be
able to seen by kernel counters.

Thus, include statistics for those missing network traffic is
necessary. Note that the included statistics might be stale
since polling newest stats from hardware might impact system
health and not suitable for TrafficStats API use cases.

Test: atest FrameworksNetTests TetheringTests
Bug: 16229221

Change-Id: I6741c41cb5145ca8748f9b083b9c15e7e2735681
2020-11-12 14:22:31 +08:00
junyulai
f917b8b786 Add hardware tethering traffic in testTethering test
Test: atest com.android.server.net.NetworkStatsServiceTest#testTethering
Bug: 162292214
Change-Id: Ifec6bde5fd3231f2135f12536c42e42ec6b707de
2020-11-12 14:22:31 +08:00
Yi Kong
765230c02c Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface am: 1bd94db820
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495717

Change-Id: Ib1f746e3fe41043b09091b773a2153e842ed2197
2020-11-12 04:47:38 +00:00
Yi Kong
1bd94db820 Merge "profcollect: Use DeviceConfig to control trace parameters" am: be52daface
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495717

Change-Id: Ib775fb17b8e9acff0c1f3e2ad4ec1f9873df4ad3
2020-11-12 04:13:16 +00:00
Remi NGUYEN VAN
a41f16a27d Merge "Add dependency on modules-utils-build" am: 4c85126591 am: 68933c3e39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494037

Change-Id: I02b37698cf810dfb1ddd564eda140a39b1884612
2020-11-12 04:07:24 +00:00
David Su
87cbfbff71 Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e am: 6c9fe5a3e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776

Change-Id: Ibd3d7f61619327529e35ad2817f3227936d8230b
2020-11-12 04:07:01 +00:00
Treehugger Robot
5869a2d3c4 Merge "Remove UWB RangingParams" am: 412a12977c am: 3943ca7598
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487526

Change-Id: Ifb22b4273ba5553d374fdaad43414bcd2e6a63ff
2020-11-12 04:06:36 +00:00
Yi Kong
be52daface Merge "profcollect: Use DeviceConfig to control trace parameters" 2020-11-12 03:42:12 +00:00
Remi NGUYEN VAN
68933c3e39 Merge "Add dependency on modules-utils-build" am: 4c85126591
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494037

Change-Id: Iefa773a7dc55a2edbcc9142baf62e185d18507de
2020-11-12 03:35:39 +00:00
Remi NGUYEN VAN
4c85126591 Merge "Add dependency on modules-utils-build" 2020-11-12 03:32:49 +00:00
David Su
6c9fe5a3e7 Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776

Change-Id: I639b05c29d4ab88a0c9eaa5278ad5b97db3dcb00
2020-11-12 03:31:40 +00:00
Treehugger Robot
3943ca7598 Merge "Remove UWB RangingParams" am: 412a12977c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487526

Change-Id: I33ef7b7fa9245a494b5e94ca9da4aa1c871b1709
2020-11-12 03:26:22 +00:00
Hall Liu
564084cbdb Move usage of Runnable::run to TelephonyUtils
Using Runnable::run in com.android.internal.telephony from this
directory will conflict with any usages from frameworks/opt/telephony
since the compiles apparently scopes method references at the package
level. Move it to TelephonyUtils (which is in the .util sub-package) to
avoid the conflict.

Bug: 156779270
Test: build
Change-Id: I3471162eecde869aea66533de0355b3214859098
2020-11-11 19:02:47 -08:00
David Su
ad8a87b69e Merge "services.net-module-wifi - set min_sdk_level to 30" 2020-11-12 02:53:27 +00:00
Treehugger Robot
412a12977c Merge "Remove UWB RangingParams" 2020-11-12 02:37:44 +00:00
Treehugger Robot
0009280c26 Merge "Kibosh the NrState Strings" am: 7e42554a0a am: 959570eb57
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496998

Change-Id: I151e67a230baa260e9e209a3de0757eda51be728
2020-11-12 02:14:57 +00:00
Treehugger Robot
959570eb57 Merge "Kibosh the NrState Strings" am: 7e42554a0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496998

Change-Id: I950efd1d513b0f5eb723e85e7c9e9428a6623677
2020-11-12 01:52:09 +00:00
Treehugger Robot
7e42554a0a Merge "Kibosh the NrState Strings" 2020-11-12 01:35:47 +00:00
Janis Danisevskis
7662e81e98 Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091

Change-Id: I6c7bf795d40f6cb28d86b84bbe1162438322301c
2020-11-12 00:30:08 +00:00
madym
8365756bc7 Merge "Add mady to Shell/OWNERS" am: 708e1e5995 am: 8ee7052466
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496467

Change-Id: I69bb527107a53fec6b0b90d41ced3f94ad16a251
2020-11-12 00:29:46 +00:00
Janis Danisevskis
7d49ae705e Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091

Change-Id: I0c7d36564f4d8d976ab28ca475ea41de6a282f14
2020-11-11 23:49:15 +00:00
Dmitry Dementyev
96e7f6118f [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours am: ef729aad20 -s ours
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13031365

Change-Id: I009b7a429a38075ebca6263032b46cb296c319c8
2020-11-11 23:17:03 +00:00
Dmitry Dementyev
f22196b923 Merge "Ignore GrantCredentials call with unexpected calling uid." into qt-dev am: a064b69f18 am: f0263a9369 am: 4290008125 am: 5ec7e0d4f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13029782

Change-Id: If6ed2031eb08dc339a225b184b80d6403e6fad2a
2020-11-11 23:16:34 +00:00
Janis Danisevskis
17f24b5799 Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" 2020-11-11 23:10:13 +00:00
Nathan Harold
f33864e651 Kibosh the NrState Strings
The toString() method of NetworkRegistrationInfo and
ServiceState are being abused to get info that apps
really should be using: becuase the info can be misleading.

Instead, callers should use ServiceState#getCellBandwidths() and
or the onLinkDownstreamBandwidthKbps() methods from Connectivity
that are part of LinkProperties.

Bug: 172999992
Test: wip
Change-Id: Id4658acd30a50b35d55456ecca19bd92319eeba5
2020-11-11 15:00:48 -08:00
Dmitry Dementyev
ef729aad20 [automerger skipped] Merge "Ignore GrantCredentials call with unexpected calling uid." into pi-dev am: fe16873a33 -s ours am: 2d91b0fcaa -s ours am: 9aaffcb759 -s ours am: 54c839515b -s ours
am skip reason: Change-Id I1421c333b6cebb4f7cddcdd8766298f6872e933b with SHA-1 10d8a114bb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13031365

Change-Id: I77a92f64de96eed1a2769f77da233f581dab53b3
2020-11-11 22:55:11 +00:00