Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,577 Commits 3 Branches 0 Tags
445ccb60b578381f29cd548bc496bf77e1d5dcee
Commit Graph

766577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Song Hu
445ccb60b5 Merge "Pass shared text content from ChooserActivity to AppPredictionService" into tm-dev am: d581c08704 am: fc9d42c5f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356488

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

Change-Id: I00d509257d675ff6409c4b3cfd32c63ed63b41d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:25:55 +00:00
Robert Shih
8aa1fa660b Merge "media jni: fix CryptoException error code to string" into tm-dev am: a8def9731d am: 1b4d2278b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284923

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

Change-Id: Id7c312fa95c025661c898f0147096e495db64914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:24:59 +00:00
Evan Chen
778c2086e4 [automerger skipped] Merge "Finalized Watch profile summary string" into tm-dev am: 954353d4fd am: 8a742f1795 -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: If4c1669f8c9428169084528e825dd3a602b7d18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:24:38 +00:00
Jon Spivack
f6657c597f Merge "Revert "Fix default mode for system alert window on low-RAM device."" into tm-dev am: 074f4aa65d am: a7392da71a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18365482

Change-Id: Ie07533a1e44597aae31d3de485dcfc9699ca7c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:24:27 +00:00
TreeHugger Robot
dadf186da2 Merge "Expose IME inset source control for testing" into tm-dev am: 65762373cf am: 1eab50575f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18286156

Change-Id: I8be0ab07d16c904ae64aabd9b47b6f17ce956fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:24:04 +00:00
Jon Spivack
a7392da71a Merge "Revert "Fix default mode for system alert window on low-RAM device."" into tm-dev am: 074f4aa65d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18365482

Change-Id: I6b68883eb0092fe8dab406b5f4a8715ee0bbd77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:22:58 +00:00
Jon Spivack
074f4aa65d Merge "Revert "Fix default mode for system alert window on low-RAM device."" into tm-dev 2022-05-13 22:15:19 +00:00
TreeHugger Robot
1eab50575f Merge "Expose IME inset source control for testing" into tm-dev am: 65762373cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18286156

Change-Id: I5af035ad2a03f0b1cc78a3e6546b6c8db114860e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:04:35 +00:00
Song Hu
fc9d42c5f8 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: I285f5f8fd47030d7849d85e2653b4a90eb4256ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:00:44 +00:00
Alex Stetson
2be4ec3cd2 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: I9e2940710b263dd23662ecdb9b6a52f326eaa1ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:59:57 +00:00
Robert Shih
1b4d2278b7 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: I1d6f19907f018926f8953c5cafa443330889561c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:58:55 +00:00
TreeHugger Robot
65762373cf Merge "Expose IME inset source control for testing" into tm-dev 2022-05-13 21:58:33 +00:00
Joshua Mccloskey
f273c5d303 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: I76efde1e3878fce180439d328dd693bb30b3b4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:58:29 +00:00
Evan Chen
8a742f1795 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: I61486950dca5a6edccdbd93dbf5b285eb2b69c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 21:57:59 +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
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
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
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
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
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
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
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
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
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
Lucas Dupin
5f5aa7e1ef Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev 2022-05-13 19:11:24 +00:00
Sarah Chin
521612b07b Merge "Add always full location check to LocationAccessPolicy" into tm-dev am: a9235c3208 am: fe0ebdcbe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18342389

Change-Id: I245594a7302b67ba7444453e26c341716ee3cdb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:59:25 +00:00
Christine Franks
7281a71559 Merge "Simplify color mode mapping" into tm-dev am: b7715733a0 am: 2475221c62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18361474

Change-Id: I57f8e6a0297bc02aa024a6fc147d220571eb561b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:58:36 +00:00
Sarah Chin
443f4567b8 Merge "Add always full location check to LocationAccessPolicy" into tm-dev am: a9235c3208 am: 43f9c7b735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18342389

Change-Id: Ia5f928d31765ab08d6ce0f6312ed7e4f3e2d5ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:41:14 +00:00
Sam Delmerico
3c6ae1ae99 Merge "disable usage of plugins as static libs" am: f111beaa39 am: eac2de8806 am: a7c7ee5135 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2075647

Change-Id: I98419f1ff73bfe039e1e06887b528987c21a602f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:40:49 +00:00
Sarah Chin
43f9c7b735 Merge "Add always full location check to LocationAccessPolicy" into tm-dev am: a9235c3208 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18342389

Change-Id: Ie324131b4e60a704546e04d353f1a0c88ca57d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:38:08 +00:00
Treehugger Robot
7c0c112ab8 [automerger skipped] Merge "Add new Telephony feature flags and update API annotations" am: 3d7b4e4ded am: aa21aea93e -s ours am: c59f4925e9 -s ours 
am skip reason: Merged-In I511afb5afc52b859a37f8ae27ab671c2b8037527 with SHA-1 c47df7fd76 is already in history

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

Change-Id: Ie6cfa82d9b1393e12b32108de719790ee17494e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:31:52 +00:00
Sarah Chin
fe0ebdcbe2 Merge "Add always full location check to LocationAccessPolicy" into tm-dev am: a9235c3208 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18342389

Change-Id: I23666ab5e5aa284639193670ae93c5c12cc13f25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:31:37 +00:00
Christine Franks
365a2eb259 Merge "Simplify color mode mapping" into tm-dev am: b7715733a0 am: 01ed48283d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18361474

Change-Id: I4b7659d217ee1871340aa740953635bbd4a8a28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:31:15 +00:00
Automerger Merge Worker
1d31292099 Merge "Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d83 am: 5a752a1fae" into tm-d1-dev-plus-aosp 2022-05-13 18:30:54 +00:00
Manjeet Rulhania
0b7cdad4ce Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d83 am: 5275acdb0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17749786

Change-Id: I9b37a795a97240053bdb6ab779be4e8b1797f753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:30:39 +00:00
Manjeet Rulhania
9a0f29f317 Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d83 am: 5a752a1fae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17749786

Change-Id: Ia948f461492422d51b0f0102694eca32b7bddd3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:30:32 +00:00