Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
662,279 Commits 3 Branches 0 Tags
448d2ced848965315fc4582df549609eabb6becd
Commit Graph

662279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Beverly Tai
448d2ced84 Merge "Only set userHasDeviceEntryIntent on keyguard" into sc-dev am: ebe9e34fbb am: 569f11095c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403138

Change-Id: I5fef5ec37609bba8fcaaef684691e61635b814a9
 2021-07-29 19:46:17 +00:00
TreeHugger Robot
8530d3aea2 [automerger skipped] Merge "Fix ANR when switching the app task but IME selection dialog focused" into sc-dev am: 1181f3e9aa am: 5a711d321e -s ours 
am skip reason: Merged-In Iae3dd713b1e980067d28debea4e0a03707aa7938 with SHA-1 14f2c733b1 is already in history

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

Change-Id: I32372eb34d7996047999aa457aba7bc430f2c0ac
 2021-07-29 19:45:30 +00:00
Benedict Wong
af3e183b1d [automerger skipped] Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" into sc-dev am: 9eee7d3f29 am: 66657e13ee -s ours 
am skip reason: Merged-In I3a298a6c4c594c6e224f3f05764614802c00e9b0 with SHA-1 8d35744f98 is already in history

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

Change-Id: Ia25f78a1fdc0d18cb7d403127ede8ecfcc606eb0
 2021-07-29 19:44:56 +00:00
Arthur Hung
df70e8f55a Merge "Keeps power key intercepted during a panic gesture" into sc-dev am: 4ee67cf14e am: c51bd5ff66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389276

Change-Id: Ic99a85dc98223eb828bd2cd2fda6401cfe41f3f0
 2021-07-29 19:43:23 +00:00
Sungsoo Lim
67ea6dd350 Merge "Revert "[Media ML] Replace AudioSystem.isActiveStream"" into sc-dev am: 75fa0482a6 am: 974009717b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390764

Change-Id: I86f16c090af6f12be87b8c055da4edc50760fe71
 2021-07-29 19:43:00 +00:00
Automerger Merge Worker
8ad22adfda Merge "Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5" into sc-v2-dev am: 3ec46b45fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: I964519b59012def1920f9fdbabefb9f01186fa1f
 2021-07-29 19:42:17 +00:00
Hai Zhang
2804da85eb Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5 am: 0f17f27c77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: Ia697794a85e18248eb5e49d36bb038402c20f6a4
 2021-07-29 19:37:28 +00:00
Sungsoo Lim
d835195742 Merge "Do not pass the volume key event to remote sessions" into sc-dev am: f408df6338 am: bdaac48125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373618

Change-Id: I084845e05dc4eebdcef8ad4a9ca25f6e67edf05a
 2021-07-29 19:37:05 +00:00
Guojing Yuan
405f9ff870 Merge "Add permission check while creating CompanionDeviceService" into sc-dev am: dfa9b3058f am: a1c41c4616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394690

Change-Id: Ia8b071b7fb93447627fdc023b160fa99ad1b4967
 2021-07-29 19:36:47 +00:00
TreeHugger Robot
126ee1ee2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b68c209b8a -s ours am: eb45bc8a97 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

Change-Id: Ib7c28d2f00544fdeb0fdc24df9bc42d48f9c6ee9
 2021-07-29 19:36:11 +00:00
Automerger Merge Worker
7d563042a6 Merge "Merge "Don't use Primary sensor when Secondary available." into sc-dev am: 00f16a796a" into sc-v2-dev am: f8d0c10fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377083

Change-Id: Ic16a9c00d913137b6a9c69d11d00afef419987ff
 2021-07-29 19:36:00 +00:00
TreeHugger Robot
6de4b47e9b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 94081b3687 -s ours am: 2fc3b447ef -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I408c1a9c59796605bbd2a34c453c9c66f1e1f29b
 2021-07-29 19:28:18 +00:00
Amruth Ramachandran
63a17e9b6c [automerger skipped] Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" into sc-dev am: 4afa9546f9 am: 4f60b263bc -s ours 
am skip reason: Merged-In I1225a1429ff77b33c54af0dfce60a8739494e47a with SHA-1 e5225ba858 is already in history

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

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

Change-Id: Ib5681a1e9028e5ecea42a3dbf92658e230b8b0f1
 2021-07-29 19:26:40 +00:00
Beverly Tai
569f11095c Merge "Only set userHasDeviceEntryIntent on keyguard" into sc-dev am: ebe9e34fbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403138

Change-Id: I0f47940691488dc6b57207f4510051f3884e6155
 2021-07-29 19:14:17 +00:00
TreeHugger Robot
5a711d321e Merge "Fix ANR when switching the app task but IME selection dialog focused" into sc-dev am: 1181f3e9aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15398716

Change-Id: Ib9ff638ecba68afd01a9a74d2cd8a6b507d94445
 2021-07-29 19:13:55 +00:00
Benedict Wong
66657e13ee Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" into sc-dev am: 9eee7d3f29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15344043

Change-Id: I95583dcea69d627eefc6074f50efd0f152d7b7d6
 2021-07-29 19:13:30 +00:00
Arthur Hung
c51bd5ff66 Merge "Keeps power key intercepted during a panic gesture" into sc-dev am: 4ee67cf14e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389276

Change-Id: I4ec95e79561cd1fe82b9f5075119f94f5d1b8b1d
 2021-07-29 19:12:53 +00:00
Sungsoo Lim
974009717b Merge "Revert "[Media ML] Replace AudioSystem.isActiveStream"" into sc-dev am: 75fa0482a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390764

Change-Id: I5d0e0e4a06327f4b26add392f226d000f14e21fb
 2021-07-29 19:12:35 +00:00
Automerger Merge Worker
3ec46b45fa Merge "Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5" into sc-v2-dev 2021-07-29 19:12:28 +00:00
Hai Zhang
624b9edc31 Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: I70bd4b157bd66e794c0f9321ec83ef845b318b44
 2021-07-29 19:12:19 +00:00
Hai Zhang
0f17f27c77 Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2ad5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302018

Change-Id: I1bf40fe706b0f03443a8a6fbb6e8c84b0fa44402
 2021-07-29 19:12:13 +00:00
Sungsoo Lim
bdaac48125 Merge "Do not pass the volume key event to remote sessions" into sc-dev am: f408df6338 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373618

Change-Id: Ibb3cdc53587dbefdc440fe3a2b5771d288865d0e
 2021-07-29 19:09:58 +00:00
Guojing Yuan
a1c41c4616 Merge "Add permission check while creating CompanionDeviceService" into sc-dev am: dfa9b3058f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394690

Change-Id: I320a13ba3a56fcb766e37e08909540f153816b3d
 2021-07-29 19:09:43 +00:00
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
Michał Brzeziński
c9a49c10f6 Merge "Making mirror slider appear when brightness slider is used in split shade" into sc-v2-dev am: 21cb5e5b4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328600

Change-Id: I94679539cc5fef0ed56220d27b34f4d8da321751
 2021-07-29 19:08:35 +00:00