Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
772,965 Commits 3 Branches 0 Tags
84f45cacdf5de014b480739adea7b6cd2faa2fdc
Commit Graph

772965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Meyer
84f45cacdf Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us...""" into tm-dev am: 0308928e2b am: f06fdb6264 am: f6fa971ec3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377375

Change-Id: I84d7c5dadc2c6c64f11407d2d5b4f75e9878ad06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 01:15:16 +00:00
Jason Hsu
3cb28a079e Merge changes from topic "hearingAidsInT" into tm-dev am: e562003614 am: e169be1cac am: 62900b37e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17226983

Change-Id: I04305e1b7b999f8ade934948bed44adcea0d45f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 01:14:18 +00:00
jasonwshsu
ebc0cb44e7 Using reflection to get private BluetoothHearingAid APIs for short term am: 7e923104ff am: e9cd857dc7 am: 2da8f1a00a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938078

Change-Id: I165ed73292b2057bc7dd01257203ab719afbd03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 01:14:12 +00:00
Lucas Dupin
09a38f4d9f Merge "[Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms." am: 6562eb87f3 am: e3f08c403e am: 8ab593e3a8 am: 11aec9327a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092083

Change-Id: I50f19a57f51136fdc5e215437446eae6da668099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 01:13:48 +00:00
Jeremy Meyer
f6fa971ec3 Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us...""" into tm-dev am: 0308928e2b am: f06fdb6264 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377375

Change-Id: I65dd7c5a1a7cd4072e4f6927ebe86f11b37fddb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:59:47 +00:00
Jason Hsu
62900b37e4 Merge changes from topic "hearingAidsInT" into tm-dev am: e562003614 am: e169be1cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17226983

Change-Id: I9006158ba30690900b25a11fa65bbf0a87b45652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:59:14 +00:00
jasonwshsu
2da8f1a00a Using reflection to get private BluetoothHearingAid APIs for short term am: 7e923104ff am: e9cd857dc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938078

Change-Id: I9e3568ead18e41d0d3826ca9490e6f7c93571b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:59:11 +00:00
Lucas Dupin
11aec9327a Merge "[Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms." am: 6562eb87f3 am: e3f08c403e am: 8ab593e3a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092083

Change-Id: Ie398c67406fd7547c85b457b382aeed1dfb7c90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:58:27 +00:00
Jeremy Meyer
f06fdb6264 Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us...""" into tm-dev am: 0308928e2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377375

Change-Id: I01b4cb0092699936dd8d8c4a15b210629f69e3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:58:04 +00:00
Jason Hsu
e169be1cac Merge changes from topic "hearingAidsInT" into tm-dev am: e562003614 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17226983

Change-Id: I2afdee7fd373988036169a4d62d5cee570bd1808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:57:15 +00:00
jasonwshsu
e9cd857dc7 Using reflection to get private BluetoothHearingAid APIs for short term am: 7e923104ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938078

Change-Id: Iea5547901537ac4197fdcbdd7d2c1b31357a2130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:57:07 +00:00
Jeremy Meyer
0308928e2b Merge "Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us...""" into tm-dev 2022-05-14 00:37:12 +00:00
Jason Hsu
e562003614 Merge changes from topic "hearingAidsInT" into tm-dev 
* changes:
  Show left/right side of the hearing aid device for ASHA profile
  Using reflection to get private BluetoothHearingAid APIs for short term
 2022-05-14 00:24:44 +00:00
Lucas Dupin
8ab593e3a8 Merge "[Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms." am: 6562eb87f3 am: e3f08c403e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092083

