Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
883,360 Commits 3 Branches 0 Tags
29958687146e075fa2cd197fad9f4e3dbdfcab45
Commit Graph

883360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Yang
2995868714 Merge "DO NOT MERGE[Wear] CP wear setting keys in a batch." into udc-dev am: ae3c8b79b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22432274

Change-Id: I147a9ce4d387ef8e5831bbc2b5a6f2c40d64d7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 20:32:17 +00:00
Josh Yang
a268b4b093 DO NOT MERGE[Wear] CP wear setting keys in a batch. am: e4457a190d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22432274

Change-Id: I35bf9b907b47700ac7ad27c2f1558595f7e521d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 20:31:17 +00:00
Josh Yang
ae3c8b79b7 Merge "DO NOT MERGE[Wear] CP wear setting keys in a batch." into udc-dev 2023-04-06 19:56:38 +00:00
Julia Reynolds
f927f06801 Merge "Fix some additional tests registering real receivers" into udc-dev am: 5be8ccc63b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22500539

Change-Id: Ie784ef1e6182faef6e9a44d2658495b88b9215ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 19:16:36 +00:00
Li Li
186db42f1a Merge "Optimize Freezer deadlock detection" into udc-dev am: 319c4fb9a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22436381

Change-Id: I768c6edabffb487e2c6612b0550a9fb1f0cec9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 19:03:08 +00:00
Julia Reynolds
5be8ccc63b Merge "Fix some additional tests registering real receivers" into udc-dev 2023-04-06 18:58:30 +00:00
Li Li
319c4fb9a3 Merge "Optimize Freezer deadlock detection" into udc-dev 2023-04-06 18:45:13 +00:00
Sudheer Shanka
4217a1e1b2 Merge "Promote an app to RECEIVER only when handling a broadcast." into udc-dev am: a27b117a7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22499471

Change-Id: Ifb9363665e9de4e16c2a64c9e3e6650bd54369f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:38:54 +00:00
TreeHugger Robot
c84ab6f994 Merge "Add ComponentInfo in sensor properties into dumpsys" into udc-dev am: 1ceca93ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22283601

Change-Id: Ie6cf48ee4efe73fcf1667a078069810f99c58313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:33:43 +00:00
Sudheer Shanka
a27b117a7f Merge "Promote an app to RECEIVER only when handling a broadcast." into udc-dev 2023-04-06 18:33:17 +00:00
Riddle Hsu
8ef9129537 Merge "Compute config based on original override for inherited letterbox" into udc-dev am: db38743838 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22510222

Change-Id: I2dd069fb78285024429ce4860732ae362999e1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:29:14 +00:00
Vinit Nayak
5a01b9ab11 Merge "Add logs for OPS launcher broadcast" into tm-qpr-dev am: b026dbf3b3 am: cc6f05f4e8 am: c593118fad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22480615

Change-Id: I64b84e66c834310322a555a6fa948ee21bd71624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:26:35 +00:00
TreeHugger Robot
1ceca93ea0 Merge "Add ComponentInfo in sensor properties into dumpsys" into udc-dev 2023-04-06 18:25:11 +00:00
Riddle Hsu
db38743838 Merge "Compute config based on original override for inherited letterbox" into udc-dev 2023-04-06 18:16:07 +00:00
Vinit Nayak
c593118fad Merge "Add logs for OPS launcher broadcast" into tm-qpr-dev am: b026dbf3b3 am: cc6f05f4e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22480615

Change-Id: I8f4fc3d433c957b782f88bcdca3b1f2cb664c242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:11:49 +00:00
BK Choi
24c4ec9bc4 Merge "Deprecate user pre-creation methods in UserManager." into udc-dev am: 0394f5cf18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22339406

Change-Id: I3dcb70a02f09dc03a5e691c918e7a076cec1728e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:06:57 +00:00
Fabian Kozynski
5e9e73acf3 Merge "Move carrier package to shade" into udc-dev am: 4c6f578783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22458682

