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

767943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eun-Jeong Shin
00a8ba34ad Merge changes from topic "presubmit-am-eaed8ad228db4e0992b91a3d0667fb78" into tm-mainline-prod am: 0207a743b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17575366

Change-Id: Ic8fbf204d2bedac8b3899ad40596e1c7a9d34afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 04:38:19 +00:00
David Anderson
d786d68765 Merge changes from topic "presubmit-am-2355cba6040b4ac28f66e83feb674a33" into tm-mainline-prod am: 12670f2bca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17546797

Change-Id: I18ebac21a0381c3e265b69ecfb48593de09973d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 04:36:53 +00:00
Eun-Jeong Shin
0207a743b7 Merge changes from topic "presubmit-am-eaed8ad228db4e0992b91a3d0667fb78" into tm-mainline-prod 
* changes:
  [automerge] Handling exception when per-use prompt cannot be generated 2p: f41f0dea68
  Handling exception when per-use prompt cannot be generated
 2022-04-07 04:19:31 +00:00
Eun-Jeong Shin
7155c60db1 Merge changes from topic "presubmit-am-eaed8ad228db4e0992b91a3d0667fb78" 
* changes:
  [automerge] Handling exception when per-use prompt cannot be generated 2p: f41f0dea68 2p: de7cecc646
  [automerge] Handling exception when per-use prompt cannot be generated 2p: f41f0dea68
  Handling exception when per-use prompt cannot be generated
 2022-04-07 04:19:31 +00:00
David Anderson
12670f2bca Merge changes from topic "presubmit-am-2355cba6040b4ac28f66e83feb674a33" into tm-mainline-prod 
* changes:
  [automerge] Optimize EROFS detection code. 2p: 135ac09990
  Optimize EROFS detection code.
 2022-04-07 04:17:16 +00:00
TreeHugger Robot
08f1b998b9 Merge "[CDM perm sync] Bold device names" 2022-04-07 04:07:48 +00:00
Ilya Matyukhin
a730d7f112 Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4ad am: 11c76382e2 am: ef61a16605 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878

Change-Id: Iee098dcdb996664c25826a3ec1b98cc3a7f9abe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 04:02:53 +00:00
Riddle Hsu
ac23910cbb Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev am: 4479d98a43 am: 7ef11e51bf am: b88a485e0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536786

Change-Id: I021dbda0d13adb55177aa40895ba3f5efc6bfe06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 04:02:07 +00:00
Ilya Matyukhin
ef61a16605 Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4ad am: 11c76382e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878

Change-Id: I7183278eb8ccdba04bb1e1497a8d3ab631a11d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:41:06 +00:00
Riddle Hsu
b88a485e0d Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev am: 4479d98a43 am: 7ef11e51bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536786

Change-Id: I248163f7f887e18c563f8248f7065b9158fd137e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:40:53 +00:00
Ilya Matyukhin
23254ccd7a Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4ad am: cd11bad9fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878

Change-Id: I835be79789e9cd689137c2a40db2b32bd3cd7028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:33:56 +00:00
Riddle Hsu
529fbc8f91 Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev am: 4479d98a43 am: ce25c60e69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536786

Change-Id: I8396f229528a7541ea197a11eff3cea7c7be584b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:33:20 +00:00
Ilya Matyukhin
760528780c Merge changes from topic "presubmit-am-a097d19b46714d919133992650772d7d" into tm-mainline-prod am: d2d6180ce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878

Change-Id: I1ec37fcb98685edd06c60b543aed37499d31dae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:31:10 +00:00
Ilya Matyukhin
11c76382e2 Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878

Change-Id: Ia21e8cc27e6a935dafeb1a2e51cf8f564325a6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:17:58 +00:00
Ilya Matyukhin
cd11bad9fe Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev am: dd14aed4ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17627878

Change-Id: I97b8cbf13877319c5066b0152a1e373b04cf4218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:17:20 +00:00
Riddle Hsu
7ef11e51bf Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev am: 4479d98a43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536786

Change-Id: I173293e1e342c92493384718be8f102d0a5fc643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:17:14 +00:00
Riddle Hsu
ce25c60e69 Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev am: 4479d98a43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17536786