Change-Id: Iae7ebfe443056439545dec77f4f2e6b19afe79bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:23:15 +00:00
TreeHugger Robot
c4ca15f088 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 am: 243c50e48e am: cb815498c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I8d6a2a197da26af67276f8ced20a9f43e16ed8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:22:56 +00:00
shaoweishen
0d55c5ae96 DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a am: 2a100cdcc9 am: 2ea049a912 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I47359ad9b7775e562e888bee88545986648cf3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:22:52 +00:00
Amruth Ramachandran
650c969bce Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 am: 843431d919 am: abdf4dd0ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: I2da66d474160992bb3d310f56a587734ec2f28e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:22:27 +00:00
TreeHugger Robot
c4ee945e7d Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 am: 9158943c61 am: cc9403e16b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I9f5f7e1db2436165a30e2ecd3843eac7bfb36984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:21:59 +00:00
shaoweishen
73c80cdf74 DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a am: a73611ab4c am: 7042cdf18e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I65b167b5caa34869ba295790fd589ff310c8580f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:21:56 +00:00
Joshua Mccloskey
7089388003 Merge "Correctly scale down UDFPS offset for diff display" into tm-d1-dev am: 04847f82ab am: 6f31cfdb77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188319

Change-Id: I3214c8b59d9e92eea3de666f337cc8907e7db101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:21:37 +00:00
TreeHugger Robot
cc9403e16b Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 am: 9158943c61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: Ia63a1e903d30461d3ce55ae0c781da9e5e76e90d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:13:58 +00:00
shaoweishen
7042cdf18e DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a am: a73611ab4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I95913899460068b10e9d0ce7f2f3045e6a8cb940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:13:51 +00:00
Amruth Ramachandran
2fa36c15c2 Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 am: 56b53cab0f am: 4272f12686 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: Id7d65673208d7a58f254ee33fbc118a7d0d54a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:13:00 +00:00
TreeHugger Robot
e14878b985 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 am: 243c50e48e am: 4f882747b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I597edc4b915ac79ea8b948c3d8b165d590a18873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:10:30 +00:00
shaoweishen
d809bf68bd DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a am: 2a100cdcc9 am: dd6f0ea978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: Ie4d6e5dd4600b07affe33bee4137c9eb16dc0c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:10:27 +00:00
Amruth Ramachandran
c9b5bf58ea Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 am: 843431d919 am: 8869208e86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: I4e3e6996825b2bf6db929398d800b1d7737234af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:09:54 +00:00
Joshua Mccloskey
cba8305612 Merge "Correctly scale down UDFPS offset for diff display" into tm-d1-dev am: 04847f82ab am: a47e078fc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188319

Change-Id: I48b1e0642d934eefdce0f5664644aa186e716d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:09:30 +00:00
TreeHugger Robot
fa488ef557 Merge "Stop the actual job in question." into tm-dev am: 368b3a7c0a am: fcec128b22 am: ec7fb7a198 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191867

Change-Id: I95118085c25c350b5432660d74b062b942922f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:09:11 +00:00
TreeHugger Robot
2288936199 Merge "Add grace period to estimated launch times." into tm-dev am: d9bb349561 am: b625943342 am: 6feea9a896 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18354131

Change-Id: I9f3a0b0d62a750abbb3ba13de44a8f43e89148b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:08:44 +00:00
Mady Mellor
430f997580 [automerger skipped] Merge "Add shell background executor to bubbles and put unregister call on it" into tm-dev am: 0fe75d50e3 am: a1c5ce597e -s ours am: b1c1fa056b -s ours 
am skip reason: Merged-In I2c578d10e0bef49534987be3e82700e50ffd1281 with SHA-1 c679f3d809 is already in history

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

Change-Id: I270f421fe1a72e94fd8c8257a7eebf58211861dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:08:33 +00:00
TreeHugger Robot
5f1504a3f9 Merge "Stop the actual job in question." into tm-dev am: 368b3a7c0a am: 36ca3bdd6b am: c53632b89f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191867

Change-Id: I43584765dd887418685867220e9ccf37657a0f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:07:15 +00:00
TreeHugger Robot
cfb8d9623a Merge "Add grace period to estimated launch times." into tm-dev am: d9bb349561 am: ebff96b1cc am: e6664b51b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18354131

