Commit Graph

751661 Commits

Author SHA1 Message Date
Adam Bookatz
06ef7bf67c Merge "UserManagerService.hasManagedProfile fix" into tm-dev am: 7be5303254 am: 1a16664683
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17012898

Change-Id: Ic5b6428193e76b7f33586bc71da4ebfb6373e7c2
2022-03-02 01:45:13 +00:00
Minche Li
95c0fdbe82 Merge "Waits for windowMagnification connection set when requesting enableWindowMagnification" into tm-dev am: 4eac44bc56 am: fc850412ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996710

Change-Id: I8bca0b93a4f498767ef0023e6184a59c010e11ba
2022-03-02 01:44:21 +00:00
Jackal Guo
01103fb1d1 [automerger skipped] Merge "Mitigate the races during installation" into tm-dev am: b4fd1c7a81 am: 23f61105b7 -s ours
am skip reason: Merged-In Ia6b32f72f3d75b8a40c42e11d21f21c459db5299 with SHA-1 65067cb36d is already in history

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

Change-Id: Icadccf20b87a76fdb2d51bcdbfffc446355d1b5c
2022-03-02 01:43:35 +00:00
TreeHugger Robot
e24a0cfe19 Merge "Fix memory flags in external services and secondary zygotes." into tm-dev am: 951aa29f72 am: a4ef8dfacf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16989014

Change-Id: I7d9b618db1464f2577594980dda7b83bedfe9e44
2022-03-02 01:42:26 +00:00
Colin Cross
df7420dae6 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 am: ffa0f38936 am: 4c7fba2811 am: 86db26a61f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I1b60496622945f905bb8c74c07118ada27fbb6ae
2022-03-02 01:40:51 +00:00
Binh Nguyen
44f9c0f24f Merge "Register AdServices to SystemServiceRegistry" into tm-dev am: cdda832572 am: 05df4ed425
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033848

Change-Id: I1be23fee950a4faf54089c5e6e674743ec00cb71
2022-03-02 01:29:59 +00:00
Adam Bookatz
1a16664683 Merge "UserManagerService.hasManagedProfile fix" into tm-dev am: 7be5303254
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17012898

Change-Id: I2897d518eda117b2a04fc46643af56ee7f273062
2022-03-02 01:22:39 +00:00
Daniel Hsieh
711ba689bb Merge changes from topics "presubmit-am-8e1f6f3832184ab4980013d926d31388", "presubmit-am-a0b2814b27254513b7a62e0a1e0044ff" into tm-dev am: 6f06d92d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17010923

Change-Id: Id2f1e796c03fc90f14c5e2149fd477f92ad33d4d
2022-03-02 01:22:26 +00:00
Minche Li
fc850412ec Merge "Waits for windowMagnification connection set when requesting enableWindowMagnification" into tm-dev am: 4eac44bc56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996710

Change-Id: I114d66e29195d4d79025941d25d4ba80f3253531
2022-03-02 01:22:12 +00:00
Jackal Guo
23f61105b7 Merge "Mitigate the races during installation" into tm-dev am: b4fd1c7a81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961348

Change-Id: I8bd302486a8b965cc1856b6f2eab93248a834081
2022-03-02 01:21:52 +00:00
Adam Bookatz
0c777da034 Merge "UserManagerService.hasManagedProfile fix" into tm-dev am: 7be5303254
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17012898

Change-Id: Ibfc44b9cde2af418edc544552c52ce2386eee1c9
2022-03-02 01:21:47 +00:00
Minche Li
22d969b913 Merge "Waits for windowMagnification connection set when requesting enableWindowMagnification" into tm-dev am: 4eac44bc56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16996710

Change-Id: Id53ac889cae9d9274aba9075f394ffc681d38a9b
2022-03-02 01:21:16 +00:00
Daniel Hsieh
6f06d92d77 Merge changes from topics "presubmit-am-8e1f6f3832184ab4980013d926d31388", "presubmit-am-a0b2814b27254513b7a62e0a1e0044ff" into tm-dev
* changes:
  Enables following typing functionality when the window magnifier is on again.
  Adds moveWindowMagnifierToPosition method
2022-03-02 01:21:14 +00:00
TreeHugger Robot
a4ef8dfacf Merge "Fix memory flags in external services and secondary zygotes." into tm-dev am: 951aa29f72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16989014

Change-Id: Ifdab9053602186f63979ec62b053368f55b42a71
2022-03-02 01:21:05 +00:00
Jackal Guo
42563091c9 [automerger skipped] Merge "Mitigate the races during installation" into tm-dev am: b4fd1c7a81 -s ours
am skip reason: Merged-In Ia6b32f72f3d75b8a40c42e11d21f21c459db5299 with SHA-1 bad03aa3c9 is already in history

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

