Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
561,109 Commits 3 Branches 0 Tags
be4020cd097dfd3e7fbff00210e70c470f11682b
Commit Graph

561109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cody Kesting
be4020cd09 Merge changes I03be15d6,Ie1671925,Ie87f4aa3,I24474419,I15bc9aaf am: 6d02108df5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I271653dfbcffcccc49884c8c5ae345c242580abd
 2021-02-04 18:26:09 +00:00
Bill Yi
ed379ba11f [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: e412ab4ec6 -s ours 
am skip reason: Change-Id Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d with SHA-1 ce1b075b2b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf7242bf6f0de5e65252ea085bd3da7766810272
 2021-02-04 18:19:15 +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
Adrian Roos
57dd6872fd Merge changes from topic "nullablecollection" am: 60f3d5cee4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1567165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I754de2bd3b24e9027d6cf9776ea93e611a8e42c7
 2021-02-04 16:23:43 +00:00
Adrian Roos
4da67dd2f6 API: Suppress existing NullableCollections lints am: 6a6aa5e23d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566096

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d47151b7e26e82706f2d94a13c4067fe71fc168
 2021-02-04 16:19:34 +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
e9eab0e148 Merge "Revert the fallback naming into default network" am: 5f36d6f70a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ab54858d6b7f78a51fccb1c8dcfdf1983c572e
 2021-02-04 09:15:55 +00:00
Lorenzo Colitti
a7a6b5187a Merge "Improve getConnectionOwnerUid tests." am: 3695e752ff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28b29f3acbc253e80bfe756ed67e48e4ce81af90
 2021-02-04 09:09:50 +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
a1eb910ead Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: be75db951a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6774b8a1a029dbe34fe7aa8a4af3d94bdc0bb4
 2021-02-04 06:52:05 +00:00
Lucas Lin
be75db951a Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" 2021-02-04 06:12:14 +00:00
Robert Chou
6ae10abbad Merge "Fix data limit notification issue" am: 478bbc1f3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac765a6e3789e6bf8bd523172a61bcfc0aa2d5d
 2021-02-04 05:14:17 +00:00
Robert Chou
478bbc1f3f Merge "Fix data limit notification issue" 2021-02-04 05:03:38 +00:00
Benedict Wong
7d8f1cd5ae Merge "Implement ConnectedState" am: 9a59faa385 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2caa0041eaee3eb5f7c27720484c1413318364e7
 2021-02-04 04:51:28 +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
Treehugger Robot
456a473867 Merge "Add BatteryStats OWNERS to native code" am: 9ecf49ba26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573882

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fe9e49ce090c8558fc80218b65c51ef752ceb1c
 2021-02-04 03:46:14 +00:00
Treehugger Robot
6b55ff4456 Merge "Add/remove user state based off user unlocking" am: 85797196b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief182a280a252187abd50fc68ff11f3bdcc978e2
 2021-02-04 03:36:14 +00: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
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
5c917b8fdf Merge "No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity." am: 5fa55ef1c8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553956

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb4e1456c4e6c93e75f4acc3bec04c76848d985f
 2021-02-04 01:11:14 +00:00
Louis Chang
5fa55ef1c8 Merge "No need to 'addChild' when start 'FLAG_ACTIVITY_CLEAR_TOP' Activity." 2021-02-04 01:09:31 +00:00
Brad Ebinger
a30ce7ea41 Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71d036a1a33aff8097225877bd76c1950156e1bc
 2021-02-04 01:07:16 +00:00
Automerger Merge Worker
f306fb9957 Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master 2021-02-04 01:02:05 +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
Treehugger Robot
0e6db34869 Merge "Adding SimPhonebookContract" am: 110420fcae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d3041404cacf8bd5a269253808efd898d538fe3
 2021-02-04 00:58:32 +00:00
Treehugger Robot
9cfa8e79e0 Merge "Adding SimPhonebookContract" am: 110420fcae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I608d52e517edf7874c79538e8a99e3455cd27e9a
 2021-02-04 00:47:40 +00:00
Rubin Xu
5c04261dac Merge "Add DPM.hasKeyPair()" am: 46915d9a14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I738273da4664a6248f219688d9d90b76a6f04c11
 2021-02-04 00:40:07 +00: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
Treehugger Robot
a42ad625ac Merge "OWNERS for InlineSuggestion* in view/inputmethod" am: 2745c788a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562186

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5055a233152ec44c8bc98561d8736d205c4e5b14
 2021-02-03 23:38:17 +00:00
Anton Hansson
09e7ab4ddb Merge "Update OWNERS to ref existing file" am: c3d4d00270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd30278360b8ad629c5b297b126d882119bb1d33
 2021-02-03 23:24:00 +00:00
Treehugger Robot
f8a276f313 Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8742a4f74a0e5339af6d35f03a2d6173a700680
 2021-02-03 23:00:35 +00:00
Treehugger Robot
acb38137cd Merge "AdvertiseData: fix nullable collection" am: 0f12a22aa6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I568b51ac671aab2e0d5614fb65bdc3cc797268fa
 2021-02-03 22:45:42 +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
Songchun Fan
a184cbd7fb Merge "Fix system_server's main thread name." am: 7fa0e63bc3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06c78cb351f3fed294c28e664e9d337ff97de1fd
 2021-02-03 21:55:27 +00:00
Steven Moreland
5cb323c59e Merge "binder: race condition by parcel finalize" am: 52f933552a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553275

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf3ca22d17f839736dea857ee34ec451b4def685
 2021-02-03 20:59:40 +00:00
Anton Hansson
c3d4d00270 Merge "Update OWNERS to ref existing file" 2021-02-03 19:44:13 +00:00
Treehugger Robot
fbfe84846e Merge "NetworkRegistrationInfo: add Parcel recycle" am: 9b899f7253 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46c1b1f79926e999deec5639c4e2a18f973e854b
 2021-02-03 19:36:06 +00:00
Treehugger Robot
51bf93a35a Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." 2021-02-03 19:34:56 +00:00