Change-Id: If8d2790878aac5c829e88aa76098557b2b1f9e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:05:13 +00:00
BK Choi
0394f5cf18 Merge "Deprecate user pre-creation methods in UserManager." into udc-dev 2023-04-06 18:01:39 +00:00
TreeHugger Robot
1ac905e8a3 Merge "Turn flag back to default on" into udc-dev am: 83566315a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22494302

Change-Id: I02ef5dc0c7520688c5de5dbfbd4aac6df1b5a83e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:58:32 +00:00
Vinit Nayak
cc6f05f4e8 Merge "Add logs for OPS launcher broadcast" into tm-qpr-dev am: b026dbf3b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22480615

Change-Id: Ib6611ed7c43fe20869da6c6bf64830fcfcb2c5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:45:03 +00:00
Fabian Kozynski
4c6f578783 Merge "Move carrier package to shade" into udc-dev 2023-04-06 17:40:05 +00:00
TreeHugger Robot
83566315a3 Merge "Turn flag back to default on" into udc-dev 2023-04-06 17:31:30 +00:00
Josh Yang
e4457a190d DO NOT MERGE[Wear] CP wear setting keys in a batch. 
This CL upstreams wear settings keys from tm-wear-dev branch to the
master branch.

1. Add/update/delete Settings wear keys to match the latest code in
   tm-wear-dev branch.
2. Update back up/restore setup.
3. Rebase SettingsProvider version to ensure that version conflict is
   resolved. A new version 216 is added and is used to resolve wear
   version conflicts. This change should have no effect on other builds
   that are already on the master branch.

See go/wear-1pg-settings-key-upstream for detailed design.

Bug: 270226977
Test: flash the build on a watch and manually test
Test: atest SettingsBackupTest
Change-Id: I8ceb4b5b7dc5ee238f1a8d084d2ca74ef12e9fad
 2023-04-06 17:29:34 +00:00
Miranda Kephart
e59d13fcb0 Merge "Dismiss screenshots on escape key" into udc-dev am: f304ffc940 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22426354

Change-Id: Id50b0c95036128f7605d5ccc313fe49181c2ec0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:18:32 +00:00
John Reck
2982ba63a9 Merge "Support HDR in skiagl" into udc-dev am: adddf61884 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22481062

Change-Id: I7cab17f9c494560ccb106e9a2020e41c4ec59c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:14:39 +00:00
Miranda Kephart
f304ffc940 Merge "Dismiss screenshots on escape key" into udc-dev 2023-04-06 16:59:18 +00:00
John Reck
adddf61884 Merge "Support HDR in skiagl" into udc-dev 2023-04-06 16:57:49 +00:00
Vinit Nayak
b026dbf3b3 Merge "Add logs for OPS launcher broadcast" into tm-qpr-dev 2023-04-06 16:52:46 +00:00
TreeHugger Robot
96fc0a4949 Merge "Revert "Have AssetFileDescriptor.AutoCloseInputStream use pread"" into udc-dev am: 138683c165 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22378297

Change-Id: I9c5b79353f4e37d172d80aa5c5a302a885e00468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 16:49:57 +00:00
Helen Qin
96d25e700e Merge "Enable the mdoc UI." into udc-dev am: 7f59b1a27b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22479742

Change-Id: I0792ecc1689ef1ce4e1a5e0ceb1cf22f3df59baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 16:47:25 +00:00
Feiyu Chen
bba79a4df3 Merge "Write edgetpu_native configs to system properties [2/2]" into udc-dev am: 6970f61202 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22369444

Change-Id: I65fbbb5e87b34a4ea7f12e4d68f86db4fc0f8d6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 16:46:45 +00:00
TreeHugger Robot
138683c165 Merge "Revert "Have AssetFileDescriptor.AutoCloseInputStream use pread"" into udc-dev 2023-04-06 16:43:19 +00:00
Helen Qin
7f59b1a27b Merge "Enable the mdoc UI." into udc-dev 2023-04-06 16:24:55 +00:00
Feiyu Chen
6970f61202 Merge "Write edgetpu_native configs to system properties [2/2]" into udc-dev 2023-04-06 16:20:23 +00:00
Becca Hughes
3f501881ed Turn flag back to default on 
The flag for Credential Manager was default on
and then in review it was turned default off
and now for some reason the experiment is not
turning it back on so we should go back to
default on.

