Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
772,824 Commits 3 Branches 0 Tags
d09025242533800192f6bb7d5b4a204d117cf6e8
Commit Graph

772824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d090252425 Merge "Post instant app notifications to an instant apps channel" into tm-qpr-dev am: 9fc4d37653 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350523

Change-Id: I765797988fa18bb21f48be246f8ee660e5818a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:38:46 +00:00
TreeHugger Robot
9fc4d37653 Merge "Post instant app notifications to an instant apps channel" into tm-qpr-dev 2022-05-13 22:17:46 +00:00
Ned Burns
24fe999bf5 Merge changes from topic "log-buffer" into tm-dev am: ff1b7dc538 am: 26daa38ed0 am: 1840929c60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097841

Change-Id: I29a0810dd29f72bf60aa679205efff777a8c6dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:14:42 +00:00
Song Hu
fa4ae73c24 Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 am: b9f9f81d13 am: 6493b1498b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488

Change-Id: I4654a81d06130254695a0bc7ba27e948ae75a17a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:14:21 +00:00
Alex Stetson
21f7a27015 Merge "Don't force nav bar shown if configured" into tm-dev am: a784a00759 am: 58923a9ef1 am: 7d5867198a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282669

Change-Id: I9a6e8a8b6142df94115265f077c70487d4686512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:08:53 +00:00
Robert Shih
3158f51661 Merge "media jni: fix CryptoException error code to string" into tm-dev am: a8def9731d am: 610e15c0b9 am: 5ce05c0f85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284923

Change-Id: Ieb81f81e15f59ab67ce82a5cc09e2d679365397e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:08:32 +00:00
Joshua Mccloskey
addf6f7025 Merge "Announce feedback for udfps misses during enroll" into tm-dev am: 23751ef862 am: 55c3457804 am: f4171dc347 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18352775

Change-Id: I85efe8f8b7e2f2b85a9580e70004cb92ccdecac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:08:08 +00:00
Evan Chen
da740095d5 [automerger skipped] Merge "Finalized Watch profile summary string" into tm-dev am: 954353d4fd am: b76ce8ee0c am: 69f4685dcf -s ours 
am skip reason: Merged-In I1a6f276468d03433b70d508285a712e3c043a89c with SHA-1 1eba36badc is already in history

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

Change-Id: I3ed921a345468a685ef52da6a39e79f9ec89710d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:07:37 +00:00
Ned Burns
44cd81af86 Merge changes from topic "log-buffer" into tm-dev am: ff1b7dc538 am: 26daa38ed0 am: b2e531de2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097841

Change-Id: I58dd82902c1904dc59a5d13bdb726a61f637cbf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:06:24 +00:00
Song Hu
78d84e2868 Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 am: b9f9f81d13 am: 6c05b1509f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488

Change-Id: I5ec1a8e424443da56ac0008e202a19224a80ad42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:06:03 +00:00
Alex Stetson
07f88695ec Merge "Don't force nav bar shown if configured" into tm-dev am: a784a00759 am: 58923a9ef1 am: 84841c376c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282669

Change-Id: I3fc7d87ff9feff6fb02c7b6079893f230b43ea54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:05:44 +00:00
Robert Shih
6a60f8ea0b Merge "media jni: fix CryptoException error code to string" into tm-dev am: a8def9731d am: 610e15c0b9 am: 53bd5e9c3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284923

Change-Id: I10713116c0ebd24e51556e7fcc701fee7661af45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:05:22 +00:00
Joshua Mccloskey
4a9f92db19 Merge "Announce feedback for udfps misses during enroll" into tm-dev am: 23751ef862 am: 55c3457804 am: 204e68fd49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18352775

Change-Id: I554dfed222697e3a9ef1db486cfb7cb88ab9c96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:05:03 +00:00
Evan Chen
e7d553f8f5 Merge "Finalized Watch profile summary string" into tm-dev am: 954353d4fd am: b76ce8ee0c am: 16b1f3d90b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203251

