Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
650,505 Commits 3 Branches 0 Tags
4f60b263bc339d04c7628cd05f545cf03f8e9e99
Commit Graph

650505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amruth Ramachandran
4f60b263bc Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" into sc-dev am: 4afa9546f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373617

Change-Id: Iafaf28b4fea42d73c3de2fbc995e1c2f4865bf43
 2021-07-29 19:03:29 +00:00
Vadim Caen
44823207a4 Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am: ee08a68fd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175437

Change-Id: I99c182334636b3c9ce7bdc24b910d1b99bddb93a
 2021-07-29 19:02:27 +00:00
Michał Brzeziński
21cb5e5b4b Merge "Making mirror slider appear when brightness slider is used in split shade" into sc-v2-dev 2021-07-29 18:49:37 +00:00
András Klöczl
4c80c3bda3 Merge "Add new shell commands for DeviceStateChanged CTS test" into sc-v2-dev 2021-07-29 18:17:19 +00:00
Dave Mankoff
4f82ace23f Merge "Move KeyguardStateController.Callback to field of StatusBar." into sc-v2-dev 2021-07-29 18:00:23 +00:00
Chilun Huang
5eb2ccc35b Merge "Remove flaky annotation" into sc-v2-dev 2021-07-29 08:36:46 +00:00
Riddle Hsu
d22fc3ee09 Merge "Revert "Add interval for relayout perf test"" into sc-v2-dev 2021-07-29 04:08:39 +00:00
Riddle Hsu
cc13d40599 Revert "Add interval for relayout perf test" 
This reverts commit 9ba705609f.

Reason for revert: The metrics become unstable
Bug: 129527548

Change-Id: If1b9368eb55b124a8d66f06c82de193e4ddb9318
 2021-07-29 04:08:27 +00:00
Chilun
da52a50220 Remove flaky annotation 
The flakewas fixed by ag/15353756, so remove the annotation.

Bug: 194242735
Test: atest ActivityThreadTest
Change-Id: Ia6e3eda250a0b54a2027d16f6e51887c85ac8f95
 2021-07-29 04:03:35 +00:00
Louis Chang
ed544a3473 Merge "Allow embedding activities cross apps" into sc-v2-dev 2021-07-29 01:47:00 +00:00
Jeff Chang
e1fdf43e2a Merge "Fix the leak while remove the taskFragment" into sc-v2-dev 2021-07-29 01:28:25 +00:00
Dave Mankoff
f5da4bd267 Move KeyguardStateController.Callback to field of StatusBar. 
Bug: 190746471
Test: manual
Change-Id: I6a2663ba37d7a94574e3d43403dca9616586ca3d
 2021-07-28 21:13:07 -04:00
Dave Mankoff
2f74dacda9 Merge "Move StatusBar.DemoMode to separate class." into sc-v2-dev 2021-07-29 00:57:57 +00:00
Dave Mankoff
94e516ab57 Merge "Remove DemoMode Interface from StatusBar" into sc-v2-dev 2021-07-29 00:57:38 +00:00
Andras Kloczl
75eddd350e Add new shell commands for DeviceStateChanged CTS test 
For the new CTS test for DeviceStateChanged metric we
need commands with simple outputs to determine the current
device state and the supported states.

Bug: 181542365
Test: flash device with framework changes then $ atest DeviceStateStatsTests
Change-Id: Icb2e755e258f8c3dba3aed34b37cdb7295df5434
 2021-07-28 22:45:32 +01:00
Evan Rosky
58fd4834b9 Merge "Enable keyguard remote animation when WMShell is used." into sc-v2-dev 2021-07-28 20:37:38 +00:00
Rubin Xu
384e3586f6 Merge "Stop managed profile owner granting READ_SMS" into sc-dev am: 28e4c5d57a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371691

Change-Id: I0d9242aa9682a7bfa8ff972ebd4356160e23fce3
 2021-07-28 18:29:27 +00:00
Mingming Cai
23ba83b769 Merge "Fix CQI range in CellSignalStrengthNr" into sc-dev am: 2d5cbc5d2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394377

Change-Id: I6fa423ff94b7961e3811e226159cf36f2db8a418
 2021-07-28 18:27:31 +00:00
