Commit Graph

660216 Commits

Author SHA1 Message Date
Junyu Lai
239ffb98df Merge "[MS10.1] Move multiplySafeByRational to NetworkStatsUtils" am: 6ff6240694
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920477

Change-Id: I30b00d17b2c3ba20464677cd59d19b397c521743
2021-12-21 01:35:24 +00:00
Junyu Lai
6ff6240694 Merge "[MS10.1] Move multiplySafeByRational to NetworkStatsUtils" 2021-12-21 01:22:14 +00:00
Treehugger Robot
fff729397a Merge "Pbap use profileConnector, resolveSystemService api fix" am: 4548fa7275
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1916517

Change-Id: I9fdccd3ed68c5090c1322d1a6e43753a15b9a6d1
2021-12-21 01:15:52 +00:00
Treehugger Robot
4548fa7275 Merge "Pbap use profileConnector, resolveSystemService api fix" 2021-12-21 00:58:16 +00:00
Treehugger Robot
15ebb765e8 Merge "Add jdduke@ to services/proguard.flags OWNERS" am: 8c4a3070cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925580

Change-Id: I775d99f5fa2a215c9de768b279c1a09510e5c6db
2021-12-20 16:12:28 +00:00
Treehugger Robot
8c4a3070cd Merge "Add jdduke@ to services/proguard.flags OWNERS" 2021-12-20 15:55:52 +00:00
Treehugger Robot
1b148ed131 Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest" am: c9ed425df2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918645

Change-Id: Ifb356103d93cdfacaf3788d982784aea5f34f4a6
2021-12-20 14:52:55 +00:00
Treehugger Robot
c9ed425df2 Merge "Fix for run cts-on-gsi -m CtsOsTestCases -t android.os.cts.VibratorTest" 2021-12-20 14:33:41 +00:00
Junyu Lai
89e82a399d Merge "[MS05] Fix NetworkTemplate lint errors" am: 851c168716
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1886877

Change-Id: I77b47e5689991a1fc60c6378dfef219c358db58a
2021-12-20 12:15:00 +00:00
Junyu Lai
851c168716 Merge "[MS05] Fix NetworkTemplate lint errors" 2021-12-20 11:54:10 +00:00
Junyu Lai
b241707f03 [MS10.1] Move multiplySafeByRational to NetworkStatsUtils
Since NetworkStats related code will be moved to the module.
multiplySafeByRational in the NetworkUtilsInternal cannot be
accessed after that. Thus, create another utils class that
will be moved with NetworkStats code and put the function
into it.

Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.NetworkStatsUtilsTest
Bug: 204830222
Change-Id: I96f3ac02e57b7325ed53988285770f478dee529e
2021-12-20 09:12:13 +00:00
Junyu Lai
4703cffb5d [MS05] Fix NetworkTemplate lint errors
This change also defines some IntDef annotations that will
be used in the follow-up CLs.

Test: TH
Bug: 204830222
Change-Id: Iba5e714a1304fdfd154379415dcc5d0f9b7b1b29
2021-12-20 15:17:16 +08:00
Hyunho Shin
9f67e2a271 Merge "API description changed." am: db0515696f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926905

Change-Id: I9b9266052d13d110337cdaeacd597fdf83d7a308
2021-12-17 03:50:39 +00:00
Hyunho Shin
db0515696f Merge "API description changed." 2021-12-17 03:28:43 +00:00
Treehugger Robot
df07c71769 Merge "Remove allowBlocking from all BluetoothProfiles" am: a39eb360db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927380

Change-Id: Ibdf98bd48a34c12d55681124bc19f5bc8f0fe72c
2021-12-17 02:22:12 +00:00
Treehugger Robot
a39eb360db Merge "Remove allowBlocking from all BluetoothProfiles" 2021-12-17 02:01:13 +00:00
Hyunho
83d8141905 API description changed.
the api description changed to reflect what is expected to be done by the caller
Bug: b/210738734
Test: Build

Change-Id: I85cddad952cfb9f657b15c5c5e75bb0adc52188f
Merged-In: I85cddad952cfb9f657b15c5c5e75bb0adc52188f
2021-12-17 01:13:50 +00:00
Etienne Ruffieux
52ddc063b0 Merge "Moved AttributionSource related APIs in AttributionSource" am: 70d456d06c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922817

