Santiago Etchebehere
|
033e62facf
|
Merge "Revert "Revert "Turn on customization flags for dogfood""" into udc-dev am: 9184971e49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21571745
Change-Id: I7402d30a4ca23d13441aceefae90133a46526c2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 15:24:45 +00:00 |
|
Cosmin Băieș
|
0953a8d154
|
Merge "Implement IMMS#mCurFocusedWindowEditorInfo" into udc-dev am: b21456c067
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21521664
Change-Id: Ie135221dc46ac0904c8f03c6d681f38f28e86623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 15:22:49 +00:00 |
|
Santiago Etchebehere
|
9184971e49
|
Merge "Revert "Revert "Turn on customization flags for dogfood""" into udc-dev
|
2023-02-24 14:42:50 +00:00 |
|
Cosmin Băieș
|
b21456c067
|
Merge "Implement IMMS#mCurFocusedWindowEditorInfo" into udc-dev
|
2023-02-24 14:41:04 +00:00 |
|
Adrian Roos
|
4943f6dd08
|
Merge "Add CancellationSignalBeamer" into udc-dev am: c728095ce2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21503928
Change-Id: Id2748e1a698e85ee4f81934ce50a8a6e19e6ae5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 14:26:24 +00:00 |
|
Adrian Roos
|
c728095ce2
|
Merge "Add CancellationSignalBeamer" into udc-dev
|
2023-02-24 13:42:34 +00:00 |
|
Robin Lee
|
e400d30048
|
Merge "Release WallpaperService SurfaceControl directly" into udc-dev am: 4096df103a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21538844
Change-Id: Ia8973bb760d6aa0740d082319e004a19d2a3a7d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 13:00:03 +00:00 |
|
Alexei Nicoara
|
3a2f72710e
|
Merge "Updating rollback OWNERS file" am: feb7fd809a am: 487cebaeb4 am: 1aa06f25cb am: e48eaae2c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453108
Change-Id: Ide4b2cc919ac0c8073473fe3a0bbc45ce8a48166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 12:59:33 +00:00 |
|
Treehugger Robot
|
1b892e5cdd
|
Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d4093f am: 1a7736be63 am: 1d798b51c0 am: 660289f6b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452428
Change-Id: Ib64532cb489fe9f249959f55340f3b292e657841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 12:58:25 +00:00 |
|
Ján Sebechlebský
|
791f4338ff
|
Merge "Refactor virtual display creation and cleanup" into udc-dev am: 940e020a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21538124
Change-Id: I3d5b1872c583355cee77270abe9d090e5fd28ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 12:55:54 +00:00 |
|
Robin Lee
|
4096df103a
|
Merge "Release WallpaperService SurfaceControl directly" into udc-dev
|
2023-02-24 12:50:22 +00:00 |
|
Alexei Nicoara
|
e48eaae2c9
|
Merge "Updating rollback OWNERS file" am: feb7fd809a am: 487cebaeb4 am: 1aa06f25cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453108
Change-Id: I8ad33db8d5e4312859b89543ead424a247cb4216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 12:41:06 +00:00 |
|
Treehugger Robot
|
660289f6b8
|
Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d4093f am: 1a7736be63 am: 1d798b51c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452428
Change-Id: I36dcf2078012c9e77e3ffcd041e8de9734b75483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 12:38:42 +00:00 |
|
Ján Sebechlebský
|
940e020a88
|
Merge "Refactor virtual display creation and cleanup" into udc-dev
|
2023-02-24 12:19:49 +00:00 |
|
Alexei Nicoara
|
1aa06f25cb
|
Merge "Updating rollback OWNERS file" am: feb7fd809a am: 487cebaeb4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453108
Change-Id: Ic3e87341a1b0f702e2d43ee625449ddb9b587043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 11:58:54 +00:00 |
|
Treehugger Robot
|
1d798b51c0
|
Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d4093f am: 1a7736be63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452428
Change-Id: I54bbc031516d3c3d1f2046dc6077d619ad79a56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 11:58:09 +00:00 |
|
Alexei Nicoara
|
487cebaeb4
|
Merge "Updating rollback OWNERS file" am: feb7fd809a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2453108
Change-Id: Ied41e0dc50b6b6d90dc101d7d3e76af2672bcec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 11:18:43 +00:00 |
|
Treehugger Robot
|
1a7736be63
|
Merge "Change the wait time of setDefaultLauncher from 20s to 60s" am: f525d4093f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452428
Change-Id: I962b3d68e98c2185fa6de09472cce83b2b810d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 11:16:54 +00:00 |
|
Robert Shih
|
44f743f3aa
|
Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086 am: 5a297d5d39 am: dd7364cda4 am: 6c4cd643fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000331
Change-Id: I144d94c858e8e19c1d48a5dbab79f4333911bbae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 11:08:02 +00:00 |
|
Alexei Nicoara
|
feb7fd809a
|
Merge "Updating rollback OWNERS file"
|
2023-02-24 10:05:09 +00:00 |
|
Robert Shih
|
6c4cd643fd
|
Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086 am: 5a297d5d39 am: dd7364cda4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000331
Change-Id: I62c714a56b2672173f8b48695090148a58355f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 09:52:25 +00:00 |
|
Robert Shih
|
dd7364cda4
|
Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086 am: 5a297d5d39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000331
Change-Id: I4fae86a16ba18f6a678c0c3bd10cf42545ea06e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 09:15:50 +00:00 |
|
Robert Shih
|
5a297d5d39
|
Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000331
Change-Id: I325b058a8aeb867ef27abe0fc78480bbe393128a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 08:40:49 +00:00 |
|
Yuncheol Heo
|
80bd28fdfb
|
Merge "prevent crash with pin protected user and taskview" am: b98b2c84e7 am: d38aad7979 am: 286f21bd72 am: 189d4f924b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392794
Change-Id: Ib160b074699d813910d711857cc4b3746521f808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 08:05:14 +00:00 |
|
Treehugger Robot
|
f525d4093f
|
Merge "Change the wait time of setDefaultLauncher from 20s to 60s"
|
2023-02-24 07:48:20 +00:00 |
|
Yuncheol Heo
|
189d4f924b
|
Merge "prevent crash with pin protected user and taskview" am: b98b2c84e7 am: d38aad7979 am: 286f21bd72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392794
Change-Id: I04dc836c7cfbb0e6c681fe22b2a6d8cacab66e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 07:31:17 +00:00 |
|
Robert Shih
|
a20d36c086
|
Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc"
|
2023-02-24 07:01:19 +00:00 |
|
Roy Chou
|
b8aab1fee7
|
Merge "feat(#AlwaysOnMagnifier): Add haptic and buffer zone when panning scale to persisted scale" into udc-dev am: 42139e0eba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21551981
Change-Id: I67e429e5e57916346cd02eea2b7c03444104da94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:59:52 +00:00 |
|
Sarah Chin
|
d7eed49100
|
Merge "Adding package name for vendor service verification" into udc-dev am: 29cb4ace10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21551802
Change-Id: I3e09f60ab89d8d6f76b35643e80189ade239c6c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:39:14 +00:00 |
|
Treehugger Robot
|
de8242e70f
|
Merge "Make sure gc_urgent is normal mode, when no need GC" am: 2534f6c8cf am: a513296aa1 am: fcb558372a am: bc34045c05
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2280527
Change-Id: I8dfd7b180c4637f4c17a8166087ef5bfedcc3bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:36:33 +00:00 |
|
Lei Ju
|
3a811e9590
|
Merge "Avoid crashing when no nanoapp preploaded" into udc-dev am: 4ce57312a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21559187
Change-Id: Ibb038f63ba093c8efc8279477b1577f3f4077b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:35:21 +00:00 |
|
Jack Yu
|
608ed4fab7
|
Merge "Added iccid into the debug message" into udc-dev am: 652e98dab3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21571744
Change-Id: I7daf9d84aae383e3ac65c70494b8cbf92e33e3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:34:25 +00:00 |
|
Yuncheol Heo
|
286f21bd72
|
Merge "prevent crash with pin protected user and taskview" am: b98b2c84e7 am: d38aad7979
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392794
Change-Id: I7962884ac3d02213eeec4e82df66bb705e081a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:33:53 +00:00 |
|
TreeHugger Robot
|
c8a9905ac8
|
Merge "Refactor origin to request object for the credential manager privilege APIs" into udc-dev am: eda0bf7f8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21487335
Change-Id: If428c281685e89bd16b344c1a9b1f78a9d79e28b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:32:14 +00:00 |
|
Felipe Leme
|
a2de495346
|
Merge "Refactored ExtendedMockitoTestCase into ExtendedMockitoRule" into udc-dev am: d2485b0bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21529499
Change-Id: Ib453a3372b2140207923d2ab074950764d0e605e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:25:27 +00:00 |
|
Jerry Chang
|
efc5e2347a
|
Merge "Support split resizing while showing floating IME panel" into udc-dev am: 0bfa21fe50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21505341
Change-Id: Ib93bc445164c2686660fc0204d974aab4103d8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:24:57 +00:00 |
|
Jack Yu
|
3c8bfedb9a
|
Merge "Do not crash clients when service is not available" into udc-dev am: 5434a53c8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21574159
Change-Id: Ib1768abaa49f6c3a11c21525528e6195e364a6f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:22:19 +00:00 |
|
Wei Sheng Shih
|
7ef25ad127
|
Merge "Adjust cancel back navigation conditions." into udc-dev am: 67182c205b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21470967
Change-Id: I8e57e7c5c2f14e0447a7677e64ee8ddfae54f4d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:21:32 +00:00 |
|
Prabir Pradhan
|
0d70ee210f
|
Merge "Show pointer_location for all users" into udc-dev am: 431d2f1d47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21571743
Change-Id: I672a3104ccc1bb6fe0fb76ea7cd02cbdcdb7a307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:20:31 +00:00 |
|
Jackal Guo
|
b1a1699f9a
|
Merge "Update javadoc of requestUserPreapproval" into udc-dev am: d299a002c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21534048
Change-Id: I2a2804d5f24703c8746947ffa765d1b0b7b10d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:19:50 +00:00 |
|
Austin Borger
|
a8ecaa011b
|
Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into udc-dev am: 1a03b253e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21497448
Change-Id: I4f63285efed6d08d02bebfce8a6fff6e1de07290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 06:19:07 +00:00 |
|
Roy Chou
|
42139e0eba
|
Merge "feat(#AlwaysOnMagnifier): Add haptic and buffer zone when panning scale to persisted scale" into udc-dev
|
2023-02-24 05:46:55 +00:00 |
|
Yuncheol Heo
|
d38aad7979
|
Merge "prevent crash with pin protected user and taskview" am: b98b2c84e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392794
Change-Id: Ia34c039c671c727e5d5b179faef5ee58857ce87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 05:43:09 +00:00 |
|
Sarah Chin
|
29cb4ace10
|
Merge "Adding package name for vendor service verification" into udc-dev
|
2023-02-24 05:31:28 +00:00 |
|
Shuzhen Wang
|
c5cbe35d2d
|
[automerger skipped] Merge "Camera: document multiResolution raw behavior" am: ae41acbe90 am: 9a6f2a0f51 am: 31a6be686e -s ours am: 79ecdf41ce -s ours
am skip reason: Merged-In I24269dd63c6f354a53c39de513a140907a0e41d2 with SHA-1 b59f57a033 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2452865
Change-Id: Ie64a523c40fd404a7b65d4ca1e15d12dd1901e58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 05:13:15 +00:00 |
|
David Zhao
|
1f32e9dffa
|
Merge "Use obtainMessageO for sendTimeShiftMode" into udc-dev am: 20ef7d676a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21530991
Change-Id: Ie6548ecc02aa67d3c82a893155faf4a71c6e36c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 05:12:34 +00:00 |
|
TreeHugger Robot
|
2e8d43a559
|
Merge "Cleaned up the deprecated APIs" into udc-dev am: eabe0a59f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21543753
Change-Id: I4af6e3720e996ed8bc1e56a9bded309613d32789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 05:12:16 +00:00 |
|
Automerger Merge Worker
|
6241d6001b
|
Merge "Limit length and number of MIME types you can set am: 3ae3406b97 am: d47de97f03 am: bcd7713fad am: b160218b16 am: 57d99cca61 am: a370b4a47e" into udc-dev am: 502d72fc04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19785208
Change-Id: I7be0bb26fda436d1fabce4a1c12fedd9a6041b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 05:11:57 +00:00 |
|
Kunal Malhotra
|
df59ce6c52
|
Merge "Fixing possible NullPointerException" into udc-dev am: d45d287761
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21550086
Change-Id: I584fd4e3a98b5e676ab7b4113a524eed804417a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 05:09:26 +00:00 |
|
TreeHugger Robot
|
736f4695b6
|
Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e5099 am: 676cefb0ee am: 539fea38c2 am: e13c6379fb am: e456e2f66e am: 06aa91e2ea am: 33a8d8ea07 am: 770eb69f4e am: bc1c17852e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15982545
Change-Id: Ib7dbd94b21b4905a2ee0c4b596174e62fd3e6753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-02-24 05:09:11 +00:00 |
|