Commit Graph

560406 Commits

Author SHA1 Message Date
Rambo Wang
6dd150461b SignalStrengthUpdateRequest#getLiveToken should not be in current.txt
A missing asterisk in the javadoc causes the hidden API leak into current.txt

Bug: 180395362
Test: make update-api && make; // and double check manually
Change-Id: If86208136fb7402b132c62fa2caad4df3366e8d9
2021-02-24 18:47:25 +00:00
Treehugger Robot
de246e1658 Merge changes If58d648d,Iec51a349
* changes:
  Add persistence for app hibernation states
  Move AppHibernationServices dependencies to injector
2021-02-04 20:18:07 +00:00
Seigo Nonaka
eff415e780 Merge "Update OWNERS file for font files in FrameworksCoreTests" 2021-02-04 19:57:14 +00:00
Treehugger Robot
ac598696b4 Merge "Avoid ellipsis character in documentation." 2021-02-04 18:41:35 +00:00
Treehugger Robot
4a3d05551a Merge "Add tests/UpdatableSystemFontTest/OWNERS." 2021-02-04 17:15:59 +00:00
Cody Kesting
6d02108df5 Merge changes I03be15d6,Ie1671925,Ie87f4aa3,I24474419,I15bc9aaf
* changes:
  Fix test method naming in VcnManagementServiceTest.
  Fix field order for UnderlyingNetworkTracker.
  Notify PolicyListeners to refresh their policy on VCN changes.
  Unit test TelephonySubscriptionSnapshot changes for VCNs.
  Notify UnderlyingNetworkTracker for Subscription changes.
2021-02-04 17:14:57 +00:00
Bill Yi
e412ab4ec6 Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" 2021-02-04 17:08:41 +00:00
Donald Chai
b4d25b8547 Avoid ellipsis character in documentation.
Renders as "?" on https://developer.android.com/reference/android/view/FrameMetrics, as if someone was unsure?

Change-Id: I4de9b99282480f1107bd8c3e387781775de9326c
2021-02-04 17:05:44 +00:00
Adrian Roos
60f3d5cee4 Merge changes from topic "nullablecollection"
* changes:
  API: Suppress existing NullableCollections lints (TaskOrganizer)
  API: Suppress existing NullableCollections lints
2021-02-04 15:53:34 +00:00
Treehugger Robot
5f36d6f70a Merge "Revert the fallback naming into default network" 2021-02-04 08:48:21 +00:00
Lorenzo Colitti
3695e752ff Merge "Improve getConnectionOwnerUid tests." 2021-02-04 08:22:03 +00:00
Lucas Lin
be75db951a Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" 2021-02-04 06:12:14 +00:00
Robert Chou
478bbc1f3f Merge "Fix data limit notification issue" 2021-02-04 05:03:38 +00:00
Cody Kesting
f5915a7f3a Fix test method naming in VcnManagementServiceTest.
Bug: 175914059
Test: atest FrameworksVcnTests
Change-Id: I03be15d63adfccc357000ee670e373d0359a3c06
2021-02-03 20:28:51 -08:00
Cody Kesting
ed2dfc9d68 Fix field order for UnderlyingNetworkTracker.
Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: Ie1671925ab0427d47020673cca7c889bff8b6a8a
2021-02-03 20:28:51 -08:00
Cody Kesting
26409bfe5d Notify PolicyListeners to refresh their policy on VCN changes.
This CL updates VcnManagementService to notify all registered
VcnUnderlyingNetworkPolicyListeners to refresh their
UnderlyingNetworkPolicy when any VCN is added or removed.

Bug: 175914059
Test: atest FrameworksVcnTests
Change-Id: Ie87f4aa3401c6c4ba9f932130a1d475e35f59d4e
2021-02-03 20:28:51 -08:00
Cody Kesting
50e9bf04aa Unit test TelephonySubscriptionSnapshot changes for VCNs.
This CL adds unit testing for TelephonySubscriptionSnapshot updates in
UnderlyingNetworkTracker, Vcn, and VcnManagementService.

Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: I244744194a1360c7c7dee062a302e04f9b5efc32
2021-02-03 20:28:43 -08:00
Lorenzo Colitti
b7e9f5b1ca Improve getConnectionOwnerUid tests.
Currently, the tests only check whether the method throws a
SecurityException or not. Also check the return value of the
call, by mocking out InetDiagMessage.getConnectionOwnerUid.

