Commit Graph

660378 Commits

Author SHA1 Message Date
Qasim Javed
bfad455280 Merge "Add BluetoothLeBroadcastAssistantCallback." 2022-01-06 23:00:35 +00:00
Grace Jia
e43f70afc7 Merge "Add new API for new feature of display name." 2022-01-06 18:59:37 +00:00
Qasim Javed
0809c7789f Add BluetoothLeBroadcastAssistantCallback.
Bug: 205174140
Bug: 208222452
Tag: #feature
Test: gd/cert/run

Change-Id: I302f2d22e6f295db27c4309b7a30dd867a264439
2022-01-06 18:39:53 +00:00
Junyu Lai
ac674f3b41 Merge "[MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" 2022-01-06 13:57:12 +00:00
Junyu Lai
beb9fb3cc8 Merge changes from topics "ms34-tm", "ms40-clock"
* changes:
  [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicy
  [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API
  [MS40.1] Remove Clock dependencies from NetworkStatsService
  [MS27] Expose noteUntaggedSocket SystemApi
2022-01-06 13:56:39 +00:00
Treehugger Robot
ff35093684 Merge "Remove ParcelFileDescriptor hidden API usage from IpSecService" 2022-01-06 13:40:26 +00:00
Aaron Huang
4a6276d0dc Remove ParcelFileDescriptor hidden API usage from IpSecService
IpSec service is going to be a part of Connectivity mainline module
and ParcelFileDescriptor(FileDescriptor) is a hidden API that cannot
be used by mainline module.

Therefore, use ParcelFileDescriptor.dup(FileDescriptor) to get a
ParcelFileDescriptor instead.

Bug: 204153604
Test: FrameworksNetTests
Change-Id: I0ccabdfc5060f4b635e9a7009a67fbd5d32002fd
2022-01-06 19:16:43 +08:00
Treehugger Robot
61ca5d7c56 Merge "Explicit cast from android::Base::Errno to status_t" 2022-01-06 11:11:17 +00:00
Treehugger Robot
e5fb36cbf2 Merge "Add BluetoothLeBroadcastSourceInfo." 2022-01-06 10:32:39 +00:00
Junyu Lai
d8684a2fa9 [MS32.1] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage
Replace intent receiver with callback listener.

Test: atest com.android.server.net.NetworkStatsServiceTest
Bug: 204830222
Change-Id: I585b2bb471b59cbca3cce1c01ce527dff87f42da
2022-01-06 09:22:53 +00:00
Junyu Lai
64c6943777 [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicy
This change also remove getWifiNetworkKey which should not be exposed
as system API.

Test: atest NetworkTemplateTest
Bug: 204830222
Change-Id: I924f62025a8672167f778ff790cd208c74eed878
2022-01-06 09:22:52 +00:00
Junyu Lai
27c9adb058 [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API
Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I57aa4470aea1715217fa7d74f2c9067b096d1bae
2022-01-06 09:22:52 +00:00
Junyu Lai
2aa7b9ec4d [MS40.1] Remove Clock dependencies from NetworkStatsService
This includes:
1. Re-implement the BestClock in the static library.
2. Expose SystemClock#currentNetworkTimeClock as public Api

Test: TH
Bug: 204830222
CTS-Coverage-Bug: 213393821
Exempt-From-Owner-Approval: 1. Owner approved the change with
  explicitly granted submission after adderessing the
  straight-forward comment. 2. Owner is OOO for 3 months.
Change-Id: I08c0162a7101cc6184f3eca3d4a59211183fb843
2022-01-06 08:49:59 +00:00
Junyu Lai
0cf9e87c79 [MS27] Expose noteUntaggedSocket SystemApi
While Data usage related codes are moving to mainline module,
StrictMode#vmUntaggedSocketEnabled() and onUntaggedSocket()
can no longer be accessed from NetworkManagementSocketTagger.

Thus, expose alternative SystemApi to allow invocations from
the module.

Test: TH
Bug: 204830222
Exempt-From-Owner-Approval: 1. Owner approved the change with
  explicitly granted submission after adderessing the
  straight-forward comment. 2. Owner is OOO for 3 months.
Change-Id: Ib54ff54ce3617ae0d04080a1740e78b086bbb039
2022-01-06 08:49:46 +00:00
Meng Wang
692533e342 Merge "Add getPhoneNumber/setPhoneNumber API" 2022-01-05 23:04:27 +00:00
Treehugger Robot
d5bd847275 Merge "Reduce blocking time when waiting for CharacteristicWrite queue to clear up." 2022-01-05 21:13:56 +00:00
Qasim Javed
63d5150d7d Add BluetoothLeBroadcastSourceInfo.
Bug: 205174140
Bug: 208222452
Tag: #feature
Test: gd/cert/run

Change-Id: I5d129d8b230ab564387212ebe83eb3c4398c7b21
2022-01-05 12:52:01 -08:00
Sarah Chin
569fbec7ef Merge "Add Constants for UsageSetting" 2022-01-05 20:06:20 +00:00
Treehugger Robot
ae6b04cf84 Merge "Remove separate_platform_variant entries." 2022-01-05 19:16:16 +00:00
Treehugger Robot
b0c148971a Merge "Update MULTIUSER_OWNERS." 2022-01-05 14:48:01 +00:00
William Escande
f3a2e55ff7 Merge "Add SystemApi tag on getLastAudibleStreamVolume" 2022-01-05 14:41:52 +00:00
Oli Lan
dac61a84be Update MULTIUSER_OWNERS.
Test: N/A
Change-Id: I7d3e55926f1ca9b4ed26116c2f97e143a872c6a8
2022-01-05 13:13:50 +00:00
Giulio Fiscella
0a9079431b Merge "Add i18n to "module_current"" 2022-01-05 11:01:14 +00:00
Treehugger Robot
eefefd1255 Merge "[MS33.1] Remove NetdService dependency" 2022-01-05 10:39:13 +00:00
Treehugger Robot
cb64b957f7 Merge "gtbs: Add Generic Telephone Bearer Service support" 2022-01-05 09:58:55 +00:00
Alan Stokes
3281d1b876 Merge "Simplify ApexInfo classpath info" 2022-01-05 08:57:50 +00:00
Anton Hansson
dddbdc3b15 Merge "Remove references to win_sdk" 2022-01-05 08:13:21 +00:00
Junyu Lai
92524a042c [MS33.1] Remove NetdService dependency
This change pass INetd to NetworkStatsFactory to replace
NetdService#getNetdInstance.

Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I39b278989cea06dd316f21214380b5c4b54d2d50
2022-01-05 05:29:46 +00:00
Lucas Lin
9d8001cea1 Merge "Update underlying networks if it is changed" 2022-01-05 03:21:45 +00:00
Dmitri Plotnikov
884e5d8456 Merge "Add BATTERY_STATS_OWNERS to all *Stats files" 2022-01-04 23:42:08 +00:00
Treehugger Robot
547654cab7 Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps." 2022-01-04 23:34:38 +00:00
Dmitri Plotnikov
5e85751023 Add BATTERY_STATS_OWNERS to all *Stats files
Test: N/A
Change-Id: Ifb1865b2db902bf0cca1bde48a7381903dca229c
2022-01-04 15:31:01 -08:00
wescande
e178f8f635 Add SystemApi tag on getLastAudibleStreamVolume
Bug: 190422401
Tag: #refactor
Test: Build
Change-Id: I2cbb69292465b4271caeb0c563fa1db62d025dce
2022-01-04 18:52:16 +00:00
Chen Xu
ed021212d6 Merge "[MEP] eSIM API refactor to support MEP" 2022-01-04 18:50:09 +00:00
Steven Moreland
169eafcb30 Remove separate_platform_variant entries.
This no longer does anything.

Bug: 161456198
Test: build
Change-Id: I11329bd18de2f3e2f437fbcfd92e7a472be61070
2022-01-04 18:23:23 +00:00
Treehugger Robot
6a5c5e23cc Merge "Add QUERY_AUDIO_STATE permission" 2022-01-04 17:55:01 +00:00
Sarah Chin
fa2dc0b7e4 Merge "Update unthrottleApn calls to take in DataProfile" 2022-01-04 17:27:41 +00:00
Treehugger Robot
6619bac824 Merge "Fix deadlock issue." 2022-01-04 17:08:52 +00:00
Treehugger Robot
302d0925da Merge "Fix typo in Javadoc." 2022-01-04 16:39:30 +00:00
jiayongqiang
d2280b8107 Fix deadlock issue.
It might cause deadlock sometimes:

The locking order of setEventsMask is:
    registerDisplayListener -> <DMG.mLock> -> setEventsMask -> <class lock>;

The Locking order of handleMessage is:
    Looper.loop -> Looper.loopOnce -> Handler.dispatchMessage -> handleMessage -> <class lock>;

Therefore, when the registerDisplayListener is called by client,
the DisplayListenerDelegate.handleMessage also called by DMS's callback,
at this time, if the method with DMG.mLock is called in handleMessage(),
it will lead to deadlock.

Test: (For example)
Thread A:
DisplayListenerDelegate.handleMessage() -> <class lock>
DisplayListener.onDisplayChanged() -> DMG.getCompatibleDisplay() ->
DMG.getDisplayInfo() -> <DMS.mLock>

Thead B:
DMG.registerDisplayListener() -> <DMS.mLock> -> DisplayListenerDelegate.setEventsMask() -> <class lock>

Signed-off-by: jiayongqiang <jiayongqiang@xiaomi.com>
Change-Id: Ie1a8728339c16fa8f4c4f5c758821c836fa1c96b
2022-01-04 18:29:45 +08:00
Hai Zhang
cc0a80895f Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps.
See b/208785537#comment11.

Bug: 208785537
Bug: 206556385
Bug: 183537857
Bug: 208785537
Test: presubmit
Change-Id: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
Merged-In: Iaf5e2a0d86259805a9ef03f8f1baa14dd8c58da0
(cherry picked from commit e6f07a4fb2)
2022-01-04 09:22:05 +00:00
Alan Stokes
cd0705ed49 Simplify ApexInfo classpath info
Stop differentiating between the different ways an APEX can contribute
to derive_classpath - it makes no difference for the use cases, and it
doesn't scale if new environment variables are added.

Bug: 210472252
Test: atest ComposTestCase
Change-Id: I9256a6b5cc3689a8d61d51e8eb8d8c3f475172aa
2022-01-04 09:19:00 +00:00
Anton Hansson
dd8ef67a61 Remove references to win_sdk
This goal doesn't exist anymore. The build system automatically
translates it to "sdk".

Test: m win_sdk dist && inspect out/dist/apistubs
Change-Id: Ifc4fb07ce32ef21906e8bb8eae0003b1486a525a
2022-01-04 08:57:28 +00:00
Treehugger Robot
0892c27c57 Merge "[MS31] Fix several hidden API usages" 2022-01-04 03:56:23 +00:00
Treehugger Robot
7b8430e17e Merge changes from topics "ms25-appops", "ms28-service-fix"
* changes:
  [MS25.1] Remove AppOpsManager.OP_GET_USAGE_STATS dependency
  [MS28.1] Fix several hidden API dependencies
2022-01-03 22:41:07 +00:00
William Escande
d0ad455409 Add QUERY_AUDIO_STATE permission
Due to aosp/1863058, we need to add the associated permission

Bug: 190422401
Tag: #refactor
Test: None in this CL.
Change-Id: Id1809b85aca57929cba0197ba9d35f926dfeaf1b
2022-01-03 22:49:46 +01:00
Junyu Lai
1e3e87b14a [MS31] Fix several hidden API usages
This includes:
1. Replace UserHandle.getUid(userId, appId) with public API
2. Remove Preconditions.checkArgument
3. Replace MathUtil.constrain with the one in NetworkStatsUtils
4. Remove Sets
5. Replace NetworkStack.checkNetworkStackPermission with the
   one in the PermissionUtils
6. Replace internal CollectionUtils with the one in the module
7. Inline ProtoOutputStream(fd)
8. Replace Intent.EXTRA_USER_HANDLE with Intent.EXTRA_USER

Test: atest NetworkStatsSubscriptionsMonitorTest \
      NetworkStatsServiceTest
Bug: 204830222

Change-Id: If06a27b04ad15c29052b670eefc2f6dc0d199420
2022-01-03 15:15:05 +00:00
Les Lee
d9862a4d0c Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" 2022-01-03 12:36:49 +00:00
sandeepjs
6afa68e472 [MEP] eSIM API refactor to support MEP
Newly added UiccPortInfo and UiccSlotMapping classes and introduced
UiccPortInfo as a port list in UiccCardInfo and UiccSlotInfo,
Deprecated some constructors and updated callers.
Test: build
Bug: 159354974
Change-Id: I71e4e1ef649b7301d126dde23d53783761de940f
Merged-In: I71e4e1ef649b7301d126dde23d53783761de940f
2022-01-03 12:12:52 +00:00
Les Lee
6ca5c25bf4 wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key
1. Used SSID to be a wifi network identity can't separate wifi
data usage when there are two different network with same SSID.
Use a new usage key from WifiInfo to replace wifi SSID to solve
this issue.

2. To support to query wifi usage per configured Wifi network.
Adding matchWifiNetworkKeys in NetworkTemplate to support querying
multi networkKeys wifi data usage since each configured Wifi
network configuration might be used to connect different Wifi
network. (Replace mNetworkId with mMatchWifiNetworkKeys)

3. Updated callers who were using NetworkTemplate constructor.

4. Fixed SortedSet null order case. The null subscriberId is a
valid input for matchSubscriberIds.

5. Replaced ArrayUtils with CollectionUtils.

Bug: 197520752
Bug: 126299427
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: atest -c NetworkPolicyManagerServiceTest
Test: atest -c NetworkPolicyTest
Change-Id: Ie20e7fb56597817901be4ce1d2a7afcbc9ded0c6
2022-01-03 15:13:00 +08:00