Change-Id: I3e8a270b20148a0bc9da1fe88bbd15695761eb6e
Test: device
Bug: 277107368
 2023-04-06 16:09:29 +00:00
Hui Yu
8fe7871f89 Merge "Log the timed out event for SHORT_SERVICE type FGS." into udc-dev am: 3652556650 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22322109

Change-Id: Ic97be6ffb05a044c6a238ac30b5c085f14c65165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:52:24 +00:00
Haining Chen
5d3cd3d8b1 Merge "Unset StrongAuthFlags when unlocking a user profile" into udc-dev am: 5be7b203d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22308727

Change-Id: I3ae1d9403377d192f0a9be730ab0967950ebe775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:51:09 +00:00
Julia Reynolds
b51fa3a707 Fix some additional tests registering real receivers 
Test: atest SnoozeHelperTest
Test: atest RoleObserverTest
Test: with some temp logging in ContextImpl
Fixes: 274705714
Change-Id: Id0352fd8d2aae47f588b47b3c45cdc5ed4e3fe3d
 2023-04-06 11:48:40 -04:00
Hui Yu
3652556650 Merge "Log the timed out event for SHORT_SERVICE type FGS." into udc-dev 2023-04-06 15:47:09 +00:00
Haining Chen
5be7b203d8 Merge "Unset StrongAuthFlags when unlocking a user profile" into udc-dev 2023-04-06 15:43:09 +00:00
Oli Lan
8867bd6834 Merge "Fix potential deadlock in applyUserRestrictions methods." into udc-dev am: 644791aae4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22459423

Change-Id: I1504282d2a12bcb442cf5b2a454bde015fbab124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:39:31 +00:00
Aaron Liu
439577a290 Merge "Revert "Release PREVENT_BYPASS_KEYGUARD flag"" into udc-dev am: 816387ae20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22467747

Change-Id: I41ff543efbc2804617c9928ebc26524358b187dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:38:20 +00:00
Oli Lan
644791aae4 Merge "Fix potential deadlock in applyUserRestrictions methods." into udc-dev 2023-04-06 15:37:26 +00:00
Aaron Liu
816387ae20 Merge "Revert "Release PREVENT_BYPASS_KEYGUARD flag"" into udc-dev 2023-04-06 15:36:00 +00:00
Miranda Kephart
7ab7822e83 Merge "Remove CLIPBOARD_MINIMIZED_LAYOUT flag" into udc-dev am: 1a9b6b1470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22418841

Change-Id: I029b4c1ec5a67f1b26b0f4494f8b63e5d177438f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 15:35:56 +00:00
Miranda Kephart
1a9b6b1470 Merge "Remove CLIPBOARD_MINIMIZED_LAYOUT flag" into udc-dev 2023-04-06 15:07:59 +00:00
Bill Yi
34f22849b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1c01456d2e -s ours am: 8e405c51f5 -s ours am: 2fd5e8d6a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I460c5f8a0a5c093e4b2547acbcde9ebc65d92858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:57:10 +00:00
Bill Yi
64d6123ec7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e980f13206 -s ours am: 6c21ff21df -s ours am: a48f3dfda3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab78045da08566d73cb36cef25ec7e785a8c47e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:57:07 +00:00
Bill Yi
e177160e87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3d552257b9 -s ours am: bc9a810f6c -s ours am: c1e9d205c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35b38e7c39f253010b7de0456cd633e7d0bd3ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:56:20 +00:00
Bill Yi
279f6d68c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d49d5c405c -s ours am: 0e2e16c7b7 -s ours am: fd7ede673f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4118cfaf3db976fbcdb2097a508cb557e90bd2b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 14:56:14 +00:00