Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
645,626 Commits 3 Branches 0 Tags
95dc4fc307238c7e008ec2460f8f30c637f48034
Commit Graph

645626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
95dc4fc307 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:24:58 +00:00
Automerger Merge Worker
465138d60f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4eb3a125d -s ours" into sc-dev 2021-06-30 20:24:18 +00:00
Silin Huang
e06b0d447d Merge "Polish the wallet screen landscape mode." into sc-dev 2021-06-30 20:24:09 +00:00
TreeHugger Robot
e6d7573cb8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d4eb3a125d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65b7207cf7eac26e098c45ba54d4d6b3fd4e32c2
 2021-06-30 20:23:51 +00:00
Automerger Merge Worker
5f47a3765d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 48c12de197 -s ours" into sc-dev 2021-06-30 20:23:40 +00:00
Hongwei Wang
739425e56b Merge "Exclude the split-secondary offsets when auto-enter-pip" into sc-dev 2021-06-30 20:23:23 +00:00
TreeHugger Robot
9135591342 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 48c12de197 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0f568f1baf69f4f5982c3f09169103de4af93f5
 2021-06-30 20:23:10 +00:00
TreeHugger Robot
edf4deba6c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4439c9c501 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5df3948caa6b51c843d4c2c3695e4c835349026
 2021-06-30 20:22:41 +00:00
TreeHugger Robot
79e4ef758c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 851eb7140e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic58f35229331d1245a552dec0d5235f30b59e6f0
 2021-06-30 20:22:05 +00:00
Joshua Mccloskey
24a0b944cd Merge "Added fingerprint acquired too bright" into sc-dev 2021-06-30 20:17:41 +00:00
TreeHugger Robot
d4eb3a125d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:15:53 +00:00
TreeHugger Robot
48c12de197 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:13:43 +00:00
TreeHugger Robot
4439c9c501 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:10:12 +00:00
TreeHugger Robot
851eb7140e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:03:53 +00:00
TreeHugger Robot
743d8f165f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 19:58:40 +00:00
Janis Danisevskis
3f0c227d93 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev 2021-06-30 19:42:27 +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
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
Bill Yi
e4a02b6e66 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f9122db362d687454ffde8cf0118554b287408f
 2021-06-30 18:17:44 +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
Silin Huang
b54f210c44 Polish the wallet screen landscape mode. 
Test: manual
Bug: 188471339
Change-Id: Ic6fef8d7bd19bc76cff9f0e040b9e8fb87837a98
 2021-06-30 18:03:18 +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
Bill Yi
380d15b7b6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7ceb4634b1bc0803afd26aa30db1fafa327be46
 2021-06-30 17:44:18 +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
Bill Yi
59238f9f36 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0823194a242c41af62926661be121584d02f9400
 2021-06-30 17:02:53 +00:00
Bill Yi
15d565143e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I520acdfa31f9f55f32014e9df4081733f16d63a1
 2021-06-30 17:01:32 +00:00
Bill Yi
250f15b91b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5b304d0f34a0fb37691d9ac812a888ae2ec452c3
 2021-06-30 16:58:58 +00:00
Joe Bolinger
7aafe8e0d1 Merge "Execute show overlay method immediatly." into sc-dev 2021-06-30 16:57:16 +00:00
Bill Yi
47af675058 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia531fde9a00e6233f4283618ad4193a5e8587ec9
 2021-06-30 16:52:23 +00:00
Janis Danisevskis
191b206410 Keystore 2.0: Renaming the vpnstore interface. 
Renaming the vpnstore interface to legacykeystore.

Bug: 191373871
Test: TBD
Change-Id: Icd304ef621f0de52d6ebc415a0628d63f827fbcd
 2021-06-30 09:45:54 -07: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
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
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
Bernardo Rufino
fe08620ac7 [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: 159542ac4f -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: Id99a654dd27b6c7a5e4d32ae20842439a6c407c1
 2021-06-30 16:23:55 +00:00
John Reck
f1d8c72d2e 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

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

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

Change-Id: I9b86456ee858390dee55ad6959dfeb0c7300a514
 2021-06-30 16:22:12 +00:00
TreeHugger Robot
544f54cd29 [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 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: Ia21a24d3070f6ec8c812700471cc9ee486aebc31
 2021-06-30 16:21:45 +00:00
Bernardo Rufino
c9c77fdd22 [automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: ccdf929a26 -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: I3e27d71a9a35b6439b15f6a238f6e1db0f6984f6
 2021-06-30 16:21:17 +00:00
John Reck
4c7ddfbef4 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14880620

Change-Id: Id6ffb44f03ebc237525333b57ca9c251a6b9b256
 2021-06-30 16:20:52 +00:00
Automerger Merge Worker
d9e6c1ee7e 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 2021-06-30 16:20:40 +00:00