TreeHugger Robot
fe8265d540 Merge "Prevents scroll capture from targetting secure windows" into sc-dev am: 7ee0307aed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374948

Change-Id: Ib82bb7493168be0477f6631f41eca24e7bead5b9
 2021-07-28 18:27:15 +00:00
Peter Kalauskas
11b8259c10 Fix crash when running UserSwitcherControllerTest am: f69d25f7f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15363327

Change-Id: I5d100df3cbbd7b2941e2ef9e7566dd0d399817f0
 2021-07-28 18:26:47 +00:00
Peter Kalauskas
25ba224a67 Add tests for guest user metrics am: 7c060b2951 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13959153

Change-Id: I9cc6353daa0653e02ba2d80651496f706b41c309
 2021-07-28 18:26:37 +00:00
TreeHugger Robot
f982f4d57e Merge "Add ART's module-lib to "module_current"" into sc-dev am: d1ccddb79a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15391790

Change-Id: Ibef82b2ea6117cb4db70a3b157e8831f50aa0b3c
 2021-07-28 18:26:23 +00:00
Daniel Sandler
2f9eb3749a Merge changes from topic "egg-finally" into sc-dev am: a380ffbff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389098

Change-Id: Ib44ef0b0a8ee383c8c9eff35f8e8804247da01cc
 2021-07-28 18:25:56 +00:00
Kevin Chyn
8453590498 Merge changes from topic "facemanager-bypassflag" into sc-dev am: 88a506aad4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377220

Change-Id: I7d27fc16814e25da0d0b5eaa92d43073aedb8d42
 2021-07-28 18:25:42 +00:00
Josh Tsuji
c06c8b5769 Merge "Reset to LiftReveal when going to sleep due to timing out, after a biometric auth." into sc-dev am: 7db2ece5c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362342

Change-Id: I2c57d9a8da7656a0219fdc5f67355a1df72a1331
 2021-07-28 18:25:24 +00:00
Siim Sammul
76b63d54cf Merge "Do not make a getThreadTimeMicro() call when it is not needed. This was accidentally changed with https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080830" into sc-dev am: 6c852aeabc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15346904

Change-Id: Ibaae003e403fc6d20002a62241ec23a0fa97f2ce
 2021-07-28 18:25:11 +00:00
Shubang Lu
2233656aa0 Merge "Change default value from NONE to UNKNOWN" into sc-dev am: 8e31f85e02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377214

Change-Id: Id8efdbbf549be60cf2ba769b2cceafdba239b1ac
 2021-07-28 18:24:32 +00:00
Ahaan Ugale
342d24c807 Merge changes I212ad58c,Idf5dd82d into sc-dev am: 0e3d3b90ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15360457

Change-Id: I9175ddb251f30c0eaff0e3549e7bd31f28d40623
 2021-07-28 18:24:20 +00:00
Alison Cichowlas
7bed52f477 Merge "Sharesheet: remove 2 separators, restyle the 3rd." into sc-dev am: 832779a555 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377016

Change-Id: I37ce8ef56bc0cb8efd24e899406f30b7242738ae
 2021-07-28 18:24:05 +00:00
Evan Severson
28a1e08250 Merge "Update mic/cam quicksetting toggles when user changes" into sc-dev am: 4e09234999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365189

Change-Id: Ic39ae9f48e20b8ecdb1b10c9b19d7232aadbe661
 2021-07-28 18:23:54 +00:00
TreeHugger Robot
aae31da438 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ef631b164a -s ours am: f4b27a4b99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84fb747bfd74a2f91f6e134fb1a128e0f9ee3046
 2021-07-28 18:23:46 +00:00
TreeHugger Robot
d562ea23f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 610c28b301 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b0f717f5fd2b15cc18a61aef2aefecb9c5e73eb
 2021-07-28 18:23:39 +00:00
TreeHugger Robot
5365402f04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bc138220ac -s ours am: db0c120536 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bb7c3b7fc3ddc5c6b345a35238c1e757bae9ea0
 2021-07-28 18:23:32 +00:00
