Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
756,778 Commits 3 Branches 0 Tags
3f9c2017f6b7c1f2f586bf495c2913c699dc6271
Commit Graph

756778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucas Silva
3f9c2017f6 Merge "Fix bouncer swipe touch handler" into tm-dev am: 8159eedb16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17387317

Change-Id: Idc34928ee931fd568c0dd5a25a5a51bffcdfd8f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 20:21:33 +00:00
Lucas Silva
8159eedb16 Merge "Fix bouncer swipe touch handler" into tm-dev 2022-03-25 20:07:07 +00:00
Fabian Kozynski
6a30a22ed3 Merge "Fix refresh tile when tile is already listening" into tm-dev am: d1496fc15c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378284

Change-Id: I5b502dae1e266d0c009e529b058f9fd00a13264d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 19:22:54 +00:00
Fabian Kozynski
d1496fc15c Merge "Fix refresh tile when tile is already listening" into tm-dev 2022-03-25 19:18:52 +00:00
Fabian Kozynski
d172969206 Merge changes from topic "presubmit-am-c948a2e6e650456a904dc2877ffdd13a" into tm-mainline-prod 
* changes:
  [automerge] Fix refresh tile when tile is already listening 2p: 0ca203c23c
  Fix refresh tile when tile is already listening
 2022-03-25 19:18:52 +00:00
Aaron Liu
7c8548a2b8 Merge "Bouncer: Remove overlap with shade and bouncer" into tm-dev am: fe4ffe1198 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17339159

Change-Id: I433f26c53c58b5436c78097a5f3d5d7f41b6a3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 19:10:38 +00:00
TreeHugger Robot
af9ba58eee Merge "Remove copied string from symbols.xml" into tm-dev am: 5bfedf550f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17386616

Change-Id: I79f6c6a163bccefa553a7bf6a02d7c4e2ae978dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 19:09:30 +00:00
TreeHugger Robot
00949fbbe3 Merge "Add traces to aid onScreenTuringOn latency debugging" into tm-dev am: 797572d068 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17002568

Change-Id: Ie97323838ff78cf262bfcaf17dd388712d262a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 19:08:48 +00:00
Aaron Liu
fe4ffe1198 Merge "Bouncer: Remove overlap with shade and bouncer" into tm-dev 2022-03-25 19:01:33 +00:00
TreeHugger Robot
5bfedf550f Merge "Remove copied string from symbols.xml" into tm-dev 2022-03-25 18:59:15 +00:00
TreeHugger Robot
0ca6c76ea4 Merge changes from topic "presubmit-am-218000508aaf47d2b61c6061d6c83dc7" into tm-mainline-prod 
* changes:
  [automerge] Remove copied string from symbols.xml 2p: a75f770eca
  Remove copied string from symbols.xml
 2022-03-25 18:59:15 +00:00
TreeHugger Robot
797572d068 Merge "Add traces to aid onScreenTuringOn latency debugging" into tm-dev 2022-03-25 18:48:21 +00:00
Miranda Kephart
878b3d2298 Merge "Align clipboard text editor with mocks" into tm-dev am: b07646b6e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17379573

Change-Id: Ib17c30027240e8fd672877d85d9e8de661d7d51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:19:30 +00:00
Ayush Sharma
9458bc8615 [automerger skipped] Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e am: 140e9ba400 am: dccb882c22 -s ours am: 25011357e7 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Ibdd5730897039926894fc792f0d7d91a041be8a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:19:15 +00:00
Kohsuke Yatoh
8fe02d2af2 Merge "Move FEATURE_IME to TestApi" into tm-dev am: 5eae33da58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17312285

Change-Id: I150c8947755381d1f4819782fa74b3c4253ee368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:17:40 +00:00
Miranda Kephart
b07646b6e3 Merge "Align clipboard text editor with mocks" into tm-dev 2022-03-25 18:07:48 +00:00
Miranda Kephart
a0491f248e Merge changes from topic "presubmit-am-fc678d3c881c4b0dae8f067ca6b975e4" into tm-mainline-prod 
* changes:
  [automerge] Align clipboard text editor with mocks 2p: a2dbd10545
  Align clipboard text editor with mocks
 2022-03-25 18:07:48 +00:00
Ayush Sharma
25011357e7 [automerger skipped] Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e am: 140e9ba400 am: dccb882c22 -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Iecf7dfa231350f32f198e378ddd97928e8a0befe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 18:02:45 +00:00
Kohsuke Yatoh
5eae33da58 Merge "Move FEATURE_IME to TestApi" into tm-dev 2022-03-25 17:58:40 +00:00
Ayush Sharma
dccb882c22 Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e am: 140e9ba400 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: I5696d3b8559a90400b2b9c2112418bf8d3f96045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:47:06 +00:00
Corina Grigoras
eec73176fa [automerger skipped] Merge "Move UiEventLogger interface to modules-utils." into sc-mainline-prod am: 595d50d354 -s ours am: 39bd9e7b46 -s ours 
am skip reason: Merged-In I27ebffa6817575f1377beb80f4092287d9b12c49 with SHA-1 9629248c81 is already in history

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

