Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,427 Commits 3 Branches 0 Tags
f1df252dd673375abcc0e763bd4a377dc660af32
Commit Graph

760427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Huang
f1df252dd6 Merge "Don't set animation pending when gaining fake control" into tm-dev am: c15af2cb87 am: 7da223138b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17822750

Change-Id: I7fd95e261b8333695e21cef7e9c660401512e648
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 13:35:59 +00:00
Tiger Huang
7da223138b Merge "Don't set animation pending when gaining fake control" into tm-dev am: c15af2cb87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17822750

Change-Id: I3953bb7f02dba03a719f4c9851163beb18789d25
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 13:18:30 +00:00
Tiger Huang
c15af2cb87 Merge "Don't set animation pending when gaining fake control" into tm-dev 2022-04-26 12:47:42 +00:00
Michael Wright
93c428eecf Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb1d am: fb548f448e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907953

Change-Id: Idb2971d3d26b7b5760a6c3f026ce757acc238067
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:42 +00:00
Automerger Merge Worker
cae3a18de7 Merge "Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f789 am: 5546e30656" into tm-d1-dev-plus-aosp 2022-04-26 10:37:38 +00:00
Automerger Merge Worker
d473d70c7f Merge "Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb1d am: 9d1842da54" into tm-d1-dev-plus-aosp 2022-04-26 10:37:36 +00:00
Charles Chen
2479e2270a Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f789 am: 5546e30656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17897246

Change-Id: I4159f8a72869c460a6f22691a1a293cd185b0f62
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:34 +00:00
Michael Wright
45032aea5a Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb1d am: 9d1842da54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907953

Change-Id: Ic6cb58a213ba9bdebd27bf3cd0e095f736f0aadf
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:25 +00:00
Robert Horvath
d826f99e76 Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev am: 943ffdb6c1 am: bc356e6115 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717063

Change-Id: I68bef1e00df40dbde65785cf4061ddc08f68ea2e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:21 +00:00
Charles Chen
b098337ef3 Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f789 am: c0e4da28df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17897246

Change-Id: I4341e1d02ef02c2201f70907c9583c900def6a89
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:17 +00:00
Automerger Merge Worker
edc920d629 Merge "Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev am: 9cbaca7306 am: 176330366f" into tm-d1-dev-plus-aosp 2022-04-26 10:37:13 +00:00
Michael Wright
fb548f448e Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907953

Change-Id: Ib3d52beb7f96969a0e8290257813935fe99e5e34
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:10 +00:00
Christian Göllner
223c7562e3 Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev am: 9cbaca7306 am: 176330366f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940788

Change-Id: I2e174625424daddb51cf61f9d8147d61da643004
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:02 +00:00
Robert Horvath
8f3739a256 Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev am: 943ffdb6c1 am: 6ed7edb83c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717063

Change-Id: Ie119b0a6ac2d14423cac5fde5294645ebe45fa3e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:37:00 +00:00
Michael Wright
9d1842da54 Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907953

Change-Id: I5a83aa0a36a0ba62c6cb5793957cae4a8b633d61
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:36:56 +00:00
Christian Göllner
dc5c4231d2 Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev am: 9cbaca7306 am: 10eaf1c63e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940788

Change-Id: Icc3474546174adf293e66cf6ca5b76e6ab50a308
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:36:48 +00:00
Charles Chen
c0e4da28df Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17897246

Change-Id: I34efc24a2a09d03890527dc583df6d571ce774ad
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 10:35:52 +00:00
Michael Wright
1cc6eceb1d Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev 2022-04-26 10:17:34 +00:00
Charles Chen
5546e30656 Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17897246

Change-Id: I7e89fa45fe39c4c874b3fdc9c8c2a64fcbcb4b26
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:38:08 +00:00
Charles Chen
57edb1f789 Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev 2022-04-26 08:33:59 +00:00
Robert Horvath
bc356e6115 Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev am: 943ffdb6c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717063

Change-Id: I9bf2336d9ac46ced3b1795c9e81e49857511c974
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:31:37 +00:00
Christian Göllner
176330366f Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev am: 9cbaca7306 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940788

Change-Id: Id1b55f9c6c706335b220fe002c095cc8965ffb5e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:30:58 +00:00
Robert Horvath
6ed7edb83c Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev am: 943ffdb6c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717063

Change-Id: Ifc8a6b819a29733ed0363998082e2fc59147aee5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:30:52 +00:00
Christian Göllner
10eaf1c63e Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev am: 9cbaca7306 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940788

Change-Id: Ie1805278ebad10c1a3952d9fd2a436f15f68a350
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:29:42 +00:00
Robert Horvath
943ffdb6c1 Merge "Improve handling of TV PiPs bigger than movement bounds" into tm-dev 2022-04-26 08:28:52 +00:00
Christian Göllner
9cbaca7306 Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev 2022-04-26 08:03:04 +00:00
Charles Chen
101264f887 Merge "Promote isFloating to TestApi" into tm-dev am: 6ed3a87798 am: 98ff6c839b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887364

Change-Id: I98c060707561721be5ae6c5cb2f02aea9a081502
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:18 +00:00
Charles Chen
7a698b00db Merge "Promote isFloating to TestApi" into tm-dev am: 6ed3a87798 am: 3dfcf8b2bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887364

