Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
804,305 Commits 3 Branches 0 Tags
511554537dd06ee02beb7bdcbeb74105baff2ff9
Commit Graph

804305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Mikhail
511554537d Merge "Track order of visible media players" into tm-qpr-dev am: 3009a9e14e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20063735

Change-Id: Id70a112b61091a0256e53ecdd27c6dd18db853a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 14:43:57 +00:00
Michael Mikhail
3009a9e14e Merge "Track order of visible media players" into tm-qpr-dev 2022-10-18 14:14:12 +00:00
Chris Li
a08ba96797 Merge "Keep track of the WCT changes to determine the transition type" into tm-qpr-dev am: 3dd646cf20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19992916

Change-Id: Ia08c54546071ff4f5d5afaa0c084839c2e529b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 12:15:00 +00:00
Chris Li
3dd646cf20 Merge "Keep track of the WCT changes to determine the transition type" into tm-qpr-dev 2022-10-18 11:50:45 +00:00
Islam Elbanna
bde4635f43 Merge "Allow profiling for standalone system server jars." am: bda789c641 am: 8ac01a2856 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2257205

Change-Id: I2010d63fae74c06a24cad3d1959892249a798298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 10:15:08 +00:00
Islam Elbanna
8ac01a2856 Merge "Allow profiling for standalone system server jars." am: bda789c641 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2257205

Change-Id: I28c7e16af0795ccd25850cc07beb7057af24cdd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 09:46:50 +00:00
Islam Elbanna
bda789c641 Merge "Allow profiling for standalone system server jars." 2022-10-18 09:21:53 +00:00
TreeHugger Robot
54d2af138f Merge changes I28706e2e,I0af8480c into tm-qpr-dev am: 74787ef182 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20178203

Change-Id: I6ea64f61d7505f0ba713937792b6736651cbd0e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 08:30:24 +00:00
Chris Li
d34770e622 Keep track of the WCT changes to determine the transition type 
Before, we calculate the TransitionType based on the WCT, which may not
be accurate. For example, starting a new Activity to split may result
closing another TaskFragment.

Now, we keep track of where the WCT is started, and what exactly is
happening.

Bug: 207070762
Test: atest WMJetpackUnitTests:TransactionManagerTest
Change-Id: I19a21fac10fa47b75d696d9a5e273c1033ae3982
 2022-10-18 16:18:29 +08:00
TreeHugger Robot
74787ef182 Merge changes I28706e2e,I0af8480c into tm-qpr-dev 
* changes:
  [Chipbar] Move the Media TTT callback listener to a media-specific coordinator class.
  [Chipbar] Rename MediaTttChipControllerSender to ChipbarCoordinator, since it has all the chipbar logic.
 2022-10-18 08:00:17 +00:00
Tsung-Mao Fang
e754249f83 Merge "Fix potential NPE when preference is null" am: 2b6a72ba1f am: b5e5983379 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2256881

Change-Id: I38a063882089a767732f748e851f5cbedd1e6cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 07:45:57 +00:00
Tsung-Mao Fang
b5e5983379 Merge "Fix potential NPE when preference is null" am: 2b6a72ba1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2256881

Change-Id: Ib0f7d5c73cd27c36f68844a9e9d3494dc2421aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 07:19:52 +00:00
Chaohui Wang
fd21e3a4bd [automerger skipped] Fix SuspendPackageHelperTest after Kotlin 1.7.20 am: 76695a5e54 -s ours 
am skip reason: Merged-In I9a53541e98c0ba596b288ae92fe75f3279aac9cb with SHA-1 237e77a456 is already in history

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

Change-Id: I33df8d8334b63333afa44dd2d24f1a0b4ef06b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 07:18:01 +00:00
Tsung-Mao Fang
2b6a72ba1f Merge "Fix potential NPE when preference is null" 2022-10-18 06:51:17 +00:00
Chaohui Wang
76695a5e54 Fix SuspendPackageHelperTest after Kotlin 1.7.20 
Fix: 251257818
Test: lunch aosp_cf_x86_64_phone-userdebug
Test: acloud create
Test: atest  SuspendPackageHelperTest
Change-Id: I9a53541e98c0ba596b288ae92fe75f3279aac9cb
Merged-In: I9a53541e98c0ba596b288ae92fe75f3279aac9cb
Merged-In: Ie900be9e8f8a306f06e9856a25965c7a9e08b684
 2022-10-18 05:39:26 +00:00
TreeHugger Robot
27fb261fd2 Merge "Guard one more use of CentralSurfaces in NavBar" into tm-qpr-dev am: fee4f5374f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20215963