Change-Id: Ib458b22b8eba6eaba4ae851e59e01f1c32257a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:04:45 +00:00
Ned Burns
b2e531de2f Merge changes from topic "log-buffer" into tm-dev am: ff1b7dc538 am: 26daa38ed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097841

Change-Id: I41782aba7a9cc298f20c0815ed45a27edc3043cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:39:14 +00:00
Ned Burns
1840929c60 Merge changes from topic "log-buffer" into tm-dev am: ff1b7dc538 am: 26daa38ed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097841

Change-Id: Ib175ee74e66cf5f18233edf69df96354ea8b1894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:39:12 +00:00
Song Hu
6493b1498b Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 am: b9f9f81d13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488

Change-Id: Ied1f6e341c4722d13b1f56a55d47ff62351b7d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:39:04 +00:00
Song Hu
6c05b1509f Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 am: b9f9f81d13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488

Change-Id: I94636ed5f92c8e1442c89b3d25b8760b3db6791a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:39:04 +00:00
Alex Stetson
7d5867198a Merge "Don't force nav bar shown if configured" into tm-dev am: a784a00759 am: 58923a9ef1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282669

Change-Id: I2f25b48d47b643a2489f6ee90d1c792b8fd3d244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:38:40 +00:00
Alex Stetson
84841c376c Merge "Don't force nav bar shown if configured" into tm-dev am: a784a00759 am: 58923a9ef1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282669

Change-Id: I717b23a6af0aa7ec4027b80bcdde9a2aaf86512c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:38:36 +00:00
Robert Shih
5ce05c0f85 Merge "media jni: fix CryptoException error code to string" into tm-dev am: a8def9731d am: 610e15c0b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284923

Change-Id: I329bda0da61d9d7216aa74e07ad1410ef576d873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:38:19 +00:00
Robert Shih
53bd5e9c3e Merge "media jni: fix CryptoException error code to string" into tm-dev am: a8def9731d am: 610e15c0b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284923

Change-Id: I6387dda1552de4d4dd5760c4b4adab2b081e2535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:38:18 +00:00
Ned Burns
26daa38ed0 Merge changes from topic "log-buffer" into tm-dev am: ff1b7dc538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097841

Change-Id: Ic6fa080a2faa224ccb54f170d7b3874e438622e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:38:06 +00:00
Joshua Mccloskey
204e68fd49 Merge "Announce feedback for udfps misses during enroll" into tm-dev am: 23751ef862 am: 55c3457804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18352775

Change-Id: I7320b800040c26650c1c1ce717772fe2db2693d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:37:59 +00:00
Joshua Mccloskey
f4171dc347 Merge "Announce feedback for udfps misses during enroll" into tm-dev am: 23751ef862 am: 55c3457804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18352775

Change-Id: I21911c161e8cd70dd7aff8142201fbbc39c74485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:37:54 +00:00
Evan Chen
16b1f3d90b Merge "Finalized Watch profile summary string" into tm-dev am: 954353d4fd am: b76ce8ee0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203251

Change-Id: I6e9f94914a31030634aae84d918a43745a32e9ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:37:37 +00:00
Evan Chen
69f4685dcf Merge "Finalized Watch profile summary string" into tm-dev am: 954353d4fd am: b76ce8ee0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203251

Change-Id: I0aaaba3d62002f1b595b5ea93c46ba8f1243f375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:37:18 +00:00
Song Hu
b9f9f81d13 Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488

Change-Id: I725dc30ae7933aae657e059a2df5bddcf7dda0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:37:13 +00:00
Ned Burns
ff1b7dc538 Merge changes from topic "log-buffer" into tm-dev 
* changes:
  Fix warnings in LogcatEchoTrackerDebug
  Convert NPVCDownEventState to use RingBuffer
  Convert LogBuffer to use RingBuffer
  Implement RingBuffer
 2022-05-13 21:28:34 +00:00
