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

645648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b3e87e479a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 0ed4f3f782 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic31f358a84836d9b5a52659253c9dc543dd5adcb
 2021-06-30 20:27:50 +00:00
TreeHugger Robot
1600f8ebef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ad7cb3d92f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1ccdc2da0e3353842c45189d63f465035cc0e8a
 2021-06-30 20:27:38 +00:00
TreeHugger Robot
559ba0ea3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 93d16d3d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76efe742fad4d9fd76fc0187b1ccceaeaf2e1cad
 2021-06-30 20:25:57 +00:00
TreeHugger Robot
a33ae13f6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9408886886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icead881d96c37926a539cccf843d0fa4dfa3d45b
 2021-06-30 20:25:41 +00:00
Automerger Merge Worker
b72f910379 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec9b81395b -s ours" into sc-dev 2021-06-30 20:25:35 +00:00
TreeHugger Robot
38c284d3bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ec9b81395b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6bb8ccad2c863f10aaabcb6563134b48f23a2287
 2021-06-30 20:25:05 +00:00
TreeHugger Robot
12385f32b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:25:04 +00:00
Automerger Merge Worker
d29572bd1a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3d943e4671 -s ours" into sc-dev 2021-06-30 20:25:00 +00:00
TreeHugger Robot
95dc4fc307 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 20:24:58 +00:00
TreeHugger Robot
93d16d3d4e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:24:45 +00:00
TreeHugger Robot
a7bd32130d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3d943e4671 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief4fe3cc5ea21bd0ac8a6323d96851924b34e74e
 2021-06-30 20:24:28 +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
0ed4f3f782 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:22:07 +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
TreeHugger Robot
9408886886 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:19:26 +00:00
TreeHugger Robot
ec9b81395b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:18:55 +00:00
Joshua Mccloskey
24a0b944cd Merge "Added fingerprint acquired too bright" into sc-dev 2021-06-30 20:17:41 +00:00
TreeHugger Robot
3d943e4671 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-30 20:16:02 +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
ad7cb3d92f Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-30 20:15:43 +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
Bill Yi
b9109e2f0f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iecad6b913a0b4358338e6075cc6991b398a3bb98
 2021-06-30 17:16:07 +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