Change-Id: Ifc262e0d826b0a07debd5e2581626bc78ad25830
2021-12-16 21:22:36 +00:00
Treehugger Robot
b0afc3231c Merge "Remove unused import in IpSecAlgorithm" am: d089108eac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1924059

Change-Id: I27a674f8874f285a175dd62a02f5020a638d1e09
2021-12-16 21:20:09 +00:00
Treehugger Robot
2daf9fed80 Merge "Add mock modem service operations in Telephony" am: a7ab25609e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926901

Change-Id: Icddb05aa2442c1665b6456561f6de5b358e64a6a
2021-12-16 21:18:49 +00:00
Etienne Ruffieux
70d456d06c Merge "Moved AttributionSource related APIs in AttributionSource" 2021-12-16 21:16:58 +00:00
Treehugger Robot
d089108eac Merge "Remove unused import in IpSecAlgorithm" 2021-12-16 20:45:17 +00:00
Treehugger Robot
a7ab25609e Merge "Add mock modem service operations in Telephony" 2021-12-16 20:20:09 +00:00
Henry Fang
4851cbef3e Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: 525fc0dccb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842094

Change-Id: I49e3a04f597eaecfa983ec0b62cb1a9ce8e3d2dc
2021-12-16 19:49:18 +00:00
Hui Wu
f921b4b76d Merge "Adding owners in cloudsearch packages" am: d628edb425
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925161

Change-Id: Idd4a1c646fbba09032a6b73f332fb0aaa08b14e5
2021-12-16 19:48:27 +00:00
Henry Fang
525fc0dccb Merge "TvProvider API standardization for ARIB and DVB TvProvider" 2021-12-16 19:34:31 +00:00
Hui Wu
d628edb425 Merge "Adding owners in cloudsearch packages" 2021-12-16 19:33:49 +00:00
Hunter Knepshield
e66c82b449 Merge "Create CarrierPrivilegesListener callback." am: d54e1126ab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1912993

Change-Id: I6f639e53ddfdd8e92c265c88cc5af411ff694417
2021-12-16 19:21:11 +00:00
Hunter Knepshield
d54e1126ab Merge "Create CarrierPrivilegesListener callback." 2021-12-16 19:00:24 +00:00
William Escande
6b5464ca69 Remove allowBlocking from all BluetoothProfiles
Since Bluetooth is becoming a mainline module, it can no longer call the
allowBlocking hidden api.
Instead, all interface are moved to be oneway and use a synchronous data
to handle the return value.

Bug: 200200870
Test: Build + start Bt and play something on speaker
Tag: #refactor
Merged-In: I776a6322faadca1504bce24f2b6b041e756b6448
Change-Id: I776a6322faadca1504bce24f2b6b041e756b6448
2021-12-16 19:34:35 +01:00
Aaron Huang
b6c88d765e Remove unused import in IpSecAlgorithm
HexDump is an internal class which cannot be visible to mainline
module. Remove it since this is unused.

Bug: 204153604
Test: FrameworksNetTests
Change-Id: Ie65e7eff8464487719c3124005a097a500ba21c6
2021-12-16 17:36:10 +00:00
Steven Moreland
0c1dac2572 Merge "Binder: recycle Parcel in finally block" am: 8581d27415
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926857

Change-Id: Ib83fd1d5ddfbb3badc4412027085172843e4fb84
2021-12-16 17:30:52 +00:00
Steven Moreland
8581d27415 Merge "Binder: recycle Parcel in finally block" 2021-12-16 17:16:31 +00:00
Ayush Sharma
d48a67e944 Merge "Revert "Add APIs that allow to exclude routes from VPN"" am: da37e0f471
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927301

Change-Id: I80057bf522ad00c74984bf7524434d1a9685ea63
2021-12-16 15:16:50 +00:00
Ayush Sharma
da37e0f471 Merge "Revert "Add APIs that allow to exclude routes from VPN"" 2021-12-16 15:01:30 +00:00
Ayush Sharma
487b2e645a Revert "Add APIs that allow to exclude routes from VPN"
Revert "Suppress NewApi warnings for @SystemApi -> public APIs"

Revert "Add VpnServiceBuilderShim for VpnService.Builder"

Revert submission 1551943-vpn-impl

Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN

