Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
766,648 Commits 3 Branches 0 Tags
f6fa971ec32db97eb00c28cb33ee50192205ccbe
Commit Graph

766648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
f823b9a196 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] [A11y] Set title for dialog for a11y" into tm-dev 2022-05-13 23:40:22 +00:00
Amruth Ramachandran
3e5894b2e8 Merge "[MEP] set removable eSIM as default eUICC to pass GCF/PTCRB" into tm-dev 2022-05-13 23:22:06 +00:00
Joshua Mccloskey
04847f82ab Merge "Correctly scale down UDFPS offset for diff display" into tm-d1-dev 2022-05-13 23:17:40 +00:00
Lucas Dupin
6562eb87f3 Merge "[Bugfix][BootAnimation] Fix the issue of the transparent background image shows transparent background unexpectedly in BootAnimation on some MTK platforms." 2022-05-13 23:02:22 +00:00
TreeHugger Robot
ec7fb7a198 Merge "Stop the actual job in question." into tm-dev am: 368b3a7c0a am: fcec128b22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191867

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

Change-Id: I41af8408800db8394f484068a48996dadd7d34bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:50:45 +00:00
Mady Mellor
b1c1fa056b [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 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: I708b0ff9fa1b259297174ed72e35c6e802e79ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:50:14 +00:00
TreeHugger Robot
c53632b89f Merge "Stop the actual job in question." into tm-dev am: 368b3a7c0a am: 36ca3bdd6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191867

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

Change-Id: Id18f4abc6d74b0b8c433d51776324f209b7e740b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:40:53 +00:00
Mady Mellor
c24f992368 Merge "Add shell background executor to bubbles and put unregister call on it" into tm-dev am: 0fe75d50e3 am: d0487d7a5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18300851

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

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

Change-Id: Iaf3e10bf4df1266860b8f49c00462516fa6b8950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:39:54 +00:00
Mady Mellor
a1c5ce597e Merge "Add shell background executor to bubbles and put unregister call on it" into tm-dev am: 0fe75d50e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18300851

Change-Id: I9118bd94acac735fd39397b3fe66dda5b13a3124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:39:26 +00:00
Jeremy Meyer
d89f634cdc Revert "Revert "Revert "Have AssetFileDescriptor.AutoCloseInputStream us..."" 
This reverts commit f26bb9d683.

Reason for revert: causes b/204612606

Fixes: 204612606
Test: checked failing CTS test
Change-Id: I92090318c0f111931acf0875c726bf4da4db08bd
 2022-05-13 22:38:29 +00:00
TreeHugger Robot
36ca3bdd6b Merge "Stop the actual job in question." into tm-dev am: 368b3a7c0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191867

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

Change-Id: I28fd168fdb9dcfd550d24a361f651b04247b04c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:32:29 +00:00
Mady Mellor
d0487d7a5e Merge "Add shell background executor to bubbles and put unregister call on it" into tm-dev am: 0fe75d50e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18300851

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

Change-Id: I84d933127c1b150fa01329c32e8ca7cc65196da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:31:42 +00:00
TreeHugger Robot
84cb06549f Merge "Revert "HWUI: Turn on Skia tracing by default"" into tm-dev am: 3ec8ebaff2 am: 2b4cb7be02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18191871

Change-Id: I03fec78ad5f3ed5199977b5eedc01652ad3aa604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:31:17 +00:00
Jon Spivack
07d05ed954 Merge "Revert "Fix default mode for system alert window on low-RAM device."" into tm-dev am: 074f4aa65d am: f1980fd94e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18365482

Change-Id: I1097b09d3d6618ac973821da198b3d855e70a333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:30:37 +00:00
TreeHugger Robot
368b3a7c0a Merge "Stop the actual job in question." into tm-dev 2022-05-13 22:30:33 +00:00
TreeHugger Robot
d9bb349561 Merge "Add grace period to estimated launch times." into tm-dev 2022-05-13 22:30:25 +00:00
TreeHugger Robot
c62df676c3 Merge "Expose IME inset source control for testing" into tm-dev am: 65762373cf am: ce4e576ce6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18286156

Change-Id: I7dd62f485f86a5c9eb39dfdcf6e304bead310aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:28:54 +00:00
Ned Burns
df8d254e90 Merge changes from topic "log-buffer" into tm-dev am: ff1b7dc538 am: 2766240873 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097841

Change-Id: I33f40f1e509fb3fc8b262c5fe28d40d2dbdfcb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:28:26 +00:00
Ned Burns
b6c77487f6 Convert NPVCDownEventState to use RingBuffer am: 598ec025bc am: 74dd1ab4c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331644

Change-Id: I7104a5ae4172a5d0c1015b9ca703035f086d8a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 22:28:22 +00:00
Ned Burns
61f1a69b09 Convert LogBuffer to use RingBuffer am: e0b11afd70 am: efe775d291 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18097840

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