Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
644,804 Commits 3 Branches 0 Tags
edf6bbea582af47c49cecedf8800cedd4cd07ead
Commit Graph

644804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vadim Caen
edf6bbea58 Merge changes from topic "splashscreen-surface" into sc-dev am: fc1efcb428 am: be2ac213fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186656

Change-Id: I19f4e6d30a2bd51d92f1747027baec3f16cf001b
 2021-05-25 15:41:59 +00:00
Bill Yi
ed1513a776 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5abb9de9 -s ours am: 0c4274eb01 -s ours am: dcfe5d190f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I459217dcdd1a2c95d1abd80d717dfaf34af0b65a
 2021-05-25 15:41:15 +00:00
Alison Cichowlas
89721fcbcb Merge "Set RESULT_OK on exit via copy button." into sc-dev am: 7014d28df9 am: 5e03ec2456 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670950

Change-Id: Ib730547fee4e78e9cc50655c955e7ea7596317aa
 2021-05-25 15:41:03 +00:00
Vadim Caen
be2ac213fe Merge changes from topic "splashscreen-surface" into sc-dev am: fc1efcb428 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186656

Change-Id: Ie0e17006e404de22c20cce84cf7a43fdf0eb85e7
 2021-05-25 15:24:45 +00:00
Bill Yi
dcfe5d190f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5abb9de9 -s ours am: 0c4274eb01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife947fda49c532d034424b156b9a9480e72eb02c
 2021-05-25 15:24:28 +00:00
Alison Cichowlas
5e03ec2456 Merge "Set RESULT_OK on exit via copy button." into sc-dev am: 7014d28df9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670950

Change-Id: Ibd73a4a2097f872029076e1014bfd1cad5a1e8ef
 2021-05-25 15:24:24 +00:00
Vadim Caen
fc1efcb428 Merge changes from topic "splashscreen-surface" into sc-dev 
* changes:
  Do not reparent the SC when package is already realeased
  Display Splashscreen AVD in a SurfaceView
 2021-05-25 15:24:08 +00:00
Bill Yi
0c4274eb01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5abb9de9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5362199e49024d277fb2fdb29acd53099915e263
 2021-05-25 15:07:48 +00:00
Alison Cichowlas
7014d28df9 Merge "Set RESULT_OK on exit via copy button." into sc-dev 2021-05-25 15:04:25 +00:00
Bill Yi
5c5b1f5c67 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7353c0f0a5 -s ours am: 3188bdda53 -s ours am: 2da560b697 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8098362cbb2d40a388388a5b4e0c1999ef8840ba
 2021-05-25 14:59:26 +00:00
Bill Yi
2da560b697 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7353c0f0a5 -s ours am: 3188bdda53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffe3c06331c35541e88c35be5c0322f33a7f5c66
 2021-05-25 14:53:28 +00:00
TreeHugger Robot
f88001178d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 61efe0e417 -s ours am: 5b24558448 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I778dc0873d9a383ae17c2acbb823b49d16ae70c5
 2021-05-25 14:43:47 +00:00
TreeHugger Robot
587cd8f655 Merge "Create a new config for attentional haptics OGG resource" into sc-dev am: c7aa640da3 am: e2f1488247 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14253109

Change-Id: I92003dec65c6374b7ef911f1ed8aae60ca16e652
 2021-05-25 14:43:31 +00:00
Jeff Sharkey
741c0ca2fe Merge "Retire preliminary FGS deferral control API" into sc-dev am: 023570d056 am: 11f386e9e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703963

Change-Id: I4d8da34fc76414a1c95299e10a7a0219ec196047
 2021-05-25 14:43:05 +00:00
Bill Yi
3188bdda53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7353c0f0a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib666c464a29256d107cad8ea89548e60d8bec8be
 2021-05-25 14:42:05 +00:00
TreeHugger Robot
5b24558448 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 61efe0e417 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb7d7e3a6aecaf5a5636c639a6a4974554602bd1
 2021-05-25 14:37:49 +00:00
Tom Natan
4086680cce Merge "Fix deadlock on CompatConfig.mChanges" am: 7f40181620 am: e5e54383e6 am: bcd3b7b188 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710632

Change-Id: Ida553f24ae222d1fedad868964452184916fe6e7
 2021-05-25 14:37:41 +00:00