Change-Id: Ieaa72a09cd36dd55e69cc8477e3398a00d61b595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:40:08 +00:00
Ayush Sharma
3c94036f68 [automerger skipped] Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: 52b816c77b -s ours am: eaa3f003af -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Id618e7428ad52b4d409ec32da3006235c3903d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:39:15 +00:00
Corina Grigoras
39bd9e7b46 [automerger skipped] Merge "Move UiEventLogger interface to modules-utils." into sc-mainline-prod am: 595d50d354 -s ours 
am skip reason: Merged-In I27ebffa6817575f1377beb80f4092287d9b12c49 with SHA-1 9629248c81 is already in history

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

Change-Id: Ic94b318f993b7ba84b65e70ee6a348173229faff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:32:54 +00:00
Ayush Sharma
140e9ba400 Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: eba9a7f06e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17343925

Change-Id: Ia6430a6ec27185f33c08cd8120f9fa485370192d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:32:15 +00:00
Ayush Sharma
eaa3f003af [automerger skipped] Fix security hole in GateKeeperResponse am: 658c53c47c am: efb797700e am: d06ee6d79d am: 40a1fd6bba am: 65897f0efc am: 52b816c77b -s ours 
am skip reason: Merged-In Ida28d611edd674e76ed39dd8037f52abcba82586 with SHA-1 46653a91c3 is already in history

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

Change-Id: Ia5f8015f33e5b8c423707124d4bcd6cb4252b750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:32:09 +00:00
Lucas Silva
dd7c3c3b0c Merge "Update dream blur and fade to match the bouncer scrim" into tm-dev am: a74c7f66aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17351485

Change-Id: I410c8388c915e0340e20aaa22bf26593e060ae3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:31:35 +00:00
Kohsuke Yatoh
c761214ac3 Merge "Add NotificationTest." into tm-dev am: 39a5d5bb17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16998231

Change-Id: I0ba35df3195d72cb30cbfb64f57dd32749fea399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:31:12 +00:00
Lucas Silva
a74c7f66aa Merge "Update dream blur and fade to match the bouncer scrim" into tm-dev 2022-03-25 17:30:47 +00:00
Kohsuke Yatoh
39a5d5bb17 Merge "Add NotificationTest." into tm-dev 2022-03-25 17:25:03 +00:00
Corina Grigoras
1953aee2b5 [automerger skipped] Merge changes from topic "cherrypick-cherrypick-uievent-move-master-psh3rlonw7-h8mtjk3k65" into tm-dev am: f80d01428a -s ours 
am skip reason: Merged-In I27ebffa6817575f1377beb80f4092287d9b12c49 with SHA-1 cbc4d681e7 is already in history

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

Change-Id: Id2251ca65b03f16bb1df45f053d2eb358ed943f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:22:57 +00:00
Presubmit Automerger Backend
6e9a4ca726 [automerger skipped] [automerged blank] Move UiEventLogger interface to modules-utils. 2p: 9629248c81 am: d4528d9173 -s ours 
am skip reason: Merged-In I27ebffa6817575f1377beb80f4092287d9b12c49 with SHA-1 cbc4d681e7 is already in history

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

Change-Id: Ie3115b6563b09e4654c6241df195fc47c0b258a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:22:29 +00:00
Lucas Silva
383986e440 Merge "Implement bouncer fade-in animation over dreams." into tm-dev am: 2d5bd43b11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17225606

Change-Id: Iabd01f3bc9012f93052fc428602f26fd857118cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:19:20 +00:00
Lucas Dupin
41d086a173 Merge "Add Hawk to OWNERS 🦅" am: 9c178778df am: 996b96f0e3 am: d55b1074c2 am: ef47207112 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2043585