Change-Id: I6b89a8aad7bb832fd0ec4d98b462a05aacdf9747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 04:27:33 +00:00
TreeHugger Robot
fee4f5374f Merge "Guard one more use of CentralSurfaces in NavBar" into tm-qpr-dev 2022-10-18 03:54:46 +00:00
TreeHugger Robot
74b22230d9 Merge "Launch all activities into the same root task" into tm-qpr-dev am: a45c7f7de3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19989745

Change-Id: I3a493527e397e43d8b53a9f869bf8e8aaeeecdb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 03:31:13 +00:00
TreeHugger Robot
a45c7f7de3 Merge "Launch all activities into the same root task" into tm-qpr-dev 2022-10-18 02:53:28 +00:00
TreeHugger Robot
640e801d6a Merge "Show toast if app doesn't support split" into tm-qpr-dev am: b35a781088 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20193728

Change-Id: I8fbaf7c7cab8065a75d9b71da11b7a805ea88456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 02:33:11 +00:00
TreeHugger Robot
b35a781088 Merge "Show toast if app doesn't support split" into tm-qpr-dev 2022-10-18 02:04:07 +00:00
Shan Huang
bcb5bd5c00 Merge "Add AndroidX SpringAnimation library to core." into tm-qpr-dev am: a24bed9f38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20171590

Change-Id: I40d68291f995c5db5adda9e3ed6d7b8fa3ea6840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:15:44 +00:00
Lucas Silva
8ec6437d8b Merge "Update PowerManager to make ambient display suppression apply to dreams." into tm-qpr-dev am: 63402cf7d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20066665

Change-Id: I50d42118d73cbab3d2afca864b9df4e8f850a84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:14:29 +00:00
TreeHugger Robot
c9c517c466 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b610079649 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifad6dcac10734c37fac2315fb9417ea9b5b953bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:12:52 +00:00
Bill Yi
d51a7f024b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a49c72f905 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I037c264ed087a3e0108ee1a3df10045b8e356d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:12:27 +00:00
TreeHugger Robot
2440bb29be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 91ef71d581 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I314cb3221dcea4de4e3f3607245d74e01295d0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:12:00 +00:00
Bill Yi
eff579e0fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5bf18b6fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5a8e531da916c6e498ddd54be4759db9b2089f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:11:35 +00:00
TreeHugger Robot
73ccb59f10 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f0117b888f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fe4677df1461a8ad0d13657bff1aa126d4c814d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:11:16 +00:00
Bill Yi
f44caf40f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4eeef390b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7613262c018d4258eeef3e910552691aaacba9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 01:10:37 +00:00
Shan Huang
a24bed9f38 Merge "Add AndroidX SpringAnimation library to core." into tm-qpr-dev 2022-10-18 01:06:42 +00:00
Lucas Silva
63402cf7d5 Merge "Update PowerManager to make ambient display suppression apply to dreams." into tm-qpr-dev 2022-10-18 00:51:59 +00:00
TreeHugger Robot
b610079649 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-18 00:32:26 +00:00
TreeHugger Robot
91ef71d581 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-18 00:32:26 +00:00
TreeHugger Robot
f0117b888f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-10-18 00:32:26 +00:00
Daniel Norman
c3a63c94d8 [automerger skipped] Merge "RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package." into qt-dev am: dc0095e9e4 am: 49cd9427ef -s ours am: 822eef4399 -s ours am: 1d2c073e40 -s ours am: 9142d8c936 -s ours am: 13d2037a7a -s ours am: 869d90d0b2 -s ours am: d692cc2f66 -s ours am: c695905931 -s ours am: ad2da1634b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15578de3ea27a275ea93fa1bc7f00ef8503eda76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 00:21:40 +00:00
Daniel Norman
3d1230b1f0 [automerger skipped] RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package. am: 3796629985 am: 07b90715f9 -s ours am: 296365ae97 -s ours am: d8c076eb80 -s ours am: 798fa14534 -s ours am: c03a507139 -s ours am: a2e16d219c -s ours am: 6a7fbba890 -s ours am: dac3697d7c -s ours am: cca4ca859c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7b11dbbd72e5d3790564bb785d35aa3d39364e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 00:21:16 +00:00
Daniel Norman
ad2da1634b [automerger skipped] Merge "RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package." into qt-dev am: dc0095e9e4 am: 49cd9427ef -s ours am: 822eef4399 -s ours am: 1d2c073e40 -s ours am: 9142d8c936 -s ours am: 13d2037a7a -s ours am: 869d90d0b2 -s ours am: d692cc2f66 -s ours am: c695905931 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3d6c1cbcf0187fcab8c496a0252dd13db9f9591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 00:10:02 +00:00
Daniel Norman
cca4ca859c [automerger skipped] RESTRICT AUTOMERGE Disable all A11yServices from an uninstalled package. am: 3796629985 am: 07b90715f9 -s ours am: 296365ae97 -s ours am: d8c076eb80 -s ours am: 798fa14534 -s ours am: c03a507139 -s ours am: a2e16d219c -s ours am: 6a7fbba890 -s ours am: dac3697d7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I704aad74cf769b0a448e23e110ca32cc753754c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 00:09:47 +00:00
Treehugger Robot
ac5aa1b20e Merge "Add graphics owners for Image, ImageReader and ImageWriter files." am: 624fe54fb3 am: f56c5cc599 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2258322

