Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
647,827 Commits 3 Branches 0 Tags
6019a35fc679bbb259432b99cfd9cb0e788ef49c
Commit Graph

647827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6019a35fc6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 19:44:14 +00:00
TreeHugger Robot
080cd817fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 19:42:55 +00:00
TreeHugger Robot
beae842943 Merge "Add step down ramp to vibration waveforms" into sc-dev am: 50471a76f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15143497

Change-Id: I53c304413148388aef750aa9f17d44a99133ae21
 2021-06-30 19:18:35 +00:00
TreeHugger Robot
50471a76f9 Merge "Add step down ramp to vibration waveforms" into sc-dev 2021-06-30 19:16:15 +00:00
Matt Pietal
1bf2ef8d81 Merge "PIN bouncer - basic landscape support" into sc-dev am: 83f94d4910 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15094202

Change-Id: I331e5eafdf19ba1aaff970d08e024995300cfc3c
 2021-06-30 19:13:41 +00:00
Yi Jiang
d11dbe5c2d Merge "Don't cancel the previous request if it's fulfilled." into sc-dev am: 792a32cbc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15132413

Change-Id: I83c11715a9dccc471315f3acb8cb7f13346d8f3e
 2021-06-30 19:13:20 +00:00
Dmitri Plotnikov
f65cbbbe42 Merge "Fix boot time BatteryStats reset failure" into sc-dev am: ebf77ebc51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15128655

Change-Id: Ic6603505265ed644c72a5042fc30011ea1fbd149
 2021-06-30 19:12:49 +00:00
Matt Pietal
83f94d4910 Merge "PIN bouncer - basic landscape support" into sc-dev 2021-06-30 19:05:20 +00:00
Yi Jiang
792a32cbc7 Merge "Don't cancel the previous request if it's fulfilled." into sc-dev 2021-06-30 18:59:23 +00:00
Dmitri Plotnikov
ebf77ebc51 Merge "Fix boot time BatteryStats reset failure" into sc-dev 2021-06-30 18:53:20 +00:00
TreeHugger Robot
5e26f746c1 Merge "Pause watchdog monitor for incfs native lib extraction" into sc-dev am: 920e1fd7a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15147287

Change-Id: I91744e9e4b80a73f5831270251a119c49f03e230
 2021-06-30 18:27:44 +00:00
Bill Yi
401504cd85 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8cb5cb3f6069246bdfa645a1a079cb503d3e139b
 2021-06-30 18:19:01 +00:00
Bill Yi
47c79280db Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0ed984dbfb454ec6d63bf3081f42b7eed11b34b1
 2021-06-30 18:14:54 +00:00
TreeHugger Robot
920e1fd7a6 Merge "Pause watchdog monitor for incfs native lib extraction" into sc-dev 2021-06-30 18:10:28 +00:00
Matt Pietal
d6799c7be8 Merge "Controls popup background" into sc-dev am: 7110940ef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15155378

Change-Id: I7e7f5d881e899061dce7e95c7f68bebb8932fff2
 2021-06-30 17:58:16 +00:00
Silin Huang
fa29d8db06 Merge "Fix a crash that QAW controller uses background executor." into sc-dev am: 106ba7ce26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156862

Change-Id: Ic9795c4f974a2def946a72f1951ec296266a3bca
 2021-06-30 17:58:00 +00:00
Matt Pietal
7110940ef4 Merge "Controls popup background" into sc-dev 2021-06-30 17:54:15 +00:00
Silin Huang
106ba7ce26 Merge "Fix a crash that QAW controller uses background executor." into sc-dev 2021-06-30 17:49:38 +00:00
TreeHugger Robot
73101576c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 29f8b61809 -s ours am: 2b14293952 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b7bc153afec6b716fdfdc9489bfa630e40de70f
 2021-06-30 17:43:15 +00:00
Songchun Fan
d3e9ec0d61 Merge "[SettingsProvider] move getCallingPackage() outside of lock" into sc-dev am: c1baf3e115 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15147049

Change-Id: Id9c1f2c8beb192f1cad747f2bd8e34e5967a559b
 2021-06-30 17:43:07 +00:00
Miranda Kephart
4e79e8c420 Merge "Turn off screenshot transition into long screenshots for rotations" into sc-dev am: aa1b081a72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142005