Change-Id: I08e4f477cb341852ac8c674c38f6ed4d0d248b8c
2022-03-02 01:20:42 +00:00
Jackal Guo
9ea317fb16 [automerger skipped] Mitigate the races during installation am: 65067cb36d -s ours
am skip reason: Merged-In Ia6b32f72f3d75b8a40c42e11d21f21c459db5299 with SHA-1 bad03aa3c9 is already in history

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

Change-Id: I2b79eaccad2c618eed922c6509b4278e26a01cfe
2022-03-02 01:20:20 +00:00
Colin Cross
86db26a61f Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 am: ffa0f38936 am: 4c7fba2811
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: Ic3947768a04d096aee7e4c3166451d1ad7d1db01
2022-03-02 01:19:36 +00:00
TreeHugger Robot
c9d7b97ea8 Merge "Fix memory flags in external services and secondary zygotes." into tm-dev am: 951aa29f72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16989014

Change-Id: Ibfba1b5e3db063e4c34965b87d3e8df260bcd979
2022-03-02 01:19:29 +00:00
Colin Cross
811efa2b62 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 am: ffa0f38936 am: 4c7fba2811
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: Ie6d2d2c0df60f381ae078b47dad64b93418bb2a8
2022-03-02 01:18:56 +00:00
TreeHugger Robot
fa529787fb Merge "Don't re-animate duplicate biometric msgs" 2022-03-02 01:15:45 +00:00
Adam Bookatz
7be5303254 Merge "UserManagerService.hasManagedProfile fix" into tm-dev 2022-03-02 01:14:46 +00:00
Minche Li
4eac44bc56 Merge "Waits for windowMagnification connection set when requesting enableWindowMagnification" into tm-dev 2022-03-02 01:09:36 +00:00
Binh Nguyen
5917d51a0e Merge "Register AdServices to SystemServiceRegistry" into tm-dev am: cdda832572
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033848

Change-Id: I67785b41323557c632e69f24aeeceef0640a8d02
2022-03-02 01:08:26 +00:00
Binh Nguyen
05df4ed425 Merge "Register AdServices to SystemServiceRegistry" into tm-dev am: cdda832572
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17033848

Change-Id: I3ed39b3470707b235ee2a816bb291d3ab26ae122
2022-03-02 01:08:21 +00:00
Jackal Guo
b4fd1c7a81 Merge "Mitigate the races during installation" into tm-dev 2022-03-02 01:01:56 +00:00
TreeHugger Robot
3ae95e64a1 Merge "adpf: Use one client token per process for all hint sessions" into tm-dev am: d8a8a405df am: 5967b9f941
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938677