This is required to test an upcoming change that will never
throw SecurityException but always return INVALID_UID if the
caller lacks permissions.

Bug: 173331190
Test: test-only change
Change-Id: I63f42a2f098fcf8796c9b4525a3a7b8320c0a139
2021-02-04 04:19:28 +00:00
Chalard Jean
92618c435e Revert the fallback naming into default network
There is strong opposition in the team to this rename.
Reverting to the old language.

Test: FrameworksNetTests
Change-Id: Icefa3090966c07fd66692ddd5b44dfc94485a914
2021-02-04 13:14:05 +09:00
Cody Kesting
2b0754517c Notify UnderlyingNetworkTracker for Subscription changes.
This CL updates VcnManagementService to notify active VCNs when it is
notified of subscription changes by TelephonySubscriptionTracker. These
subscription changes are passed down to each VCN's
UnderlyingNetworkTracker, which determines whether it needs to register
or unregister bringup NetworkRequests based on subIds within that VCN's
Subscription Group.

Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: I15bc9aaf3d5f97046d0ce9fcf1e12c9b1e0e1446
2021-02-03 19:04:01 -08:00
Benedict Wong
9a59faa385 Merge "Implement ConnectedState" 2021-02-04 02:58:09 +00:00
Treehugger Robot
9ecf49ba26 Merge "Add BatteryStats OWNERS to native code" 2021-02-04 02:52:04 +00:00
Kevin Han
dba83c49dd Add persistence for app hibernation states
Persist hibernation states to disk. This CL persists the user-level
and global hibernation states to disk.

Bug: 175829330
Test: atest AppHibernationServiceTest
Test: atest HibernationStateDiskStoreTest
Change-Id: If58d648d720bed1693b9346c4d0e85074daec931
2021-02-03 18:17:25 -08:00
Kevin Han
6669dec038 Move AppHibernationServices dependencies to injector
Similar to other system services, we move AppHibernationService's
dependencies to an injector class that can be mocked for testing so that
we minimize side-effects in unit tests

Also, add @GuardedBy annotations instead of having an L at the end of
method names since this is exactly what the annotation is for.

Bug: 175829330
Test: atest AppHibernationServiceTest
Change-Id: Iec51a349ff898923bacf6040c3ebccefa8831a68
2021-02-03 18:13:34 -08:00
Treehugger Robot
85797196b4 Merge "Add/remove user state based off user unlocking" 2021-02-04 02:05:28 +00:00
Benjamin Schwartz
e954a703ed Add BatteryStats OWNERS to native code
Bug: 173132005
Test: NA
Change-Id: Ic32489ac9a222a371681b288d7fd3a34ddff9530
2021-02-03 17:13:12 -08:00
Louis Chang
5fa55ef1c8 Merge "No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity." 2021-02-04 01:09:31 +00:00
Bill Yi
46b48bcc66 Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
Merged-In: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
Merged-In: I2cb57c40fd5679dbd710396f3c69deafbac9d1c3
Change-Id: Ibfd6d85bda975aaa274be9e98e197de048d178ac
2021-02-03 17:01:38 -08:00
Brad Ebinger
8cb6d95803 Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" 2021-02-04 00:38:15 +00:00
Treehugger Robot
110420fcae Merge "Adding SimPhonebookContract" 2021-02-04 00:33:51 +00:00
Rubin Xu
46915d9a14 Merge "Add DPM.hasKeyPair()" 2021-02-03 22:35:41 +00:00
Treehugger Robot
2745c788a0 Merge "OWNERS for InlineSuggestion* in view/inputmethod" 2021-02-03 22:14:04 +00:00
Seigo Nonaka
bd4d43b1b7 Update OWNERS file for font files in FrameworksCoreTests
Bug: N/A
Test: N/A
Change-Id: Iaf764a2fcff1348f2e9a4c51dab9c7e6c5a8c4d0
2021-02-03 11:59:02 -08:00
Anton Hansson
c3d4d00270 Merge "Update OWNERS to ref existing file" 2021-02-03 19:44:13 +00:00
Treehugger Robot
51bf93a35a Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." 2021-02-03 19:34:56 +00:00
Treehugger Robot
0f12a22aa6 Merge "AdvertiseData: fix nullable collection" 2021-02-03 19:10:59 +00:00
Songchun Fan
7fa0e63bc3 Merge "Fix system_server's main thread name." 2021-02-03 18:54:01 +00:00
jiangyou li
0a79ec1972 Fix system_server's main thread name.
When BinderIncrementalService start, it call ps->giveThreadPoolName() change the thread name to Binder:%d_%X.
However BinderIncrementalService run in system_serve main thread, it need not change the thread name.