Change-Id: Idfc30f529e828434f8f5e020e728a218caf6643a
 2021-06-30 17:42:27 +00:00
TreeHugger Robot
2b14293952 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 29f8b61809 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb37a0c6914f9e8d804cbbe81a15268a542d2616
 2021-06-30 17:41:55 +00:00
Songchun Fan
c1baf3e115 Merge "[SettingsProvider] move getCallingPackage() outside of lock" into sc-dev 2021-06-30 17:41:38 +00:00
TreeHugger Robot
29f8b61809 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 17:28:53 +00:00
Miranda Kephart
aa1b081a72 Merge "Turn off screenshot transition into long screenshots for rotations" into sc-dev 2021-06-30 17:27:31 +00:00
Dmitri Plotnikov
bcd46f1ed4 Fix boot time BatteryStats reset failure 
We need some services to create a battery stats snapshot
captured at the time of battery reset.
The issue is that if the battery stats reset occurs during boot,
before the system is ready, those services may not be prepared.

The fix is to postpone battery stats reset until after the
system server is ready.

Also, we will now reset the stats if battery got partially charged
and discharged repeatedly without ever reaching the full charge.
This will prevent battery sessions from going on forever and
overflowing internal data structures.

This CL partially reverts 0ed84f1263

Bug: 192252233
Test: run PowerOnOffTest#testPowerOnOff repeatedly
Change-Id: Ib486e4caeeac7c933288c3a1055259c05f45c6c8
 2021-06-30 17:07:58 +00:00
Joe Bolinger
79450d4283 Merge "Execute show overlay method immediatly." into sc-dev am: 7aafe8e0d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15137677

Change-Id: If065fd32ac4fc59bddfbb36222f520ad95f9e7b9
 2021-06-30 17:00:46 +00:00
Joe Bolinger
7aafe8e0d1 Merge "Execute show overlay method immediatly." into sc-dev 2021-06-30 16:57:16 +00:00
Flavio Fiszman
e4532ec24d Merge "Add cake background to upcoming birthday status" into sc-dev am: 227707f1aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15118518

Change-Id: I566cb04057ecf214678f544b744a55cded18a83e
 2021-06-30 16:48:31 +00:00
Mady Mellor
adeb2a4e08 Merge "Fix flaky/broken test" into sc-dev am: d92b19cead 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15149171

Change-Id: I7d9817b86786203ae85faee753835eb0cc19fed9
 2021-06-30 16:48:25 +00:00
Flavio Fiszman
227707f1aa Merge "Add cake background to upcoming birthday status" into sc-dev 2021-06-30 16:44:57 +00:00
Mady Mellor
d92b19cead Merge "Fix flaky/broken test" into sc-dev 2021-06-30 16:44:41 +00:00
Tom Natan
6544dd4c08 Merge "Add support for setProperties in TestableDeviceConfig" into sc-v2-dev 2021-06-30 16:41:22 +00:00
Lucas Dupin
0730daf09c Merge "Draw ripple effect in a circle to reduce overdraw" into sc-dev am: 49ffc85c56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15139261

Change-Id: I74b353872973c43268421aeec587333ba58ffcf4
 2021-06-30 16:39:39 +00:00
Lucas Dupin
49ffc85c56 Merge "Draw ripple effect in a circle to reduce overdraw" into sc-dev 2021-06-30 16:34:47 +00:00
Vadim Caen
f5c3ec4b9f Merge "Add support for the DeviceConfig exception list" into sc-dev am: 4ac1b0851d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920933

Change-Id: Ic68ab5e341e93d73c5147d9c669e1fcabf7c2b93
 2021-06-30 16:29:42 +00:00
Issei Suzuki
8d7e1c5ec9 Merge "Remove stopped activity from UnknownAppVisibilityController." into sc-dev am: 33dfa7446f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114538

Change-Id: I497db48c20600b837d382afc8a7bd0d16d278550
 2021-06-30 16:29:24 +00:00