TreeHugger Robot
e2f1488247 Merge "Create a new config for attentional haptics OGG resource" into sc-dev am: c7aa640da3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14253109

Change-Id: I08bbaeafb172c74d58cf2b5b08ff1ac7e4a71ed2
 2021-05-25 14:37:32 +00:00
Treehugger Robot
91b3ef1b1c Merge "CEC: Add <User Control Pressed> information in dumpsys." am: 6933315ff2 am: c2924840c0 am: d65c5bc755 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708336

Change-Id: I61343bd0c429843e0d8e89551aa3b4fcc2c6ad0c
 2021-05-25 14:37:28 +00:00
Treehugger Robot
bf34579a49 Merge "Add lihongyu@ and mariiasand@ to WM OWNERS file" am: 8b0141d77b am: e2cb4a658c am: 81742334ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716970

Change-Id: I5c53af42aa32f82651a3bdbc8b76b5d59623f816
 2021-05-25 14:37:12 +00:00
Jeff Sharkey
11f386e9e8 Merge "Retire preliminary FGS deferral control API" into sc-dev am: 023570d056 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703963

Change-Id: I2b413742e88115d143a13b3caeefcdb231402a6b
 2021-05-25 14:36:36 +00:00
Automerger Merge Worker
1d09ad8e6a Merge "[automerger skipped] Merge "Add buckets params to the binder latency atom" am: 5141d67365 am: 1aa837f142 -s ours am: 1c8a46e689 -s ours" into sc-v2-dev-plus-aosp 2021-05-25 14:36:20 +00:00
Anton Hansson
47fcd2b005 Merge "Revert "Add bootclasspath_fragments to platform-bootclasspath."" into sc-dev am: 689f158229 am: aac765d740 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717693

Change-Id: If438a95c3ba4be5957deabe459ff6830c9177af7
 2021-05-25 14:36:16 +00:00
Siim Sammul
4f75bc6510 [automerger skipped] Merge "Add buckets params to the binder latency atom" am: 5141d67365 am: 1aa837f142 -s ours am: 1c8a46e689 -s ours 
am skip reason: Merged-In I20d8f5632f76774cad64af30a6aa1f1ab172152f with SHA-1 cceed4f3dc is already in history

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

Change-Id: I0bceb685e20759972ed576e43d17fb766ac11885
 2021-05-25 14:36:16 +00:00
TreeHugger Robot
bc3f973aca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fa8ce74457 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I928a559e13d2ab5ade182bf22f8ff1f47615b4dd
 2021-05-25 14:36:02 +00:00
TreeHugger Robot
ae446e3024 Merge "Show ripple effect on rear fp auth" into sc-dev am: 6a01a5507c am: 28b5d201c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14441366

Change-Id: Iab870ef5ff52b894da4cfa07eb1ddd61eee76947
 2021-05-25 14:35:54 +00:00
TreeHugger Robot
e12c57d5a6 Merge "Address API council feedback: s/isPersonalizedHotwordDetection/isHotwordDetectionPersonalized/." into sc-dev am: 6ec781dea5 am: 8adbfe0624 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703100

Change-Id: I5447ce7951d49290d96959850d3d113730417305
 2021-05-25 14:35:45 +00:00
Anton Hansson
aac765d740 Merge "Revert "Add bootclasspath_fragments to platform-bootclasspath."" into sc-dev am: 689f158229 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717693

Change-Id: I809a3373e7e48033fdd76d80d0fd3868b60d1a44
 2021-05-25 14:35:23 +00:00
TreeHugger Robot
61efe0e417 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-25 14:34:56 +00:00
TreeHugger Robot
ee6e60c8fb Merge "Check "BIND_HOTWORD_DETECTION_SERVICE" permission before binding HotwordDetectionService" into sc-dev am: 6572539f65 am: 09002c32f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540428

Change-Id: I611ff53efcac3f9f0859a9721cbcc6df82908d81
 2021-05-25 14:33:50 +00:00
