Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
564,840 Commits 3 Branches 0 Tags
bf15176edffb0fa087089e94393e3371ff598ffe
Commit Graph

564840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
bf15176edf Merge "Improve getConnectionOwnerUid tests." am: 3695e752ff am: a7a6b5187a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82e9db5a466e6a40eaa92dfe45ed29447641d8e5
 2021-02-04 09:48:08 +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
Lorenzo Colitti
3695e752ff Merge "Improve getConnectionOwnerUid tests." 2021-02-04 08:22:03 +00:00
Lucas Lin
6e81f01538 Merge "Reimplement [read|write]ArraySet of Parcel inside NetworkCapabilities" am: be75db951a am: a1eb910ead 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f337c1439d757dea60e91c8b182c3eb77633030
 2021-02-04 07:46:57 +00:00
TreeHugger Robot
77ba287065 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev am: 82c672dff6 -s ours 
am skip reason: Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 75dec29090 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I053b05625069920a308a0ec96cf34641644beffe
 2021-02-04 07:45:47 +00:00
TreeHugger Robot
82c672dff6 Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev 
* changes:
  Fix legacy APIs when VPN switches to suspended underlying network.
  Backport test coverage from aosp/1547496.
  Backport some helpers in ConnectivityServiceTest.
  Test for bugs with suspended VPN underlying networks.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Improve testing of CONNECTIVITY_ACTION broadcasts.
  Test passing an underlying network array with null network in it.
  Make testVpnNetworkActive more deterministic.
  Make MockVpn more realistic and easier to use.
  Increase test coverage for VPN info sent to NetworkStatsService.
  Simplify MockVpn.
  Test a VPN with an underlying network that does not yet exist.
 2021-02-04 07:01:55 +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
d00e50549b Merge "Fix data limit notification issue" am: 478bbc1f3f am: 6ae10abbad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532900

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c114c0f70e48d5a14b38a680f604aa49f89dd74
 2021-02-04 05:23:17 +00:00
Benedict Wong
ba464802b7 Merge "Implement ConnectedState" am: 9a59faa385 am: 7d8f1cd5ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550525

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa3e7e53814477d7c53dffdcad8daadac06de135
 2021-02-04 01:28:51 +00:00
Brad Ebinger
5bbee4a0bb Merge "Define FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION feature" am: 8cb6d95803 am: a30ce7ea41 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564832

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If16559974e91b7d231485b8e73416289f629a553
 2021-02-04 01:28:37 +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
Automerger Merge Worker
407c766a8b Merge "Merge "Adding SimPhonebookContract" am: 110420fcae" into stage-aosp-master am: f306fb9957 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I111571106bafdec70611968c932030e200624058
 2021-02-04 01:10:06 +00:00
Treehugger Robot
60be88bbd4 Merge "Adding SimPhonebookContract" am: 110420fcae am: 0e6db34869 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1521063

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03c972947b7cf8a4b57d326db196b8fe3f122d4c
 2021-02-04 01:09:50 +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
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
Rubin Xu
a73c1787f3 Merge "Add DPM.hasKeyPair()" am: 46915d9a14 am: 5c04261dac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549394

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58f9d4a93709ffe0013e0fadd27d991a75c77605
 2021-02-04 00:53:50 +00:00
Evan Laird
5eea1f904c DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 am: bc878b6a4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c009ee37657466cc94974af0331d922aa413279
 2021-02-04 00:40:33 +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
Anton Hansson
8ced652a53 Merge "Update OWNERS to ref existing file" am: c3d4d00270 am: 09e7ab4ddb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d56847ec40e60c040a17296d3cc5f18fd3d106e
 2021-02-04 00:40:04 +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
Evan Laird
bc878b6a4d DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1e59e74decf4453eb0489bbc7139032b9e0387c
 2021-02-04 00:24:25 +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
da743b68a4 Merge "Keystore 2.0: isKeystore2Enabled returned wrong value." am: 51bf93a35a am: f8a276f313 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572822

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6747d8a5e2341338d3e0f71692876bf183609b3a
 2021-02-03 22:57:02 +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