Change-Id: Ice3f2d642350442965cb776fc6e89bcff9d0807d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 00:06:55 +00:00
Treehugger Robot
bb420040ea Merge "Move media vintf aidl_interface to system/hardware/interfaces" am: fa28151389 am: d52a1442be 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2233466

Change-Id: Iaf761ef63d26b28ae3c34a9aa5a99d4dc273e721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-18 00:06:23 +00:00
Colin Cross
fab82f8908 [automerger skipped] Merge "Fix SystemUI build for kotlin 1.7.0" into tm-qpr-dev am: 6947499a36 -s ours 
am skip reason: Merged-In Ib1605aaff28492b557deac4156f3cc2f4cf8b329 with SHA-1 004f092eda is already in history

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

Change-Id: Ia3a23ff6c0e30c65cc731cbc275ade9f004e615b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:59:53 +00:00
Colin Cross
a455d490d8 [automerger skipped] Fix SystemUI build for kotlin 1.7.0 am: 32783b391e -s ours 
am skip reason: Merged-In Ib1605aaff28492b557deac4156f3cc2f4cf8b329 with SHA-1 004f092eda is already in history

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

Change-Id: I7bea1ea6e4758be35640eff5c15a8d62ca21d7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:59:39 +00:00
Colin Cross
c1decc1a60 [automerger skipped] Merge "Fix more kotlin 1.7.0 errors" into tm-qpr-dev am: b6b58d09b6 -s ours 
am skip reason: Merged-In I2c1b1f7581426496f31198896c4ff3bd9abf2941 with SHA-1 61be78718f is already in history

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

Change-Id: I059adc5d59fb08b72ff99e523fd246591285df71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:59:30 +00:00
Colin Cross
ac2f089ccb [automerger skipped] Fix more kotlin 1.7.0 errors am: 2bab49dd2f -s ours 
am skip reason: Merged-In I2c1b1f7581426496f31198896c4ff3bd9abf2941 with SHA-1 61be78718f is already in history

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

Change-Id: If74e3c43965c850b331f99874d4c2c31c1f89bd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:59:22 +00:00
Colin Cross
cadd377ad0 [automerger skipped] Merge "Migrate SystemUITests to Android.bp" into tm-qpr-dev am: fd1b49be69 -s ours 
am skip reason: Merged-In I24fa1546182d7609a85cf31ddf7e24ac7f4c18f0 with SHA-1 85984eb3be is already in history

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

Change-Id: Ie9a362478c3aaab4a68a21a6ef97d461b67072a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:58:53 +00:00
Chaohui Wang
88994b2c93 [automerger skipped] Migrate SystemUITests to Android.bp am: 39325e4ff4 -s ours 
am skip reason: Merged-In I24fa1546182d7609a85cf31ddf7e24ac7f4c18f0 with SHA-1 85984eb3be is already in history

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

Change-Id: I09826d4877f22972161ab820b1382b5e65c185b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:58:33 +00:00
Daniel Norman
1ba078de94 Merge "Disable all A11yServices from an uninstalled package." into rvc-dev am: e6d10db58e am: 9e3a6a622a am: 994e8238bf am: 6f79c2effa am: f75b18a23e am: 3e56f76fa2 am: e46e6e91d7 am: 8d8adc43e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20123964

Change-Id: I4829b8106aeded7c3d8b5710807e27d765878d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-10-17 23:51:58 +00:00
Colin Cross
6947499a36 Merge "Fix SystemUI build for kotlin 1.7.0" into tm-qpr-dev 2022-10-17 23:51:26 +00:00
Colin Cross
b6b58d09b6 Merge "Fix more kotlin 1.7.0 errors" into tm-qpr-dev 2022-10-17 23:51:26 +00:00
Colin Cross
fd1b49be69 Merge "Migrate SystemUITests to Android.bp" into tm-qpr-dev 2022-10-17 23:51:26 +00:00