Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
656,102 Commits 3 Branches 0 Tags
f8f4244fcbf4cadd3436dba716b26b1ea030d1a5
Commit Graph

656102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Mccloskey
f8f4244fcb Merge "Added fingerprint acquired too bright" into sc-dev am: 24a0b944cd am: 8684ec08b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15089868

Change-Id: I6290dcfc7537e935601de1f25ffc76996baaa09a
 2021-06-30 20:51:49 +00:00
Joshua Mccloskey
8684ec08b2 Merge "Added fingerprint acquired too bright" into sc-dev am: 24a0b944cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15089868

Change-Id: Ibcfbd4da420c07a33682496f0482f082a6c946aa
 2021-06-30 20:34:33 +00:00
Joshua Mccloskey
24a0b944cd Merge "Added fingerprint acquired too bright" into sc-dev 2021-06-30 20:17:41 +00:00
TreeHugger Robot
fbdb0f9e1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 743d8f165f -s ours am: 72164b2ed1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf4adb99a3480cad51b28841b35921a623859229
 2021-06-30 20:13:22 +00:00
Automerger Merge Worker
58d4206f1f Merge "Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 am: 6ebb4df635" into sc-v2-dev-plus-aosp 2021-06-30 20:13:14 +00:00
Janis Danisevskis
32ab7bd54d Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 am: 6ebb4df635 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: I4c2ea858d5802c95d3166275151f45f3db01f400
 2021-06-30 20:12:58 +00:00
TreeHugger Robot
3f176acecd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 359132bc22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib440ba7d52b5d2bb6b984ec5cfb14ecd5d84c4b0
 2021-06-30 20:12:48 +00:00
TreeHugger Robot
359132bc22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 20:09:32 +00:00
TreeHugger Robot
b9edb3757b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 743d8f165f -s ours am: 7952481dc7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I122ebee62cfcd1aea2a835e339d44245ba4f78aa
 2021-06-30 20:08:05 +00:00
TreeHugger Robot
348218f9a7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 00d296f526 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I572422f76574e573d84bfea53bd3f5c52cf329f2
 2021-06-30 20:07:54 +00:00
TreeHugger Robot
076449641b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: af6abfc909 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64bece9b79c42199c6dc9d5f0efb5fbb746344c0
 2021-06-30 20:07:28 +00:00
TreeHugger Robot
7952481dc7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 743d8f165f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24ab43080736473d9e0d3581678b7861c5d5cd3a
 2021-06-30 20:07:25 +00:00
TreeHugger Robot
443de85ae6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4513a99021 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I768b39aad7b85c477dd58c29c3b4ff48813b2d59
 2021-06-30 20:07:05 +00:00
TreeHugger Robot
72164b2ed1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 743d8f165f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09d8b2ffbc1a8ae471ce6db2c708444c5da8df24
 2021-06-30 20:06:39 +00:00
TreeHugger Robot
00d296f526 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 20:05:23 +00:00
TreeHugger Robot
af6abfc909 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 20:01:07 +00:00
TreeHugger Robot
4513a99021 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 20:00:38 +00:00
TreeHugger Robot
0faeca4250 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9e9ad607e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2263435f965f0640ba854eda8f2f72158316db7
 2021-06-30 19:59:28 +00:00
Janis Danisevskis
a17f42e5a5 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 am: 043c85737e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: I82d3b207e8b2fffb6e3add473949e065d083305c
 2021-06-30 19:59:11 +00:00
TreeHugger Robot
9e9ad607e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 19:58:57 +00:00
TreeHugger Robot
cebeaf881a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 90bbc929aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd66c04ef19bb765730882ef34176495ae2cf249
 2021-06-30 19:58:50 +00:00
TreeHugger Robot
0bc5b4c908 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c7d594d197 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib51e25748cfe29bee1b87c2d67cb690cd9d88eed
 2021-06-30 19:58:41 +00:00
TreeHugger Robot
743d8f165f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-30 19:58:40 +00:00
TreeHugger Robot
241ed48f31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f480f66a08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cd9217729069f7312d825dd1393b0f8bce61688
 2021-06-30 19:58:23 +00:00
TreeHugger Robot
008bd951a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4490be2d49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfc2a3fa20e638d945aef95878c86146919cb868
 2021-06-30 19:58:11 +00:00
Janis Danisevskis
043c85737e Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: Ibb6b107e7522d159d94a909c58204fce407f62f1
 2021-06-30 19:58:08 +00:00
TreeHugger Robot
40dd2cbfbc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6019a35fc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3213a10a87eaf4d7197adacee2bf303f2afb56e5
 2021-06-30 19:57:59 +00:00
TreeHugger Robot
5806e49d49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 080cd817fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibcf96c677ff762b38634c6ab953f3f9db1e14e1c
 2021-06-30 19:57:31 +00:00
Janis Danisevskis
6ebb4df635 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev am: 3f0c227d93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14969456

Change-Id: Icfe611bc66e6dc2ce94f4a6eeee292158e98f15e
 2021-06-30 19:57:21 +00:00
TreeHugger Robot
90bbc929aa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 19:53:17 +00:00
TreeHugger Robot
c7d594d197 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 19:52:30 +00:00
TreeHugger Robot
f480f66a08 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 19:51:47 +00:00
TreeHugger Robot
4490be2d49 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-30 19:48:52 +00:00
TreeHugger Robot
1492813635 Merge "Add step down ramp to vibration waveforms" into sc-dev am: 50471a76f9 am: c9f997300b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15143497

Change-Id: I32cace8bd5877bb894cf24aa09dd4a6c8907f99a
 2021-06-30 19:47:24 +00:00
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
Janis Danisevskis
3f0c227d93 Merge "Keystore 2.0: Renaming the vpnstore interface." into sc-dev 2021-06-30 19:42:27 +00:00
TreeHugger Robot
7e981c9352 Merge "Add step down ramp to vibration waveforms" into sc-dev am: 50471a76f9 am: beae842943 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15143497

Change-Id: I056562d80864a8a88d124ac644332826c4b0d14b
 2021-06-30 19:32:59 +00:00
Matt Pietal
8da590ac21 Merge "PIN bouncer - basic landscape support" into sc-dev am: 83f94d4910 am: 1bf2ef8d81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15094202

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

Change-Id: Iaab91932ee3d7fc951055eb0b416cea32ffca6bd
 2021-06-30 19:32:29 +00:00
TreeHugger Robot
c9f997300b 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: I41cf2d1b9c7820ec7af37361fc14ab88ef56291a
 2021-06-30 19:31:36 +00:00
Dmitri Plotnikov
8c0a60b726 Merge "Fix boot time BatteryStats reset failure" into sc-dev am: ebf77ebc51 am: f65cbbbe42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15128655

Change-Id: I4f72131a6513b3b33f6be357b39bab577feba576
 2021-06-30 19:31:35 +00:00
Matt Pietal
2d981bf742 Merge "PIN bouncer - basic landscape support" into sc-dev am: 83f94d4910 am: 168402f89d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15094202

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

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

Change-Id: I2d5f02809e76c8f9381917ed307de46a3a3ba029
 2021-06-30 19:25:04 +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
Matt Pietal
168402f89d 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: Iaa0930725695d561d899d49cc85003d9236be960
 2021-06-30 19:13:20 +00:00