BUG: 171354331
Test: adb shell ps -T [pid]
check the main thread name of system_server

Change-Id: I53fc6e096cae78798bb0a2670dcf2d8b4da3f5b6
2021-02-03 18:49:52 +00:00
Steven Moreland
52f933552a Merge "binder: race condition by parcel finalize" 2021-02-03 18:46:50 +00:00
Treehugger Robot
9b899f7253 Merge "NetworkRegistrationInfo: add Parcel recycle" 2021-02-03 18:31:07 +00:00
Benedict Wong
539ba24df4 Implement ConnectedState
This change implements the Connected state, ensuring that relevant
capabilities are mirrored from the underlying networks.

Bug: 165827287
Test: atest FrameworksVcnTests
Change-Id: Iedf6d879b4577d7efd40cce41cc1d5fd5021124f
2021-02-03 10:26:36 -08:00
Henry Fang
59349e6d71 Merge "TvInputHardwareManager: always try patch recreate if null" 2021-02-03 18:16:01 +00:00
Janis Danisevskis
e359de094e Keystore 2.0: isKeystore2Enabled returned wrong value.
Test: Keystore 2.0 is used by certain system apps (Settings, Keychain)
      when enabled.
Change-Id: Idc3f27577df684561d403047a1e611bdc1350409
2021-02-03 08:44:14 -08:00
Treehugger Robot
892c82e0f2 Merge changes from topic "limited_use_keys"
* changes:
  Add limited use keys related API into Keystore 2.0 SPI.
  Limited use key: feature flags.
2021-02-03 16:42:01 +00:00
Jeff Sharkey
752040bead Merge "Add core notifications team as owners of internal notification widgets." 2021-02-03 14:49:54 +00:00
Lorenzo Colitti
708c77d236 Merge changes Ifa2aa335,I09366a7f
* changes:
  Allow setting underlying networks when legacy lockdown enabled.
  Allow passing the underlying network to startLegacyVpn.
2021-02-03 14:07:44 +00:00
Lorenzo Colitti
104426a03b Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" 2021-02-03 13:05:35 +00:00
Lorenzo Colitti
559ba25636 Allow setting underlying networks when legacy lockdown enabled.
Currently, if a legacy lockdown VPN is up, no VPN can set
underlying networks. This does not make much sense.

When legacy lockdown VPN is enabled, no other VPN is allowed to
call prepare() or establish(), so no other VPN can connect, and
if no VPN can connect, then no VPN can set underlying networks.
Therefore, disabling the ability to set underlying networks only
affects the legacy lockdown VPN itself.

This change is necessary because in a future CL, the legacy
lockdown VPN will start to inform ConnectivityService of its
underlying network.

Bug: 173331190
Test: tests in subsequent CLs in stack
Change-Id: Ifa2aa3351c2c8324571f96fda151864ed987ed5a
2021-02-03 19:04:17 +09:00
Lorenzo Colitti
00aa2977b4 Allow passing the underlying network to startLegacyVpn.
This will be used by a future change that makes the legacy
lockdown VPN pass the underlying network.

Bug: 173331190
Test: tests in subsequent CLs in stack
Change-Id: I09366a7f872ef3d4538962a75b0114a2ecb536e6
2021-02-03 19:03:53 +09:00
Junyu Lai
f6c7f61d27 Merge "[FUI21] Move scrubSubscriberId to utils class" 2021-02-03 08:52:17 +00:00