Andrii Kulian
ef81c4557f Merge "Avoid re-adding to existing split" into sc-v2-dev 2021-07-28 18:23:30 +00:00
TreeHugger Robot
e2a6ff20d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9f54adfa3f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cd8e8011602d606b39591dd30f858529d49b3c3
 2021-07-28 18:23:25 +00:00
Ahaan Ugale
16fc973412 Merge "Add null pointer check for callback in HotwordDetectionConnection." into sc-dev am: f569f09b5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15327988

Change-Id: I5242bff4f029d1c213218ba3abff13de4bf0561b
 2021-07-28 18:23:15 +00:00
Ahaan Ugale
affd1add48 Merge "Copy ContentCaptureOptions into derived Contexts" into sc-dev am: 2db19f5679 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15352571

Change-Id: Ib07e5a19501d5d54e4dfa4732cf2cb3ce119a898
 2021-07-28 18:22:38 +00:00
SongFerng Wang
242f8871fe Merge "Modify KEY_LTE_ENDC_USING_USER_DATA_FOR_RRC_DETECTION_BOOL's description" into sc-dev am: 75b43af58b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359955

Change-Id: Ic373a393c23fbebb8d453c2358bdd96a5a0b0071
 2021-07-28 18:22:14 +00:00
TreeHugger Robot
d3a95b5c2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6791bf04cd -s ours am: 23ff9d219d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12e40bcca7a7ffd09940cab4594c093c37ec2958
 2021-07-28 18:22:03 +00:00
TreeHugger Robot
dc4ec554fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2db4ed1e36 -s ours am: 4ee05ca9db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie34afb92f8381d6d8bb33ba93cc91ff849db6272
 2021-07-28 18:21:55 +00:00
Howard Chen
a7bb915780 Merge "Fix test harness mode" into sc-dev am: c11f9eca7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359967

Change-Id: I2569bc149ec82a511e775e017400ccc5d3c71b65
 2021-07-28 18:21:33 +00:00
TreeHugger Robot
d36bce805a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 03fb5e1e37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac41079725e75d87b2b3ffa8231ed3393c37d1fe
 2021-07-28 18:20:58 +00:00
Benedict Wong
e9c9dbd190 Merge "Shorten safe mode timer in VCN test mode" into sc-dev am: 6ad35a74d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15375749

Change-Id: Id80a40f8a746561f56e6ec05a7810e686bf906de
 2021-07-28 18:20:06 +00:00
TreeHugger Robot
2aec21d970 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6db937667b -s ours am: 783b527615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc5684eba6343882c1e13678dc07bedf6dce9911
 2021-07-28 18:19:50 +00:00
Matt Pietal
e93f3f4864 [automerger skipped] Merge "[DO NOT MERGE] Update controls icon" into sc-dev am: e81cce70ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd4c5bf17cd3c2db3607b6bcd3e5b4a92228e185
 2021-07-28 18:19:41 +00:00
TreeHugger Robot
b4ad263f16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4422d05a6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5459dde9d169056e60cb0de8933b4d858aa7026
 2021-07-28 18:19:27 +00:00
Michael Wachenschwanz
44c5151dbb Merge "Skip flaky AppStandbyTests in presubmit" into sc-dev am: a320be02b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365700

Change-Id: Iac886194b817663a893d3ac58f17ded048ae4a80
 2021-07-28 18:19:18 +00:00
TreeHugger Robot
7175a2b03f [automerger skipped] Merge changes I635afaaf,Icdd62155 into sc-dev am: 9882c62fb4 -s ours 
am skip reason: Merged-In I635afaaf9185c32a9f04851453ac7c0d20612c11 with SHA-1 0abf3cdc5f is already in history

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

Change-Id: I0d919cad347c61b932ef7efd303e626d714f4c35
 2021-07-28 18:18:57 +00:00
Beth Thibodeau
28199ebd7e Merge "Reset alpha of media when not fading" into sc-dev am: d3f247befc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362254

Change-Id: Id6eebef06f6bf8d9c9f74656fa95fcf158a499c1
 2021-07-28 18:18:35 +00:00
Evan Laird
e41a6c8f97 Merge "Remove callback on destroy view" into sc-dev am: 5eed961d53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340303

Change-Id: I759669efd383ed122a61b8b31c88b2cb41977d75
 2021-07-28 18:18:08 +00:00