Song Hu
d581c08704 Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev 2022-05-13 21:13:46 +00:00
Lucas Dupin
7e14ec3722 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2c778512a3 am: b6ecc8ea60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: I7dd0f696ea11ebbed877e9ccd8fcdf0d3fe0e3a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:08:15 +00:00
Lucas Dupin
0e10a14744 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2ff1af1a00 am: f27341e7e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: Ia21c5b8949344f6659c2d9e1decb31f03b03aa63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:07:57 +00:00
Alex Stetson
58923a9ef1 Merge "Don't force nav bar shown if configured" into tm-dev am: a784a00759 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282669

Change-Id: I0eae7e07e02e64c868cd1ad0524425f42c9eb548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:01:48 +00:00
Robert Shih
610e15c0b9 Merge "media jni: fix CryptoException error code to string" into tm-dev am: a8def9731d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284923

Change-Id: I42bd2e882b8b0b6648197359e07e7dc0043d8975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:01:20 +00:00
Joshua Mccloskey
55c3457804 Merge "Announce feedback for udfps misses during enroll" into tm-dev am: 23751ef862 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18352775

Change-Id: I562d54685ccbcde6ea6f12fa6546a7f7d8b767b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:00:56 +00:00
Evan Chen
b76ce8ee0c Merge "Finalized Watch profile summary string" into tm-dev am: 954353d4fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203251

Change-Id: Ibce6c4e11e24bcaa18f07845bac60c459fa3f705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:00:22 +00:00
Alex Stetson
a784a00759 Merge "Don't force nav bar shown if configured" into tm-dev 2022-05-13 20:59:38 +00:00
Robert Shih
a8def9731d Merge "media jni: fix CryptoException error code to string" into tm-dev 2022-05-13 20:55:55 +00:00
Mady Mellor
c875769f39 [automerger skipped] Merge "Add shell background executor to bubbles and put unregister call on it" into tm-qpr-dev am: a960444cc7 -s ours 
am skip reason: Merged-In I2c578d10e0bef49534987be3e82700e50ffd1281 with SHA-1 14a3514af4 is already in history

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

Change-Id: Ieaab46f73c9ce622491b738322c878b744d21359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:45:53 +00:00
Mady Mellor
d5345f99dc [automerger skipped] Add shell background executor to bubbles and put unregister call on it am: f8cd073417 -s ours 
am skip reason: Merged-In I2c578d10e0bef49534987be3e82700e50ffd1281 with SHA-1 14a3514af4 is already in history

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

Change-Id: I0db8ba400c18b160851cb9fdf11a94103018c76d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:45:47 +00:00
Lucas Dupin
637522937e Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2ff1af1a00 am: 61a427b630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: Idc8a0273adc23330e42a0f0bfa9d77594365f182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:43:23 +00:00
Lucas Dupin
b6ecc8ea60 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2c778512a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: I82ec5d169b011225147422bfad083f0a4ee4aa31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:42:47 +00:00
Mady Mellor
a960444cc7 Merge "Add shell background executor to bubbles and put unregister call on it" into tm-qpr-dev 2022-05-13 20:41:52 +00:00
Lucas Dupin
f27341e7e6 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2ff1af1a00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: I113694ed4d0e445e4a1931e3e74b3ee0ff341067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:40:46 +00:00
Lucas Dupin
61a427b630 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef am: 2ff1af1a00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: Ia0ecf578de186cae25281604f5c7684e8dcec286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:40:43 +00:00
Marat Davliatchin
535a2f17cd Merge "[SystemUI] Implement a way to put satin_dev.apk into test assets" into tm-qpr-dev am: 18e41351c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18205866

Change-Id: Ib51305843eaab29d069667f718eaab9ef7a4573a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:39:03 +00:00
Joshua Mccloskey
23751ef862 Merge "Announce feedback for udfps misses during enroll" into tm-dev 2022-05-13 20:29:42 +00:00
Evan Chen
954353d4fd Merge "Finalized Watch profile summary string" into tm-dev 2022-05-13 20:29:36 +00:00
Lucas Dupin
2c778512a3 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: I629c7dc15f99460c5f5b8191a2249b01a0e92376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:03:55 +00:00
Lucas Dupin
2ff1af1a00 Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev am: 5f5aa7e1ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282094

Change-Id: I67dc9b359e9565cdb32930d9977773bc02750cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:52:38 +00:00