Change-Id: I89209357ab4bb206d206adcf9fd6d3498ce6ef4c
BUG: 210979001
2021-12-16 14:40:13 +00:00
Treehugger Robot
04d6da9cde Merge "Remove isUnsafeBuild() from IpSecAlgorithm" am: 8f4e057fa7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922077

Change-Id: Iaf739a2fc35f57fa3658ac28a78c6e6a9007e977
2021-12-16 14:35:59 +00:00
Xiao Ma
7fbed57e5f Merge "Move Ethernet related files to f/b/packages/ConnectivityT." am: 23b9aec38e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1922218

Change-Id: I9e43a8a4a094b751dd1b01e4d749b7d00bd997b4
2021-12-16 14:35:06 +00:00
Treehugger Robot
8f4e057fa7 Merge "Remove isUnsafeBuild() from IpSecAlgorithm" 2021-12-16 14:16:50 +00:00
Xiao Ma
23b9aec38e Merge "Move Ethernet related files to f/b/packages/ConnectivityT." 2021-12-16 14:12:39 +00:00
Aaron Huang
1c036ae377 Merge "Remove NetdService usage from IpSecService" am: da5df1a9d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1903978

Change-Id: Iab341cd7a94e1e60bbd7c1a66cab59d32ab89615
2021-12-16 12:48:00 +00:00
Aaron Huang
da5df1a9d8 Merge "Remove NetdService usage from IpSecService" 2021-12-16 12:32:41 +00:00
Taras Antoshchuk
1e2f898c30 Merge "Add APIs that allow to exclude routes from VPN" am: 55f030225b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619406

Change-Id: I57145a395803e87b0c1f1ff4705b6d712d95a68b
2021-12-16 11:34:48 +00:00
Taras Antoshchuk
55f030225b Merge "Add APIs that allow to exclude routes from VPN" 2021-12-16 11:13:33 +00:00
Junyu Lai
c270bbf232 Merge "[MS03] Remove ServiceNotFoundException hidden API usage" am: 7fee9dd710
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878043

Change-Id: I269b97690532cf81fed01d6e2a32005976b3842c
2021-12-16 11:00:30 +00:00
Junyu Lai
7fee9dd710 Merge "[MS03] Remove ServiceNotFoundException hidden API usage" 2021-12-16 10:42:15 +00:00
jimsun
6fb25dc35a Add mock modem service operations in Telephony
Bug: 205101043
Bug: 203241555
Test: manual
Change-Id: I65127fc43c62b52e3efaa99d06bf77855aab7bb0
Merged-In: I65127fc43c62b52e3efaa99d06bf77855aab7bb0
2021-12-16 17:02:34 +08:00
Xiao Ma
dfed81ffde Move Ethernet related files to f/b/packages/ConnectivityT.
ethernet-service is going to be moved into Connectivity mainline module.
Move all ethernet related files in f/b/ to f/b/packages/ConnectivityT so
that it's easier to migrate these files to Connectivity module finally
after clearing the hidden API usages. Below files to be moved:

Ethernet framework related files:
    - EthernetManager.java
    - EthernetNetworkSpecifier.java
    - IEthernetManager.aidl
    - IEthernetServiceListener.aidl
    - ITetheredInterfaceCallback.aidl

Ethernet service related files:
    - IpConfigStore.java(EthernetConfigStore has dependency on the class)

For the ethernet-service related files, keep it as-is temproraliy and
fix the hiden API dependencies in f/opt/net/ethernet/. After this work
is done, then migrating the whole of ethernet folder to Connectivity
module completely.

This CL also fixes some minor errors of code style format to pass the
code style check.

Bug: 210586283
Test: build pass
      atest FrameworksNetTests
      atest EthernetServiceTests
Change-Id: Ib359d29d5221105f648bc4194c6d6dbe4cc6e3e5
2021-12-16 06:59:08 +00:00
Treehugger Robot
eb9fe6b5ec Merge "Add scan result logs." am: 00d8163936
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836926

Change-Id: Iafecc88be450b94667ad590d1e93dad37c974978
2021-12-16 04:33:13 +00:00
Rambo Wang
8f4f829dee Merge "Support subscription for CarrierService#onLoadConfig" am: 33acead6f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1901033

Change-Id: I38dee86aa3f7aa9a5b4eac72023176bb2cb360d0
2021-12-16 04:32:14 +00:00