Change-Id: Iee1ded57e29e1a4662753e4937cba6e7f79d50da
2022-03-02 00:57:59 +00:00
TreeHugger Robot
951aa29f72 Merge "Fix memory flags in external services and secondary zygotes." into tm-dev 2022-03-02 00:57:51 +00:00
Colin Cross
4c7fba2811 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 am: ffa0f38936
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I21f5874867e74ca12334711adf1fbc6938c1a3ff
2022-03-02 00:55:39 +00:00
Treehugger Robot
13577ffa5a [automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae am: 327c509933 -s ours am: 595d9645d5 -s ours am: f27a8ef705 -s ours
am skip reason: Merged-In Id4c8b41b23adfe931b9953113f7175a11703dc10 with SHA-1 81a4684119 is already in history

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

Change-Id: Ibf4db23def583219c6ffae1220bfaa21e095cd0c
2022-03-02 00:55:29 +00:00
Binh Nguyen
cdda832572 Merge "Register AdServices to SystemServiceRegistry" into tm-dev 2022-03-02 00:54:42 +00:00
TreeHugger Robot
47a040d761 Merge "adpf: Use one client token per process for all hint sessions" into tm-dev am: d8a8a405df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938677

Change-Id: I1b100fe71fa2e2a9b3962d769e5e153ec4f1b66a
2022-03-02 00:44:19 +00:00
TreeHugger Robot
5967b9f941 Merge "adpf: Use one client token per process for all hint sessions" into tm-dev am: d8a8a405df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16938677

Change-Id: Ia914ae0e2beae10e1bcdfd4b73e1e4859839a3c6
2022-03-02 00:43:18 +00:00
TreeHugger Robot
d8a8a405df Merge "adpf: Use one client token per process for all hint sessions" into tm-dev 2022-03-02 00:38:23 +00:00
Colin Cross
ffa0f38936 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I2eba7685c56d4931f63974b6bfcf13fbb2ab2345
2022-03-02 00:34:33 +00:00
Treehugger Robot
f27a8ef705 [automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae am: 327c509933 -s ours am: 595d9645d5 -s ours
am skip reason: Merged-In Id4c8b41b23adfe931b9953113f7175a11703dc10 with SHA-1 81a4684119 is already in history

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

Change-Id: I1b2689d66539ffcc1a9e94367bd372559fe0555e
2022-03-02 00:33:03 +00:00
Treehugger Robot
80a32bafee [automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae am: 327c509933 -s ours am: 595d9645d5 -s ours
am skip reason: Merged-In Id4c8b41b23adfe931b9953113f7175a11703dc10 with SHA-1 81a4684119 is already in history

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

Change-Id: Ibcee1cb68199d9c987f2840846f95ba21df6f493
2022-03-02 00:32:49 +00:00
Colin Cross
e3086a9896 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: Iab0ad2e55f21ba464ae1b7d4c3ac3252638f711b
2022-03-02 00:13:00 +00:00
Treehugger Robot
595d9645d5 [automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae am: 327c509933 -s ours
am skip reason: Merged-In Id4c8b41b23adfe931b9953113f7175a11703dc10 with SHA-1 81a4684119 is already in history

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

Change-Id: I72780386c0b09c1dc5a892b829302d58100cab5f
2022-03-02 00:11:47 +00:00
TreeHugger Robot
6d8efc185a Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev am: 1f014a4a51 am: 2c35b4e9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17048246

Change-Id: Iaf02520af28a6d454e342fc3cd09127771ffeb17
2022-03-02 00:05:23 +00:00
Atneya Nair
8c74ae4228 Merge "Update Soundpool callback interface" into tm-dev am: 9350158d4e am: 7e8128008e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039306

Change-Id: Icef7da90955529fc682a968dd69745d66fb8d527
2022-03-02 00:04:51 +00:00
TreeHugger Robot
32fd394933 Merge "Schedule binary measurement job at boot completed." into tm-dev am: 0a69364a40 am: bd63a2b901
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046623

Change-Id: I19ac6464daf1fb4328b44105107560b4b352c074
2022-03-02 00:04:05 +00:00
Joe Bolinger
6dae993319 Merge changes from topic "coex-again-2" into tm-dev am: 532df4fc03 am: 8e0749bfdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17040854

Change-Id: Ibbffa1a2af3dc48bf6a2256e2fc76304d3b6c597
2022-03-02 00:03:13 +00:00
Jing Ji
58d12f7101 Merge "Log bindService call and its service name in trace slices" into tm-dev am: f464d627a2 am: a989e145d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039165

Change-Id: Ibc99978b2654765b6616ede9ada148192937c406
2022-03-02 00:02:22 +00:00
TreeHugger Robot
bbba2dd759 [automerger skipped] Merge "Update permissions for ServiceState broadcast" into sc-dev am: cc16c9178b am: 4e51e85e00 am: f40095f080 am: 7c11e55697 -s ours am: 837736b693 -s ours am: fc41d3dc24 -s ours
am skip reason: Merged-In Ibfa66624a4157b7c2c7d764e2b6bdb26ac5f1447 with SHA-1 8bfc531548 is already in history

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

Change-Id: Iefcd06c6f7a3360ff5c4b5130d8036799218dd11
2022-03-02 00:01:23 +00:00
Colin Cross
a789b92644 Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" 2022-03-02 00:01:05 +00:00
TreeHugger Robot
97eae7e16c Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev am: 1f014a4a51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17048246

Change-Id: I1a66c41dd432f1077bf397c347566ed9d4ce43d7
2022-03-01 23:52:51 +00:00
Atneya Nair
5f153df393 Merge "Update Soundpool callback interface" into tm-dev am: 9350158d4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039306

Change-Id: Ia44441886fe077ea71d8293f360e2c6244605bd7
2022-03-01 23:52:05 +00:00
TreeHugger Robot
2c35b4e9b5 Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev am: 1f014a4a51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17048246

Change-Id: Ib1a9484a8390306e62741e84a4ebf5abe967f75a
2022-03-01 23:51:54 +00:00
Atneya Nair
7e8128008e Merge "Update Soundpool callback interface" into tm-dev am: 9350158d4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039306

Change-Id: Iff3cdc6e25da21813fccefa0492473b92062a920
2022-03-01 23:50:53 +00:00
TreeHugger Robot
1f014a4a51 Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev 2022-03-01 23:50:49 +00:00