Change-Id: Ia1000725421230687d0016e588fd90331f31c786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:16:15 +00:00
Ilya Matyukhin
f2a1449f34 Merge changes from topic "presubmit-am-a097d19b46714d919133992650772d7d" 
* changes:
  [automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b034 2p: 9df49f5c46
  [automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b034
  Tighten the scope of ACTION_UDFPS_ILLUMINATE
 2022-04-07 03:14:01 +00:00
Ilya Matyukhin
d2d6180ce8 Merge changes from topic "presubmit-am-a097d19b46714d919133992650772d7d" into tm-mainline-prod 
* changes:
  [automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b034
  Tighten the scope of ACTION_UDFPS_ILLUMINATE
 2022-04-07 03:14:01 +00:00
Ilya Matyukhin
dd14aed4ad Merge "Tighten the scope of ACTION_UDFPS_ILLUMINATE" into tm-dev 2022-04-07 03:14:01 +00:00
Tyler Gunn
e3dab8b6a4 [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours am: 3c3d2c00bc -s ours am: 8964382cc8 -s ours am: ac3dae08f1 -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history

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

Change-Id: I8c85e93b133d77038e2351eb7aaf70a8c5f2b7ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:13:07 +00:00
Jerry Chang
69b92f6252 Merge "Fix weird animation when switching back to split pair from recents" into tm-dev am: ecbc9712eb am: 8b16f86578 am: 4188b4de1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523303

Change-Id: Iffe9ae1c0783618d092a4e6b0870c4854179faa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:12:27 +00:00
Tyler Gunn
ac3dae08f1 [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours am: 3c3d2c00bc -s ours am: 8964382cc8 -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history

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

Change-Id: I5ec14b0bac7a649d32dbf68db7c2421a255dc0d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:10:45 +00:00
Tiger Huang
9b9e94a7a8 Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa46 am: b1b3b872a2 am: 9448e53b0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607661

Change-Id: Ic79d88b7e88f4da19cba86098ba35b2fa4640f0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:10:02 +00:00
Sudheer Shanka
7aeb2a6163 Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803 am: b869ffc44c am: b153a4191b am: 451854f66f am: 994b2207c3 am: 0d93d74c65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523

Change-Id: I2576c1e082f23b3d83a54d521747c47473d4ac3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:08:45 +00:00
Jinyoung Jeong
38b4d91bd2 Merge "Logged Euicc eid in UiccController" into tm-dev am: 247a9e5d53 am: e6104786a4 am: 7c16789725 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518070

Change-Id: Ic1d9c81ded8b686d33ae5c92fc9030f20c7755a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:05:45 +00:00
Tyler Gunn
ec7aeeec13 [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: cee2a1fd34 -s ours am: 43e8b1793f -s ours am: 312f5a570e -s ours am: fac1e614b2 -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 e041621587 is already in history

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

Change-Id: I0427ecaf7de4c1039308cf2ed967f882df10cf42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:03:23 +00:00
Riddle Hsu
4479d98a43 Merge "Ensure task will be attached when starting activity from AppTask" into tm-dev 2022-04-07 03:01:45 +00:00
Tyler Gunn
cf74fc38e8 [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours am: 3c3d2c00bc -s ours am: 8f926b72ee -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history

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

Change-Id: I3feae38b7d2d066a61d2d4f30c558f549d786e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:54:09 +00:00
Jerry Chang
785808330e Merge "Fix weird animation when switching back to split pair from recents" into tm-dev am: ecbc9712eb am: 19fea39701 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523303

Change-Id: Ibe66e7d836006c93b58e5fc90a8edf557d7a0397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:53:21 +00:00
Tiger Huang
0f2c3931b9 Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa46 am: 34df8d94c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607661

Change-Id: I44556987a91cef61541a50645729ce06f1d51002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:52:15 +00:00
Sudheer Shanka
68301993e8 Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803 am: b869ffc44c am: b153a4191b am: 451854f66f am: 6341dca18d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523

Change-Id: I784e5eaf4beecec553442001b697982893e0316a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:51:22 +00:00
Jinyoung Jeong
c4bed08eda Merge "Logged Euicc eid in UiccController" into tm-dev am: 247a9e5d53 am: 3a228e59b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518070

Change-Id: I43d63dd5f4d861779faec376b4c75e0a11b1410f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:50:42 +00:00
Tyler Gunn
c7bac90b31 [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: cee2a1fd34 -s ours am: 43e8b1793f -s ours am: 717aadeaf7 -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 e041621587 is already in history

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

Change-Id: Iede2d91f2e7813f708e654c625a489142ea04dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:49:45 +00:00
Tyler Gunn
8964382cc8 [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours am: 3c3d2c00bc -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history

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

Change-Id: I0d8c49893d9b891170554f572a8838e3fd3ac56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:49:20 +00:00
Jinyoung Jeong
feab60e18b Merge changes from topic "pii_eid_log-tm-dev" into tm-mainline-prod am: 7a366fba0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518070

Change-Id: Idb2383e350f7fd51901acd0dd2589f5a3a10b396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:48:58 +00:00
Jerry Chang
4188b4de1f Merge "Fix weird animation when switching back to split pair from recents" into tm-dev am: ecbc9712eb am: 8b16f86578 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523303

Change-Id: I3c0a815fe781670bf40e937f28be0c3ba1e00e22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:44:41 +00:00
Tiger Huang
9448e53b0d Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa46 am: b1b3b872a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607661

Change-Id: Iacbdad66f6e817117146c2a4d85e4706778d1b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:44:24 +00:00
Sudheer Shanka
0d93d74c65 Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803 am: b869ffc44c am: b153a4191b am: 451854f66f am: 994b2207c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523

Change-Id: I7957121e4e3131464743ecf582f1be301a3ec481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:43:44 +00:00
Tyler Gunn
8f926b72ee [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours am: 3c3d2c00bc -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history

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

Change-Id: Ib97ab7416660a181a76bdadff7c0dd6c6d78f3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:43:24 +00:00
Jinyoung Jeong
7c16789725 Merge "Logged Euicc eid in UiccController" into tm-dev am: 247a9e5d53 am: e6104786a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518070

Change-Id: Ifdb317008d6236e4579e0f3b555c0cc32d6c62bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:42:53 +00:00
Tyler Gunn
fac1e614b2 [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: cee2a1fd34 -s ours am: 43e8b1793f -s ours am: 312f5a570e -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 e041621587 is already in history

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

Change-Id: Ieeea4536ae9ec13e36009c5ce84894eb5fe81d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:42:37 +00:00
Jerry Chang
19fea39701 Merge "Fix weird animation when switching back to split pair from recents" into tm-dev am: ecbc9712eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523303

Change-Id: Ie585f588a7b68a1610156dc1a736efd11d3271f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:41:33 +00:00
Tyler Gunn
3c3d2c00bc [automerger skipped] Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 am: d4e7e2336a am: 55d000f62c -s ours 
am skip reason: Merged-In I8e4425a4e7de716f86b1f1f56ea605d93f357a57 with SHA-1 f0f67b5a31 is already in history

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

Change-Id: Ie00a8343b9466c3a92601a06550de5683cf3cef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:41:08 +00:00
Jerry Chang
8b16f86578 Merge "Fix weird animation when switching back to split pair from recents" into tm-dev am: ecbc9712eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17523303

Change-Id: I694dcbb1f0ebe8deb4a6b45041957a7a8d1313e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:34:05 +00:00
Jerry Chang
ecbc9712eb Merge "Fix weird animation when switching back to split pair from recents" into tm-dev 2022-04-07 02:31:12 +00:00
Tiger Huang
b1b3b872a2 Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607661

Change-Id: I836dfd67e99ee8022cf978a842e5ab0c8c2ac1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:26:01 +00:00
Tiger Huang
34df8d94c9 Merge "Update touch mode regardless of mStopped" into tm-dev am: 88fdb7aa46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607661

Change-Id: I5887a772bf3475a321dcdc0202ce9bff101090eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:25:03 +00:00
Tiger Huang
88fdb7aa46 Merge "Update touch mode regardless of mStopped" into tm-dev 2022-04-07 02:17:08 +00:00
Sudheer Shanka
994b2207c3 Merge "Update net/TEST_MAPPING to run more tests in presubmit." am: ff7bc1e803 am: b869ffc44c am: b153a4191b am: 451854f66f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049523

Change-Id: I23abd916bfec100b457cb658ee5b8d6671c87b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:12:00 +00:00