Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
761,808 Commits 3 Branches 0 Tags
ce4e576ce631b93cfd32b093f39699f0ec248202
Commit Graph

761808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ce4e576ce6 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: I96ff2ddde6908958de9ccdb0ad16b64ec773e633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:04:04 +00:00
Ned Burns
2766240873 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: Ib3d198cdc207db7a352736a7c0d8993ec3084065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:03:15 +00:00
Ned Burns
74dd1ab4c8 Convert NPVCDownEventState to use RingBuffer am: 598ec025bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331644

Change-Id: I8a92c069b10af3c482ac10ef8fbb4b013b76b231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:03:12 +00:00
Ned Burns
efe775d291 Convert LogBuffer to use RingBuffer am: e0b11afd70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097840

Change-Id: Ia05d255399e9cf0c24d6e0327e2ad4a88b201ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:03:10 +00:00
Ned Burns
01a3bf5e7f Implement RingBuffer am: 526b914e19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331643

Change-Id: I756572b08a5098d30b4ee91ff169a4d790f4e1b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:03:06 +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
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
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
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
5f5aa7e1ef Merge "Instrument CUJ_VOLUME_CONTROL with Trace tag" into tm-dev 2022-05-13 19:11:24 +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
Sam Delmerico
a7c7ee5135 Merge "disable usage of plugins as static libs" am: f111beaa39 am: eac2de8806 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2075647

Change-Id: Ibdf7919450a2a27c60d5f087a03d43fe2fcae6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:30:07 +00:00
Treehugger Robot
c59f4925e9 [automerger skipped] Merge "Add new Telephony feature flags and update API annotations" am: 3d7b4e4ded am: aa21aea93e -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: Ifdb0bdde5dd24977b745fbd56a17c2e8b7b416fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:29:08 +00:00
Sam Delmerico
eac2de8806 Merge "disable usage of plugins as static libs" am: f111beaa39 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2075647

Change-Id: I010aeaf97b3027eabc397bff39e1f95ba84e17e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:27:56 +00:00
Sarah Chin
a9235c3208 Merge "Add always full location check to LocationAccessPolicy" into tm-dev 2022-05-13 18:27:40 +00:00
Christine Franks
01ed48283d Merge "Simplify color mode mapping" into tm-dev am: b7715733a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18361474

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

Change-Id: I1ea8f57ae96fea8588645594d82114025e4b96d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:22:11 +00:00
Christine Franks
b7715733a0 Merge "Simplify color mode mapping" into tm-dev 2022-05-13 18:21:28 +00:00
Matt Pietal
0b38b3dc95 Merge "Don't blend front scrim on AOD" into tm-dev am: dc65d350fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18366805

Change-Id: I782a9031e66f9b5ebe6510364d49b81ce8eaed6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:19:07 +00:00
Jing Ji
1ba4b1a443 Merge "Add config for the auto restricted bucket on abusive bg battery drain" into tm-dev am: ce0daea7ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18338039

Change-Id: Id6fd477ee1a16820a164cb4816e05aa489d50148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:17:57 +00:00
Manjeet Rulhania
6953052d83 Merge "Fix duplicate permission privilege escalation" into tm-dev 2022-05-13 18:14:01 +00:00
Matt Pietal
dc65d350fd Merge "Don't blend front scrim on AOD" into tm-dev 2022-05-13 18:05:43 +00:00
Jing Ji
ce0daea7ca Merge "Add config for the auto restricted bucket on abusive bg battery drain" into tm-dev 2022-05-13 18:01:58 +00:00
Sam Delmerico
f111beaa39 Merge "disable usage of plugins as static libs" 2022-05-13 17:57:15 +00:00
Treehugger Robot
aa21aea93e Merge "Add new Telephony feature flags and update API annotations" am: 3d7b4e4ded 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910630

Change-Id: Iaef6cfaa107be10d533d3e63ddcafe27806a82e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:45:09 +00:00
TreeHugger Robot
bee9dad0ac Merge "Support comparison of byte array values in areBundlesEqual" into tm-dev am: 548c0800c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18357438

Change-Id: I9f1e52124155872f8e2e2196578e190946f68f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:42:55 +00:00
TreeHugger Robot
548c0800c2 Merge "Support comparison of byte array values in areBundlesEqual" into tm-dev 2022-05-13 17:38:33 +00:00
Yixiao Luo
8ffe4d06f4 Merge "TIAS:The oneway flag add in ITvInteractiveAppManagerCallback.aidl" into tm-dev am: a021fd7d31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284606

Change-Id: Ia4b89860488bb12e49b0a0bcf47d0588155c9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:35:43 +00:00
Roman Kiryanov
c3647dda84 [automerger skipped] Cleanup in EmulatorClipboardMonitor (4) am: 09b78c405c -s ours am: b9cd101574 -s ours am: 16c85ad308 -s ours 
am skip reason: Merged-In I9ba57f4347e50f8462cec347e5608ec4d1eb0b30 with SHA-1 73cc189a3d is already in history

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

