Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
685,133 Commits 3 Branches 0 Tags
ccde8cf7be40698d36c8cf8ea2afc41cbe3a35fd
Commit Graph

685133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
ccde8cf7be Merge "Delete NetworkStatsFactoryBenchmark" am: 26de69ea34 am: c9a9de1777 am: 6d84b81ece 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976231

Change-Id: I6cdfc54a8b8a83afddfb907f2d0edf3de1f17e10
 2022-02-09 11:38:34 +00:00
Treehugger Robot
6d84b81ece Merge "Delete NetworkStatsFactoryBenchmark" am: 26de69ea34 am: c9a9de1777 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976231

Change-Id: Iafa88ae2bff1cc4548ee0a0570049979f25b0952
 2022-02-09 11:26:59 +00:00
Treehugger Robot
c9a9de1777 Merge "Delete NetworkStatsFactoryBenchmark" am: 26de69ea34 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976231

Change-Id: I67279a44d2d12b1945fea909ca6db1eb3185d396
 2022-02-09 11:10:37 +00:00
Junyu Lai
516956cda7 Merge "[MS53] Add connectivity aidl exports to stubs" am: e616cb6779 am: f7f4c4c996 am: 5202e61448 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976230

Change-Id: If317fe89f93aefd9906c989b405fc8f1654cf1eb
 2022-02-09 11:02:07 +00:00
Treehugger Robot
51f99dbc73 Merge "Create framework-connectivity shared filegroup" am: 87050dde70 am: 7fde212050 am: 7ed3d9833a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976233

Change-Id: Ib5d40903a347ece16459baf38661ad4c2663e8bf
 2022-02-09 11:01:12 +00:00
Treehugger Robot
26de69ea34 Merge "Delete NetworkStatsFactoryBenchmark" 2022-02-09 10:48:40 +00:00
Junyu Lai
5202e61448 Merge "[MS53] Add connectivity aidl exports to stubs" am: e616cb6779 am: f7f4c4c996 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976230

Change-Id: I2123fddf69b8ea77a7f00c35b38f08d89980127e
 2022-02-09 10:41:43 +00:00
Treehugger Robot
7ed3d9833a Merge "Create framework-connectivity shared filegroup" am: 87050dde70 am: 7fde212050 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976233

Change-Id: I5d810f79131f0d4102a9bbe7174aac18d9a2a1b0
 2022-02-09 10:41:17 +00:00
Junyu Lai
f7f4c4c996 Merge "[MS53] Add connectivity aidl exports to stubs" am: e616cb6779 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976230

Change-Id: I0ee4b083fec89aafb86ac3b0860edecb17b61c58
 2022-02-09 10:25:13 +00:00
Ken Chen
d13163b7a5 Merge "Add system_server to net_admin group" am: f584f880ab am: 0cd6e77d0e am: 18a04ccda5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978086

Change-Id: Iee69ac1cace716b3fa457518db7c97b9a7731285
 2022-02-09 10:24:30 +00:00
Treehugger Robot
7fde212050 Merge "Create framework-connectivity shared filegroup" am: 87050dde70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976233

Change-Id: Iac9a318c4926b7ee2fc20ccb289b4f055e955aa9
 2022-02-09 10:24:12 +00:00
Junyu Lai
6f75728408 Merge "Remove @hide usage in DataUsageUtilsTest" am: 39c30b8546 am: f0d6757404 am: b6bdb02b97 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976232

Change-Id: I4b4116c940c485d1f0110ff9ac2082b28f4ca659
 2022-02-09 10:24:11 +00:00
Ken Chen
18a04ccda5 Merge "Add system_server to net_admin group" am: f584f880ab am: 0cd6e77d0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978086

Change-Id: Ied6448fb2f73d8867463357d6eacc7fbe00ddaea
 2022-02-09 10:12:53 +00:00
Junyu Lai
b6bdb02b97 Merge "Remove @hide usage in DataUsageUtilsTest" am: 39c30b8546 am: f0d6757404 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976232

Change-Id: I4eb14d6d898406af4390db2389ef60f56dc39444
 2022-02-09 10:12:25 +00:00