Change-Id: I78fa5accdba8acfe2314842092dec8f7fb5f43f2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:00 +00:00
Charles Chen
98ff6c839b Merge "Promote isFloating to TestApi" into tm-dev am: 6ed3a87798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887364

Change-Id: I043fa2c42d4bad47bc8a871e62b853592244d740
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:43:48 +00:00
Charles Chen
3dfcf8b2bd Merge "Promote isFloating to TestApi" into tm-dev am: 6ed3a87798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887364

Change-Id: I2f6124139cb3bdcb4ac66a599067b0bae5250428
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:42:35 +00:00
Charles Chen
6ed3a87798 Merge "Promote isFloating to TestApi" into tm-dev 2022-04-26 06:20:14 +00:00
Automerger Merge Worker
dff5bc18d1 Merge "Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev am: 02e7e43950 am: 275a5baad1" into tm-d1-dev-plus-aosp 2022-04-26 03:30:32 +00:00
Wei Sheng Shih
b56203323b Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev am: 02e7e43950 am: 6d1127f8fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938063

Change-Id: I64e39ab16c65ce2deb729fc78ffae8754afd9d66
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 03:30:20 +00:00
Wei Sheng Shih
28536e9af3 Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev am: 02e7e43950 am: 275a5baad1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938063

Change-Id: Iff220a8274d9b2c83c2810c28eb0bdb2791a933a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 03:30:20 +00:00
Wei Sheng Shih
6d1127f8fe Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev am: 02e7e43950 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938063

Change-Id: I7f511307fda31d4292406860bece5bd2951cd612
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 03:09:16 +00:00
Wei Sheng Shih
275a5baad1 Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev am: 02e7e43950 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938063

Change-Id: Ic9c2912478bd72c56cfd21da29ee37e87f610754
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 03:07:57 +00:00
Wei Sheng Shih
02e7e43950 Merge "Ensure the splash screen launched from system ui must be solid color." into tm-dev 2022-04-26 02:45:41 +00:00
Colin Cross
0611b8edb7 [automerger skipped] Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b06 am: ff8212309d -s ours am: 488b3ebce7 -s ours 
am skip reason: Merged-In I2b668d1cd875657b27a1d52bda21f238d7020862 with SHA-1 f0f3bcd501 is already in history

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

Change-Id: I98d605113f196c54d754cd3e1823de339806750d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 02:39:00 +00:00
Colin Cross
488b3ebce7 [automerger skipped] Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b06 am: ff8212309d -s ours 
am skip reason: Merged-In I2b668d1cd875657b27a1d52bda21f238d7020862 with SHA-1 f0f3bcd501 is already in history

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

Change-Id: Ib5307e16f1e1dba6ba6e9032cae77e9a58b525cc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 02:18:10 +00:00
Colin Cross
ff8212309d Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b06 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2072001

Change-Id: I00ff987c0fd87fd67b296b41ca19e8484a4a085f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 01:50:29 +00:00
Automerger Merge Worker
eeeca08706 Merge "Merge "Store preferential network service config in xml" into tm-dev am: 6d8f27328f am: 8370436c35" into tm-d1-dev-plus-aosp 2022-04-26 01:23:58 +00:00
Sooraj Sasindran
5bb95d6cf0 Merge "Store preferential network service config in xml" into tm-dev am: 6d8f27328f am: 80b8651a24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17643287

Change-Id: I6f9b69b16674c6457fc92b4571aac023c778633c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 01:23:09 +00:00
Sooraj Sasindran
eb35cf15ef Merge "Store preferential network service config in xml" into tm-dev am: 6d8f27328f am: 8370436c35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17643287

Change-Id: I75d9deed275d68051a32e6476b3a2b79cd26374c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 01:23:09 +00:00
Colin Cross
2a3aa26b06 Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" 2022-04-26 01:15:38 +00:00
Sooraj Sasindran
80b8651a24 Merge "Store preferential network service config in xml" into tm-dev am: 6d8f27328f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17643287

Change-Id: I5d81f069c4527551cf3714cf3013d393d29f2b12
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 01:02:25 +00:00
Sooraj Sasindran
8370436c35 Merge "Store preferential network service config in xml" into tm-dev am: 6d8f27328f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17643287

Change-Id: Ie9b147d23587bc430aff20eb513a13d3344271db
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 01:01:10 +00:00
Sooraj Sasindran
6d8f27328f Merge "Store preferential network service config in xml" into tm-dev 2022-04-26 00:41:48 +00:00
Automerger Merge Worker
2bd3564492 Merge "Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am: 75fb4d3021 am: 637ba3ac8a" into tm-d1-dev-plus-aosp 2022-04-25 23:31:41 +00:00
TreeHugger Robot
4a16f2f358 Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am: 75fb4d3021 am: 637ba3ac8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892811

Change-Id: I613ec24d86c22fd1477f195498c9e5cdf1fdbff4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 23:31:30 +00:00
TreeHugger Robot
431c2f58ad Merge "Merge intervalMillis of GnssMeasurementRequest" into tm-dev am: 75fb4d3021 am: fd2a632b1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892811

Change-Id: I272db018a2dc729670b676ef4e370bb446e465c1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 23:31:29 +00:00