Change-Id: I8166c6ccabd15fa2cc008b3826e11902a38da98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:19:12 +00:00
Remi NGUYEN VAN
b5e9591547 [automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e903f -s ours am: fb39ec4221 -s ours am: 5312a5ef85 -s ours am: 8b727bd1bc -s ours 
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

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

Change-Id: Ib82a2634924417c7a2db5ee24d306cced18b1459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:18:51 +00:00
Remi NGUYEN VAN
3e85c41d59 [automerger skipped] Remove stale aidl-export references am: d386543a34 -s ours am: db05a43860 -s ours am: abd2ee719d -s ours am: a26b703d8f -s ours 
am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46ad is already in history

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

Change-Id: Iab6698e97b0c8f05db69269b2b99c9011be64472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:18:49 +00:00
Automerger Merge Worker
de6ddb1f0c Merge changes from topic "am-f3ac806bba6c4b3580f671ae01e97363" into tm-dev am: 9ab1b5c301 -s ours 
am skip reason: Merged-In I7254da424bce3df7bf4c4a3e1a5076656b7b2f18 with SHA-1 235814bb0b is already in history

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

Change-Id: Ie79b929adca7d413a8f6d6a826e6517ee41144b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:18:31 +00:00
Remi NGUYEN VAN
97cc623637 [automerger skipped] Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534e2 am: c8e6f29a28 -s ours am: 300375a306 -s ours 
am skip reason: Merged-In I7254da424bce3df7bf4c4a3e1a5076656b7b2f18 with SHA-1 235814bb0b is already in history

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

Change-Id: I1b0ff9b30af92ebf12afe984e84cff167fb94b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:18:26 +00:00
Corina Grigoras
595d50d354 Merge "Move UiEventLogger interface to modules-utils." into sc-mainline-prod 2022-03-25 17:18:19 +00:00
Corina Grigoras
f80d01428a Merge changes from topic "cherrypick-cherrypick-uievent-move-master-psh3rlonw7-h8mtjk3k65" into tm-dev 
* changes:
  [automerged blank] Move UiEventLogger interface to modules-utils. 2p: 9629248c81
  Move UiEventLogger interface to modules-utils.
 2022-03-25 17:18:19 +00:00
Kweku Adams
da84fbcd4e Merge "Avoid crash when resetting defaults." into tm-dev am: 637f7d57b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17261668

Change-Id: I5592290b995ec6f72ecb14529947b85baef31f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:18:06 +00:00
Sharon Su
dd2fe414e2 [automerger skipped] Merge "Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API." into tm-dev am: affee4a5e1 -s ours 
am skip reason: Merged-In Ie12b570f1e6400ab9e289b882e5821921a609e0a with SHA-1 bb146eff49 is already in history

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

Change-Id: I093d76508433074d3b4780f85e34805d7a6b2348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:17:55 +00:00
Mady Mellor
02585f82ab Merge "Make sure to update the manage button click listener after rotation" into tm-dev am: e8756a5689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391540

Change-Id: Icdca8b172ad1eec0421e1413053e6c31b4f72738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:17:31 +00:00
Joshua Mccloskey
475908cae6 Merge "Removed haptic from udfps enrollment" into tm-dev am: 882cdf1594 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17313983

Change-Id: I36626fd30124e92f6b8306cf21ecd6d1359967da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:17:04 +00:00
TreeHugger Robot
9544e96700 Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev am: 97e13dbd32 am: a5ea5e2d60 am: acc04270dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348121

Change-Id: Ib91030780df70aef4942b9bc944cb726cd67e177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:16:51 +00:00
Matt Pietal
d8344e5e6d [automerger skipped] Merge "[DO NOT MERGE] Move onDrawn callback earlier" into sc-v2-dev am: 6fea516344 am: 51051d6b20 -s ours am: 30735935d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3fd059be579d2070ed12ed5f421e74c0589fdb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:16:45 +00:00
Bernardo Rufino
e3cb52808c [automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev am: 5bc80b693d -s ours am: 28edb92e7a -s ours am: 4e9903c3f6 -s ours 
am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 a451d5bae2 is already in history

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

Change-Id: Ica176b766cbafc84ca070bf4902730ff92d4b290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:16:33 +00:00
TreeHugger Robot
516e065bf1 Merge changes from topic "Handle_Shutdown_Intent_sc-v2" into sc-v2-dev-plus-aosp am: 077189a93a am: bb2a42d9d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17399032

Change-Id: Ieb1384e57651312eb9d4680ea48d44f9c9a80434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:16:23 +00:00
Cyan_Hsieh
193a82ceee [automerger skipped] [Skip-Merge] [DO NOT MERGE] Do not allow Bluetooth enabling during device 2p: 68ce540e60 am: f0b20bb21f -s ours am: 498819e716 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id05df9b58e780503c11ebd23cc841ddca7e64f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:16:21 +00:00
Matt Pietal
a270010795 Merge changes from topic "presubmit-am-ea4f4574a23a46d2955c3fdbdc2b1120" into sc-v2-dev-plus-aosp am: 5531f47f68 am: a58cb80e5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378326

Change-Id: I7de00d993e01845c6150e6cd8d1b69a9d2300368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:16:11 +00:00
Matt Pietal
956319993f [automerger skipped] [automerge] [DO NOT MERGE] Move onDrawn callback earlier 2p: e2608c01b7 am: 37b7f0479c -s ours am: 5ce8c19eef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69c14fbb1134c7081e3570956495ff5ca9791ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-25 17:16:09 +00:00