TreeHugger Robot
c7aa640da3 Merge "Create a new config for attentional haptics OGG resource" into sc-dev 2021-05-25 14:32:08 +00:00
Jeff Sharkey
023570d056 Merge "Retire preliminary FGS deferral control API" into sc-dev 2021-05-25 14:27:07 +00:00
Anton Hansson
689f158229 Merge "Revert "Add bootclasspath_fragments to platform-bootclasspath."" into sc-dev 2021-05-25 14:18:43 +00:00
TreeHugger Robot
fa8ce74457 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-05-25 14:12:13 +00:00
satayev
050c90c343 Revert "Add bootclasspath_fragments to platform-bootclasspath." 
Reason for revert: test breakage b/189114287

Bug: 180105615
Bug: 189114287
Test: atest sdkextensions_e2e_tests
Change-Id: Ib58cd02117cf5a5632c4654c34de7643a16b1867
 2021-05-25 15:12:01 +01:00
TreeHugger Robot
28b5d201c0 Merge "Show ripple effect on rear fp auth" into sc-dev am: 6a01a5507c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14441366

Change-Id: I21de8b703a864888287d69b0ce76d7310f3857b2
 2021-05-25 14:02:04 +00:00
TreeHugger Robot
8adbfe0624 Merge "Address API council feedback: s/isPersonalizedHotwordDetection/isHotwordDetectionPersonalized/." into sc-dev am: 6ec781dea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703100

Change-Id: I7a8efe1aad76e3a74ba8062be30958a379ee4a96
 2021-05-25 14:01:27 +00:00
TreeHugger Robot
6a01a5507c Merge "Show ripple effect on rear fp auth" into sc-dev 2021-05-25 14:00:13 +00:00
TreeHugger Robot
09002c32f6 Merge "Check "BIND_HOTWORD_DETECTION_SERVICE" permission before binding HotwordDetectionService" into sc-dev am: 6572539f65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540428

Change-Id: I7c33fcf14abc72d3a3b7651eb270ba781b744149
 2021-05-25 14:00:02 +00:00
TreeHugger Robot
6ec781dea5 Merge "Address API council feedback: s/isPersonalizedHotwordDetection/isHotwordDetectionPersonalized/." into sc-dev 2021-05-25 13:40:20 +00:00
TreeHugger Robot
6572539f65 Merge "Check "BIND_HOTWORD_DETECTION_SERVICE" permission before binding HotwordDetectionService" into sc-dev 2021-05-25 13:24:35 +00:00
Tom Natan
bcd3b7b188 Merge "Fix deadlock on CompatConfig.mChanges" am: 7f40181620 am: e5e54383e6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710632

Change-Id: Ie5b658d90371a1c698c5007a772c01b7db2444cd
 2021-05-25 13:20:28 +00:00
Anton Hansson
43d664ae9a Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab75 am: eff53d0075 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703098

Change-Id: I5d0d5cf801a98138f6ef0f5fbfd2de986e935f7e
 2021-05-25 13:20:17 +00:00
Treehugger Robot
d65c5bc755 Merge "CEC: Add <User Control Pressed> information in dumpsys." am: 6933315ff2 am: c2924840c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708336

Change-Id: Iea7599e29535195459bb6af1880f25078780e547
 2021-05-25 13:20:09 +00:00
Treehugger Robot
81742334ee Merge "Add lihongyu@ and mariiasand@ to WM OWNERS file" am: 8b0141d77b am: e2cb4a658c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1716970

Change-Id: Ie2881e72698f6aa90b98b5c7ea88c5f90e48abcd
 2021-05-25 13:19:38 +00:00
TreeHugger Robot
4833e2240c Merge "Fixes for Test App e2e working and UX polish." into sc-dev am: 44061d90ec am: 384000d1fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14701662

Change-Id: Id06e9007faff2c1bb82ab2aa301f23ccff2fe9b9
 2021-05-25 13:19:09 +00:00
Anton Hansson
eff53d0075 Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703098

Change-Id: I4ed13d11d8821644220efce3cb369c453df93188
 2021-05-25 13:04:59 +00:00
Anton Hansson
23efb3ab75 Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev 2021-05-25 13:01:51 +00:00
TreeHugger Robot
384000d1fc Merge "Fixes for Test App e2e working and UX polish." into sc-dev am: 44061d90ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14701662

Change-Id: Ib98c860d1d15b45bef287ea12975c3deba08db6d
 2021-05-25 12:56:57 +00:00
TreeHugger Robot
44061d90ec Merge "Fixes for Test App e2e working and UX polish." into sc-dev 2021-05-25 12:34:38 +00:00