Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
767,207 Commits 3 Branches 0 Tags
143b95ec82f1b94de2051f59a7d0e930e48fa875
Commit Graph

767207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricky Wai
143b95ec82 Merge "Only add boolean extra to bundle when the value is false" into tm-dev am: 76f37a5d74 am: 06a00ac6f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18628215

Change-Id: I1312e0090d9e814d2bc5569d4bac5e4cac096ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 10:36:34 +00:00
Ricky Wai
06a00ac6f6 Merge "Only add boolean extra to bundle when the value is false" into tm-dev am: 76f37a5d74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18628215

Change-Id: Ic15c3703b5258b6f058e5028db580de0803fde10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 10:21:24 +00:00
Ricky Wai
76f37a5d74 Merge "Only add boolean extra to bundle when the value is false" into tm-dev 2022-05-30 10:01:52 +00:00
Tiger Huang
d95834c214 Merge "Only update the compat system UI visibility if the source is valid" into tm-dev am: 1fab45404b am: 8893bc9d06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18583184

Change-Id: I887327b4d504f7c9576f11bf263c8e4d942c757e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 09:20:07 +00:00
Tiger Huang
8893bc9d06 Merge "Only update the compat system UI visibility if the source is valid" into tm-dev am: 1fab45404b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18583184

Change-Id: I2f698727952f1d02aa824769b58140a1b981a433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 08:57:37 +00:00
Wenhao Wang
faf4fa0e69 [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 718d5a4d2f -s ours am: e9f7ca4fd5 -s ours am: edfc3fa2ae -s ours am: a10124141c -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: I630afc18ec0c42398276e0ab7c72a043eda405cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 08:50:30 +00:00
Tiger Huang
1fab45404b Merge "Only update the compat system UI visibility if the source is valid" into tm-dev 2022-05-30 08:40:03 +00:00
Wenhao Wang
a10124141c [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 718d5a4d2f -s ours am: e9f7ca4fd5 -s ours am: edfc3fa2ae -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Ib25d8b7f9d815d5cf39c3933b7a8c011b9e71e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 08:23:49 +00:00
Wenhao Wang
edfc3fa2ae [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 718d5a4d2f -s ours am: e9f7ca4fd5 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Iab195185cff6a1a09845d48bf74d0b5045c21d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 08:07:34 +00:00
Wenhao Wang
e9f7ca4fd5 [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am: 718d5a4d2f -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: If384bbd807b6b10bbafebf359d11b725b30db72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 07:51:13 +00:00
Julia Reynolds
140f9fc9e0 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours am: 692a08086e -s ours am: 61c6c8ba09 -s ours am: d400ef9b4d -s ours am: 75d906b040 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I57c19199286c23545ec6992f5640f165ccee4705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 07:33:53 +00:00
Wenhao Wang
718d5a4d2f [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id2ee63db92aae509297f6e014a03fe7ccf574497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 07:33:49 +00:00
Riddle Hsu
1854ffeaff Merge "Declare MY_PID and MY_UID in WMS" into tm-qpr-dev 2022-05-30 07:07:50 +00:00
Julia Reynolds
75d906b040 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours am: 692a08086e -s ours am: 61c6c8ba09 -s ours am: d400ef9b4d -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Ie7483c4546d772adf35b9548783f949192039ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:59:17 +00:00
Wenhao Wang
b1cf2a0cd2 [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: I5926ea7d571c78eae47ca529cb0a166c2a718519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:58:02 +00:00
Wenhao Wang
aa456df74e [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id295b15c1e6469ee9f50babb2f4c057d78d67e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:35:00 +00:00
Julia Reynolds
d400ef9b4d [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours am: 692a08086e -s ours am: 61c6c8ba09 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Id34e71280cebda99a0861c89af03d77806102abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:34:54 +00:00
Julia Reynolds
61c6c8ba09 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours am: 692a08086e -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Id7065a864f7b11ca96085bc2870ce12d46c13533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:12:27 +00:00
Wenhao Wang
c543f70e3d [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I44b0bee5c0ba597407652dd2c1af868adcee724a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:11:04 +00:00
Julia Reynolds
692a08086e [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours am: f03f3fad8b -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Ide0431351cbc788dc0c4ca649a8b5eedbd9a93ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:39:09 +00:00
Wenhao Wang
8bb5e98ecb Revert "[conflict] Move service initialization am: 38fe45b539" 
This reverts commit 012cace2ee.

Reason for revert: This CL depends on ag/17823648, which is not merged into qt-qpr1-dev.

Change-Id: I503bcc1e979dd4db941cb7754f63a0dc35ce9682
 2022-05-30 05:30:08 +00:00
Julia Reynolds
f03f3fad8b [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours am: b50f345f57 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: Icbb45e04112d49968b4a2f33693793ef01fb95b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:14:00 +00:00
Edgar Wang
75cec0e825 Merge "Enable hyphenation on most of preference." into tm-dev am: 3aa0a120b1 am: 832a7fc9ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17526304

Change-Id: I3aeb2c8be1e8aba234cbbeaaf6f63adfc57abeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:29 +00:00
Julia Reynolds
b50f345f57 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I1f15a3a4dd6fe04321ecda11bb16dc6f2aef175c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:53:17 +00:00
Edgar Wang
832a7fc9ad Merge "Enable hyphenation on most of preference." into tm-dev am: 3aa0a120b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17526304

Change-Id: Id7eda8bc17829b377048486109937b8b03375679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:36:10 +00:00
Julia Reynolds
f3a82a3b59 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I094361ea2d938bd3e7ff77e66f68cf23d8e25ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:05:13 +00:00
Edgar Wang
3aa0a120b1 Merge "Enable hyphenation on most of preference." into tm-dev 2022-05-30 04:00:19 +00:00
Wei Sheng Shih
050781d724 Merge "Do not create starting window if there is no task." into tm-qpr-dev 2022-05-30 03:35:53 +00:00
Zoey Chen
d13e721d2e Merge "[Le Audio] Add a new BroadcastDialog in SystemUI from MediaPanel" into tm-qpr-dev 2022-05-30 02:54:02 +00:00
Wei Sheng Shih
b1f4e4cf81 Merge "Cancel the recents animation when keyguard is occluding.[1/2]" into tm-qpr-dev 2022-05-30 01:48:07 +00:00
Antony Sargent
eb38d231bc Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: de2d849abd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: Ie72dc45b6f7f5e55876cf8798553712db36f6b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:59:09 +00:00
Antony Sargent
de2d849abd Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: If653afb4a286de6046e9bf4392a2fa924de5c92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:35:54 +00:00
Antony Sargent
fc6eb70e0e Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev 2022-05-30 00:09:18 +00:00
Antony Sargent
725dad7d71 Prevent deadlocks during VirtualDisplay creation 
When creating a VirtualDisplay for a VirtualDevice, we need to do some
extra work like setting up for input injection, creating a
DisplayWindowPolicyController, and grabbing a wakelock to keep the
display awake. Some parts of this extra work end up calling back into
the DisplayManagerService from another thread, but since we're already
holding the mSyncRoot lock we sometimes get into situations where
those threads get blocked trying to acquire mSyncRoot, while holding a
lock that another thread ends up needing like the global window
manager one, so we get deadlock.

The fix in this CL is to break up the extra work the
VirtualDeviceManagerService needs to do into two parts: one part that
happens before the VirtualDisplay is created, and one part
after. Neither of these needs mSyncRoot to be held.

Fixes: 230544802
Test: atest CreateVirtualDisplayTest
Change-Id: I6a6e03f816567579510b3f1ef0705375549a3c88
 2022-05-29 11:18:36 -07:00
Henry Fang
3d70f2c73f Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 am: 88f77abcd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: I44ac73ec486c05504df47dc979855b5d1c186eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 19:38:23 +00:00
Henry Fang
88f77abcd2 Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: Ibf857efb8a0496a0f47464e55b65fdaafb56ec67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 19:18:24 +00:00
Henry Fang
9dd35d01f8 Merge "Allow LNB to be opened before Frontend" into tm-dev 2022-05-28 18:43:29 +00:00
Hongwei Wang
e9326b73d0 Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7b7 am: bc6f5f1842 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18637060

Change-Id: I5f049dbd96a07a04da3affadf03cb0c7888c7cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 07:03:15 +00:00
Hongwei Wang
bc6f5f1842 Merge "Fix the animation position when launch into PiP" into tm-dev am: 83979ad7b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18637060

Change-Id: I4773a2751725d4e554c84e9fd9ca26ff6e561e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 06:40:58 +00:00
Hongwei Wang
83979ad7b7 Merge "Fix the animation position when launch into PiP" into tm-dev 2022-05-28 06:14:33 +00:00
Jing Ji
f214283f59 Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4b0 am: 44592782d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634945

Change-Id: I1ac0abd36bb4c733eb61a3cae975e9e0bea79038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 04:37:37 +00:00
Jing Ji
44592782d5 Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev am: f3dabda4b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634945

Change-Id: If558c9b0c38c8ee88578eb66c5e44411fbb04901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 04:05:35 +00:00
Jing Ji
f3dabda4b0 Merge "Check if the ANR dump is still ongoing before reporting it" into tm-dev 2022-05-28 03:48:07 +00:00
TreeHugger Robot
12be0287a7 Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae am: 384b8dd4e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18630392

Change-Id: I4706dd0215bdcc859d463f52522ff31a599cbee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 03:43:07 +00:00
TreeHugger Robot
384b8dd4e4 Merge "Always restart apps for full installs." into tm-dev am: b44f1fa8ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18630392

Change-Id: I9ff874b8410d0e56201b1952a4130213a341e5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 03:21:01 +00:00
TreeHugger Robot
b44f1fa8ae Merge "Always restart apps for full installs." into tm-dev 2022-05-28 03:00:47 +00:00
Beth Thibodeau
1d1c0a90e8 Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 am: 9854e5d1fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: I578b92280ba09630ac2b293dea8c21a18de82165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 02:49:02 +00:00
Beth Thibodeau
9854e5d1fb Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544

Change-Id: I58d9a69cf30cc28fbc3fb6aa7efdab7944664872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 02:32:49 +00:00
Beth Thibodeau
0e29401d65 Merge "Add check for null token when updating state" into tm-dev 2022-05-28 02:10:28 +00:00
TreeHugger Robot
91c7fffedb Merge "MediaCodec: realloc & copy for non-secure buffers at secure session & vice versa" into tm-dev am: 17634b9b45 am: 9638314e47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18578433

Change-Id: Ide886d19e08920dd8b8b7317f679d160bbd2035d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-28 00:13:49 +00:00