Change-Id: I18cc963035a06f2d438d63e0eff5ad6dfafeff23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:05:40 +00:00
Amruth Ramachandran
4272f12686 Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 am: 56b53cab0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: I37518562db2eb4a1f1c8f94ecac4155e6cd6bb1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:05:33 +00:00
TreeHugger Robot
cb815498c6 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 am: 243c50e48e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I31750afed39fb1e99aa1673c08a3bd423ca1a961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:05:00 +00:00
shaoweishen
2ea049a912 DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a am: 2a100cdcc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: Icca9438a9dba4dfc6e9f205c95e65dc1eb6187db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:04:44 +00:00
TreeHugger Robot
4f882747b3 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 am: 243c50e48e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I683cfdb532537e2151352cce36d56dbbf3af0846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:04:31 +00:00
shaoweishen
dd6f0ea978 DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a am: 2a100cdcc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I531ea08068ba4641e6fba9883c940b348b88ec20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:04:28 +00:00
Amruth Ramachandran
8869208e86 Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 am: 843431d919 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: I8e63e8b07e598a163185f7620facf3349192e42d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:03:59 +00:00
Amruth Ramachandran
abdf4dd0ba Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 am: 843431d919 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: I054c09bae49585f37345a2c50ee442b9b4e533aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:03:40 +00:00
Mady Mellor
3d7030d608 [automerger skipped] Merge "Add shell background executor to bubbles and put unregister call on it" into tm-dev am: 0fe75d50e3 am: d0487d7a5e am: c24f992368 -s ours 
am skip reason: Merged-In I2c578d10e0bef49534987be3e82700e50ffd1281 with SHA-1 c679f3d809 is already in history

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

Change-Id: Idd21e6361e4f294332bf9c80da9b773a755268c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 00:01:53 +00:00
TreeHugger Robot
243c50e48e Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I077309f74a99719513cc0ac321376bf343895158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:55:54 +00:00
shaoweishen
2a100cdcc9 DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I5edf5c91be727b50aeffdb4f6f905d9793bb4d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:55:52 +00:00
Amruth Ramachandran
843431d919 Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: I294b89447a925522dac6b6a1f177624e8984591a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:55:20 +00:00
Joshua Mccloskey
6f31cfdb77 Merge "Correctly scale down UDFPS offset for diff display" into tm-d1-dev am: 04847f82ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188319

Change-Id: I920603064c72cbb57cd9616de06a40c9414b5075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:53:28 +00:00
Joshua Mccloskey
a47e078fc4 Merge "Correctly scale down UDFPS offset for diff display" into tm-d1-dev am: 04847f82ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188319

Change-Id: I086284f9c5f1e25a502cd51502c346cff1b1ccbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:53:23 +00:00
TreeHugger Robot
9158943c61 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev am: f823b9a196 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I21da345b42728fe489a3ae75ba8f9006cd1dc60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:53:22 +00:00
shaoweishen
a73611ab4c DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y am: 3ef0800f3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349733

Change-Id: I8ef2b34ff853cb51e6572c00262885d07d80274c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:53:14 +00:00
Lucas Dupin
e3f08c403e Merge "[Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms." am: 6562eb87f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092083

Change-Id: I83b26233e432080a42b93cab1c06582ff7de7b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:53:03 +00:00
Amruth Ramachandran
56b53cab0f Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev am: 3e5894b2e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281725

Change-Id: I705c2a2d7bc2d894106ca12a86452267a842839d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:52:36 +00:00
TreeHugger Robot
dbbf91b645 Merge "Revert "HWUI: Turn on Skia tracing by default"" into tm-dev am: 3ec8ebaff2 am: 47147182bb am: 90ae5878a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191871

Change-Id: I55ddaf80f27622ed235fa1aba7bf8d92249344ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 23:52:32 +00:00