Junyu Lai
e616cb6779 Merge "[MS53] Add connectivity aidl exports to stubs" 2022-02-09 10:02:53 +00:00
Treehugger Robot
87050dde70 Merge "Create framework-connectivity shared filegroup" 2022-02-09 10:02:33 +00:00
Ken Chen
0cd6e77d0e Merge "Add system_server to net_admin group" am: f584f880ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978086

Change-Id: Ib31801f005d3130f6fa024885788effae49b1759
 2022-02-09 09:56:00 +00:00
Junyu Lai
f0d6757404 Merge "Remove @hide usage in DataUsageUtilsTest" am: 39c30b8546 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976232

Change-Id: Ifbaf98e28e8728be7fa4417abebcab1d4df4bff4
 2022-02-09 09:55:37 +00:00
TreeHugger Robot
e626fab725 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-dev am: 5cf8597a1f am: a03eeb9665 -s ours am: 1b6154a3f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I740caa0f48a88475c945d192655593b3cbf6fb76
 2022-02-09 09:45:47 +00:00
Jeff Chang
9b7b883b5e [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03 am: 0281b203d8 -s ours am: ec48831016 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3535e4b8928b2db0271ad98e48c2b84de6d91121
 2022-02-09 09:45:27 +00:00
TreeHugger Robot
83966a395d [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-dev am: 5cf8597a1f am: a03eeb9665 am: 577e37735b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f186fdf80b00f3d10d216c7f9efe04f3482d8d4
 2022-02-09 09:44:53 +00:00
Jeff Chang
d43a5c622a [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03 am: 0281b203d8 am: 4436955d35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie14b8ad69433dc33d212bdfa1dd69fb329fa13a0
 2022-02-09 09:44:41 +00:00
Ken Chen
f584f880ab Merge "Add system_server to net_admin group" 2022-02-09 09:42:29 +00:00
Junyu Lai
39c30b8546 Merge "Remove @hide usage in DataUsageUtilsTest" 2022-02-09 09:30:37 +00:00
TreeHugger Robot
577e37735b Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-dev am: 5cf8597a1f am: a03eeb9665 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I674d538edf02c2c0026878ce9b994e101f28e828
 2022-02-09 09:26:54 +00:00
TreeHugger Robot
1b6154a3f9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-dev am: 5cf8597a1f am: a03eeb9665 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbe3d5896299596fe9a5821a8e325edfa96e2f74
 2022-02-09 09:26:40 +00:00
Jeff Chang
ec48831016 [automerger skipped] [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03 am: 0281b203d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74943e591e026ba239b3e2172a33670cbea5d13c
 2022-02-09 09:26:33 +00:00
Jeff Chang
4436955d35 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03 am: 0281b203d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I9833001187073a9a148690e34c0960fc687a6022
 2022-02-09 09:26:33 +00:00
TreeHugger Robot
a03eeb9665 Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-dev am: 5cf8597a1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I97bc047bea0531fdd1e6077713f4cac709ff0d8c
 2022-02-09 09:09:10 +00:00
Jeff Chang
0281b203d8 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I36a91c0de0d6a072f930277c0f235177b7822d33
 2022-02-09 09:09:08 +00:00
TreeHugger Robot
5cf8597a1f Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-dev 2022-02-09 08:54:25 +00:00
TreeHugger Robot
79120c92af Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-v2-dev am: 103efafe76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16742068

Change-Id: I33c779493f88a60bf395b1236413039e1a112e33
 2022-02-09 08:46:12 +00:00
Jeff Chang
aa0349bc78 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: f36b7b9f80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16742068

Change-Id: I32f44bfc27e8086a2937112851989c1160877b39
 2022-02-09 08:45:52 +00:00
TreeHugger Robot
103efafe76 Merge "[RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity" into sc-v2-dev 2022-02-09 08:28:02 +00:00
Treehugger Robot
6df12a625b Merge "Update VPN event strings for the IKE lib update" am: 5e7da1cfc4 am: 09831a1aaa am: e4e049c4f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976226

Change-Id: Iecb6a937a920b73bbaf892136c03adc155ae5489
 2022-02-09 07:03:19 +00:00
Treehugger Robot
c96b2e4fea Merge "Fix BatteryStats counts foreground activity time." am: 982daf25b8 am: 96d22e94c0 am: 523aa85575 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958912

Change-Id: I9491607be039afdde63712966f52ad71c4d0778d
 2022-02-09 07:03:05 +00:00
Treehugger Robot
e4e049c4f9 Merge "Update VPN event strings for the IKE lib update" am: 5e7da1cfc4 am: 09831a1aaa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976226

Change-Id: Id3fbe9b60bfc67c4e0ce2dbfb1f24979dddf730f
 2022-02-09 06:58:01 +00:00
Treehugger Robot
523aa85575 Merge "Fix BatteryStats counts foreground activity time." am: 982daf25b8 am: 96d22e94c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958912

Change-Id: I97a93591408ee7efe9c587743f0c3d20da26dc47
 2022-02-09 06:57:25 +00:00
Jean Chalard
aac1b3a307 Merge "Allow VPN apps to ask for running the validation checks" am: cbb2fa2f00 am: 64ba50411e am: 1f929d9bd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962928

Change-Id: Ie35764f5a4d7f9c1d3765a73331687450bbdbaf5
 2022-02-09 06:56:37 +00:00
Treehugger Robot
09831a1aaa Merge "Update VPN event strings for the IKE lib update" am: 5e7da1cfc4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976226

Change-Id: Ib83a61d746d318b3a0956076431882aa5dda2f29
 2022-02-09 06:44:23 +00:00
Treehugger Robot
96d22e94c0 Merge "Fix BatteryStats counts foreground activity time." am: 982daf25b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958912

Change-Id: Iff15e0f1ddadcc6eae16962bb82197d8db5bc894
 2022-02-09 06:43:56 +00:00
Jean Chalard
1f929d9bd5 Merge "Allow VPN apps to ask for running the validation checks" am: cbb2fa2f00 am: 64ba50411e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962928

Change-Id: I8dcb813cfe589411da7345bc2c4308e9f149b275
 2022-02-09 06:38:31 +00:00
Treehugger Robot
5e7da1cfc4 Merge "Update VPN event strings for the IKE lib update" 2022-02-09 06:28:39 +00:00
Treehugger Robot
982daf25b8 Merge "Fix BatteryStats counts foreground activity time." 2022-02-09 06:27:17 +00:00
Lang Yu
19758a38a4 Fix BatteryStats counts foreground activity time. 
When an application crashes or ANRs in the foreground, or when the
application actively commits suicide in the foreground. It is often
impossible to switch to the PAUSED state of ActivityRecord. At this
time, the Timer in BatteryStats cannot be terminated, and it will keep
timing, which will eventually lead to errors in foreground activity time
statistics. So we'll settle in the handleAppDied function to fix that.

Bug: 208355716
Change-Id: I23baf545105e0bb9322dc4a1702e38e0ef825c53
Signed-off-by: unknown <80264454@adc.com>
 2022-02-09 06:24:58 +00:00
Jean Chalard
64ba50411e Merge "Allow VPN apps to ask for running the validation checks" am: cbb2fa2f00 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962928

Change-Id: I0ffa00f03915d7fa1c213ddb44c7221cea8d4a85
 2022-02-09 06:21:50 +00:00
Jean Chalard
cbb2fa2f00 Merge "Allow VPN apps to ask for running the validation checks" 2022-02-09 06:03:45 +00:00
Thiébaud Weksteen
1570345144 Merge "Migrate DynamicSystemService to @EnforcePermission" am: b845dbac21 am: 746cfb436c am: 3dd695c244 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946229

Change-Id: I0f7b30c9241ddf67357ecd65d3997c1bdd579e0b
 2022-02-09 05:59:59 +00:00
Thiébaud Weksteen
3dd695c244 Merge "Migrate DynamicSystemService to @EnforcePermission" am: b845dbac21 am: 746cfb436c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946229

Change-Id: I96011a6182972ca0e4faf66413139ea3abf0aeab
 2022-02-09 05:49:56 +00:00
Thiébaud Weksteen
746cfb436c Merge "Migrate DynamicSystemService to @EnforcePermission" am: b845dbac21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946229

Change-Id: If384a009855a7d26bf4f7bc429f250c351dd5501
 2022-02-09 05:34:02 +00:00