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

650569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
eb45bc8a97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b68c209b8a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I256149cac80687019010f10c98d7f22ae9934411
 2021-07-29 19:09:30 +00:00
TreeHugger Robot
0f49f743e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4616377708 -s ours am: c8db043d4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90167305a59c82eef6faf8c44669b5951a04105b
 2021-07-29 19:09:24 +00:00
TreeHugger Robot
3564de1bf4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8e18eeb56e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia105dc693c08305091f1b84d6e3ea1d2238b8809
 2021-07-29 19:09:18 +00:00
Automerger Merge Worker
f8d0c10fe7 Merge "Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a" into sc-v2-dev 2021-07-29 19:09:08 +00:00
TreeHugger Robot
2fc3b447ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 94081b3687 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15fb5826abf3f7dfa200b9a5753a329839c6e70e
 2021-07-29 19:09:04 +00:00
Dave Mankoff
892c552705 Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377083

Change-Id: I06b5e1703c7e6de8f357350ca96c20f633ccbab4
 2021-07-29 19:08:54 +00:00
Dave Mankoff
54b50f96e8 Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377083

Change-Id: I71d5e8f2d4423a01ddc17dbefa9c92e406e711af
 2021-07-29 19:08:50 +00:00
Kweku Adams
0c4349edb2 Merge "Address sorting edge case." into sc-dev am: ab3f902ccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392295

Change-Id: Ia4f9f742cb2a84b8e94bca7b94b0b07399d27ccf
 2021-07-29 19:08:21 +00:00
TreeHugger Robot
94557a7e3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6dba3bc1e6 -s ours am: 06a68d9a72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f2409cf6e33dc6cce2ff305c46446fdff69cc45
 2021-07-29 19:08:15 +00:00
Bill Yi
37db129380 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 468621bab9 -s ours am: bad6f056f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I098a724ad5a4975c51f90393999fdc05bd92a959
 2021-07-29 19:08:11 +00:00
Bo Liu
83a2968876 Merge "ADPF: Handle preferred interval on unsupported device" into sc-dev am: 047d3ba17a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392128

Change-Id: I6915cbd3fd1e54c49fb6c93b2069cafb88b501b7
 2021-07-29 19:08:07 +00:00
TreeHugger Robot
a231b5efb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 27e6215f16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d5af73f4fef0188e456ba6fd1825418b976fe45
 2021-07-29 19:07:54 +00:00
Jeff Sharkey
4ef89ede2f Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: I78badb0a5e3abd12c5306489eb89d4f7412d3527
 2021-07-29 19:07:45 +00:00
Lyn Han
8fe507e6d9 Merge "Cancel existing QsClippingAnimation when creating new one" into sc-dev am: ea1871c7d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390005

Change-Id: Ied83d9a5a49874c93532ec2113020ffb9d5c9a46
 2021-07-29 19:07:17 +00:00
Adam He
0d093f0328 Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681

Change-Id: I8bcd5f7d301668d7895710b8277be25292456886
 2021-07-29 19:06:39 +00:00
Julia Reynolds
e6e7e0470b Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393660

Change-Id: Ie80eb676bd9771d38a71c72839a98b4dd0724de3
 2021-07-29 19:06:18 +00:00
Jason Chang
47abd6c2b2 Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613

Change-Id: I1cba57040d1b3d78a096f8336359fd0e3d64e52f
 2021-07-29 19:06:03 +00:00
Peter Kalauskas
dd14d69322 Merge "Move guest creation to background thread" into sc-dev am: 2599b29073 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373286

Change-Id: I7a2b35294a56132834da0809b04034a94535d6f7
 2021-07-29 19:05:36 +00:00
Bill Yi
772e546d9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours am: c78d905228 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc86f80acf64c374c18655c00b58301e01126bbe
 2021-07-29 19:05:02 +00:00
Jeff DeCew
71588f71c4 Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392213

Change-Id: I9057c9d59239eb42a53c07a8f53e4b382a72b91b
 2021-07-29 19:04:56 +00:00
Sergey Volnov
f1d2441d74 Merge "Fix content capture not being usable from hotword detector." into sc-dev am: 78456de866 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379071

Change-Id: I92eb770088aab0356e0510040eaf5f55c6e559d6
 2021-07-29 19:04:17 +00:00
Alex Buynytskyy
dcbf05475e Merge "Check for invalid (negative) string pool pos." into sc-dev am: 59bad728e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390628

Change-Id: Ie08ac7e816b906c224e0ee4ac573286535fa1ec6
 2021-07-29 19:03:50 +00:00
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