Change-Id: I104cfd218c7d98aa203d42540f59bf425a645914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:35:31 +00:00
Roman Kiryanov
57969c5278 [automerger skipped] Cleanup in EmulatorClipboardMonitor (3) am: a5f8393d76 -s ours am: 48aeb313ce -s ours am: b322c291cc -s ours 
am skip reason: Merged-In I236b039c4fbbbfb519ba1432326bba9a89d008c2 with SHA-1 853dd7d2b6 is already in history

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

Change-Id: I85f984becedd6d5573c71a5a6bf32502f08ba11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:35:25 +00:00
Roman Kiryanov
37468572a4 [automerger skipped] Cleanup in EmulatorClipboardMonitor (2) am: 14fa62c07d -s ours am: ff50ecff73 -s ours am: 98b0da5908 -s ours 
am skip reason: Merged-In I5241086c947a4227fb32648f0693303be66f4d46 with SHA-1 185fd89665 is already in history

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

Change-Id: I95dc2236bd2f5b43c384e04b933a6c3061e05ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:35:18 +00:00
Roman Kiryanov
66f9722be1 [automerger skipped] Cleanup in EmulatorClipboardMonitor (1) am: e0b8d2008d -s ours am: 5932b03f01 -s ours am: 128a79ba36 -s ours 
am skip reason: Merged-In I3e96ab6ada8f0c892613a1f9dcc6b6ae12f6d73b with SHA-1 3c23790a7d is already in history

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

Change-Id: I49fadba7c36413549a99d96fccfca9b6d433793f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:35:12 +00:00
Roman Kiryanov
3fa0bbea9a [automerger skipped] Add wrappers around IO functions to check the return values am: 6edf57328b -s ours am: 7317743be6 -s ours am: 0ed077e0a8 -s ours 
am skip reason: Merged-In If98fb3adf58f2e4e13d483b78ea05ea9d8d61b58 with SHA-1 63b4330259 is already in history

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

Change-Id: I47130d06075ca1fc688eca85d40f4972601677b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:35:06 +00:00
Roman Kiryanov
00de6427e3 [automerger skipped] Set host's clipboard in a separate thread am: e1340d674b -s ours am: 371be573a1 -s ours am: 65586e0cbd -s ours 
am skip reason: Merged-In Iaf445ae3e6e009b86ccf4d1783dffeebc165bb62 with SHA-1 0a11904976 is already in history

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

Change-Id: Iac7e08fe9d969403d28319cfcb126391cec587f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:34:58 +00:00
Roman Kiryanov
45784f92b4 [automerger skipped] Log emulator's clipboard access to logcat am: 9eb8a72ac7 -s ours am: 4636a557b2 -s ours am: 6fb00812cb -s ours 
am skip reason: Merged-In I7fc0a96560f4e9805fd3bc91cb5b40a1fc149141 with SHA-1 935e7d4ca2 is already in history

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

Change-Id: I4ec515b960992ecfaf9054327ca2908599d6b87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:34:56 +00:00
Oli Lan
372cc2bf92 Merge "Allow profiles of an admin user to remove system app updates." into tm-dev am: 864450224b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185142

Change-Id: I6f550a3ac943b81d56744cafd2a6fa95a2157e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:34:40 +00:00
Christine Franks
8051a443e7 Merge "Display IME locally on virtual displays" into tm-dev am: 76d22dca3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18318510

Change-Id: I138a525a1ba67430978e4600dd0d07bcd2aafdad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:34:04 +00:00
Yixiao Luo
a021fd7d31 Merge "TIAS:The oneway flag add in ITvInteractiveAppManagerCallback.aidl" into tm-dev 2022-05-13 17:32:44 +00:00
Roman Kiryanov
16c85ad308 [automerger skipped] Cleanup in EmulatorClipboardMonitor (4) am: 09b78c405c -s ours am: b9cd101574 -s ours 
am skip reason: Merged-In I9ba57f4347e50f8462cec347e5608ec4d1eb0b30 with SHA-1 73cc189a3d is already in history

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

Change-Id: I44f219d8ac370586cd6527b55fdc8480571ed7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:16:35 +00:00
Roman Kiryanov
b322c291cc [automerger skipped] Cleanup in EmulatorClipboardMonitor (3) am: a5f8393d76 -s ours am: 48aeb313ce -s ours 
am skip reason: Merged-In I236b039c4fbbbfb519ba1432326bba9a89d008c2 with SHA-1 853dd7d2b6 is already in history

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

Change-Id: Iec0b5c87a43a427a4dd368068327900681be3cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:16:20 +00:00
Roman Kiryanov
98b0da5908 [automerger skipped] Cleanup in EmulatorClipboardMonitor (2) am: 14fa62c07d -s ours am: ff50ecff73 -s ours 
am skip reason: Merged-In I5241086c947a4227fb32648f0693303be66f4d46 with SHA-1 185fd89665 is already in history

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

Change-Id: Ifc6063ff62ab085421ed60c99169c584ceded809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 17:16:05 +00:00