Bernardo Rufino
eb2998459e [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: 159542ac4f -s ours am: fe08620ac7 -s ours 
am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 14c1c7b4a7 is already in history

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

Change-Id: I98c4af1ca595c1328b0854fa0ff7ed02b85d757a
 2021-06-30 16:29:17 +00:00
John Reck
e6a34680ec Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 am: 2e440eb0a8 am: 92ed82502c am: 454c79f710 am: 9ed0a05460 am: babf7fabc3 am: f1d8c72d2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: Ie7227b340c991be3d8dba3000be87933feed7944
 2021-06-30 16:29:07 +00:00
Dmitry Dementyev
b0910a25a3 Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e am: 1d8503c538 am: 44c434d747 am: a1df427adb am: ebb7d92994 am: 2818394b07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: I9fa64d45d37c9d0953b6228154f7961a9fef7f0a
 2021-06-30 16:28:51 +00:00
John Reck
408368f25f Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5 am: 4c548ab470 am: 6416281478 am: 1b692301be am: 92bb88ab7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880619

Change-Id: Id8f2ca19d294ecce4a1d8fd1c6ae57b18ca0adb9
 2021-06-30 16:28:39 +00:00
TreeHugger Robot
984f061e2e [automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into oc-mr1-dev am: 075e4bbbb2 -s ours am: cbe9be1eec -s ours am: 7253e1ee9f -s ours am: da74491fd9 -s ours am: ccc41f4457 -s ours am: 21b7dae4c4 -s ours am: 544f54cd29 -s ours 
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 49be6ee46a is already in history

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

Change-Id: I624185dee95a05f4542087bb94793f1c19eba724
 2021-06-30 16:28:22 +00:00
Bernardo Rufino
7926027ebf [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: ccdf929a26 -s ours am: c9c77fdd22 -s ours 
am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 5fbeff59df is already in history

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

Change-Id: If28f7027bc7e163df4571fe98fa2bdfa1a95271e
 2021-06-30 16:28:07 +00:00
John Reck
0a37b6aa11 Merge "Fix a potential thread safety issue in VectorDrawable" into oc-mr1-dev am: 61cf6455f2 am: 2e440eb0a8 am: 92ed82502c am: 454c79f710 am: 9ed0a05460 am: 06254a7b88 am: 4c7ddfbef4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: I8028a562a8f798ce0af4c9948578a102595e49b0
 2021-06-30 16:27:49 +00:00
Automerger Merge Worker
a342dd088a Merge "Merge "Change ownership of the account request notification." into oc-mr1-dev am: aaccd1b152 am: c9fdb5f38e am: 1d8503c538 am: 44c434d747 am: a1df427adb am: 5a96905df4" into sc-dev am: d9e6c1ee7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15016192

Change-Id: If14529f08b3905ccdea490714e304299b4217808
 2021-06-30 16:27:33 +00:00
Automerger Merge Worker
6d738a20af Merge "[automerger skipped] Merge "Don't attach private Notification to A11yEvent when user locked" into pi-dev am: fa06b865c9 -s ours am: f5dd6374a3 -s ours am: 155c60cda4 -s ours am: b082d71715 -s ours am: 7fe8133985 -s ours" into sc-dev am: c048559ef2 -s ours 
am skip reason: Merged-In Ib44f1d3695d2b31bee4f8ccae3f948c83f3b40b6 with SHA-1 f7f339c7d0 is already in history

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

Change-Id: I9cce265552a77214880e563bb7d94d434d627c06
 2021-06-30 16:26:26 +00:00
Automerger Merge Worker
7cb858cea0 Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into pi-dev am: 78e73d3f3b am: 6a154c0cb5 am: 4c548ab470 am: 6416281478 am: af4fa84b24" into sc-dev am: e01f6558b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880619

Change-Id: I6984d592317cc58b05dca1e64a182df645d8dece
 2021-06-30 16:25:53 +00:00
Vadim Caen
4ac1b0851d Merge "Add support for the DeviceConfig exception list" into sc-dev 2021-06-30 16:25:22 +00:00
Issei Suzuki
33dfa7446f Merge "Remove stopped activity from UnknownAppVisibilityController." into sc-dev 2021-06-30 16:24:37 +00:00
Automerger Merge Worker
605876dfa2 Merge "Merge "Fix a potential thread safety issue in VectorDrawable" into qt-dev am: 547df6be1e am: 419bd64bc4 am: 6b905ded5f am: 159bc53cf0" into sc-dev am: 227a964660 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880618

Change-Id: I391328a34e6076ab27ca1b9011908b9f1e6d6a32
 2021-06-30 16:24:21 +00:00