Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,605 Commits 3 Branches 0 Tags
70ebdbebcd9410157548d6eee72ef8072ec13ab2
Commit Graph

660605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
70ebdbebcd Merge "Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc218 am: 2a237b7426" into sc-v2-dev-plus-aosp 2021-07-20 15:08:43 +00:00
Issei Suzuki
9f1314602f Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc218 am: 2a237b7426 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302103

Change-Id: Ic39ed4bc6a1d3e9cbdd2ea963481f2d8a03e1e6a
 2021-07-20 15:08:37 +00:00
TreeHugger Robot
a080251513 Merge "Propagate launch root task for consecutive launch" into sc-v2-dev am: 3a2efa41f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301153

Change-Id: I406a380a9bc242066c56a113a00b75f7c3b02e67
 2021-07-20 15:08:27 +00:00
Issei Suzuki
643fdc6e7e Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc218 am: c495b42a83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302103

Change-Id: I026d1607b954fb8a1c10fdaa6074eab3a1515989
 2021-07-20 15:08:17 +00:00
TreeHugger Robot
3a2efa41f2 Merge "Propagate launch root task for consecutive launch" into sc-v2-dev 2021-07-20 15:02:00 +00:00
Issei Suzuki
c495b42a83 Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302103

Change-Id: Ia2b5acea0c6f192daf9e577645aa854005f5c9f7
 2021-07-20 14:56:36 +00:00
Issei Suzuki
2a237b7426 Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev am: a16f9cc218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15302103

Change-Id: I2d2b108d84c6dd5cafe5fa2eaca8552288ea48c2
 2021-07-20 14:55:53 +00:00
Issei Suzuki
a16f9cc218 Merge "Stop animation when screen times out and the user turns on the phone." into sc-dev 2021-07-20 14:40:26 +00:00
Treehugger Robot
c571747899 Merge "Update SELinuxMMAC OWNERS" am: cdfdcdadbd am: b0710bceb4 am: f4d72ab18a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760351

Change-Id: Ifc5f8f33e391e16fd29051dcb8f5f6676cdaac9a
 2021-07-20 13:37:15 +00:00
Treehugger Robot
f4d72ab18a Merge "Update SELinuxMMAC OWNERS" am: cdfdcdadbd am: b0710bceb4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760351

Change-Id: Iba6c5288252a165d90c1612ee25734589f396e95
 2021-07-20 13:26:14 +00:00
Treehugger Robot
b0710bceb4 Merge "Update SELinuxMMAC OWNERS" am: cdfdcdadbd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760351

Change-Id: I2aebcc1348e06ae2e856f88cf2855b2ff9522037
 2021-07-20 13:09:18 +00:00
Treehugger Robot
cdfdcdadbd Merge "Update SELinuxMMAC OWNERS" 2021-07-20 12:54:09 +00:00
Kweku Adams
e3ac589891 Merge "Fix parameter order." into sc-dev am: c2f4752a71 am: be14c750bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329707

Change-Id: I7b65851b9c0d26aedd849bf5cc3751170030003a
 2021-07-20 12:01:55 +00:00
Kweku Adams
3aad266ac3 Merge "Fix parameter order." into sc-dev am: c2f4752a71 am: 88eaf8f214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329707

Change-Id: Iff78fd32782a02660219158db6c2ae2bd702ca91
 2021-07-20 12:01:35 +00:00
Kweku Adams
88eaf8f214 Merge "Fix parameter order." into sc-dev am: c2f4752a71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329707

Change-Id: I954301b5c1dbb04210944523e2cbbfe93cb6949e
 2021-07-20 11:47:57 +00:00
Kweku Adams
be14c750bf Merge "Fix parameter order." into sc-dev am: c2f4752a71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329707

Change-Id: Ibbd60be7786586699ae4bb5fd32e4e7bd6e0a711
 2021-07-20 11:47:26 +00:00
Kweku Adams
c2f4752a71 Merge "Fix parameter order." into sc-dev 2021-07-20 11:37:09 +00:00
Michał Brzeziński
19a55481b8 Merge "Showing small lockscreen clock when media player visible in split shade" into sc-v2-dev am: 1f172ff7de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328594

Change-Id: I9fa1eafe87323c418a77b285dcafe39d44c62ac8
 2021-07-20 10:28:47 +00:00
Michał Brzeziński
1f172ff7de Merge "Showing small lockscreen clock when media player visible in split shade" into sc-v2-dev 2021-07-20 10:11:12 +00:00
Thales Lima
17cbb01921 Merge "sysui: show a drag handler when QS is collapsed in split shade" into sc-v2-dev am: da634dae10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235313

Change-Id: Ibeacf92b6531a3e5c1098bdcacdd06f38aa008eb
 2021-07-20 10:03:49 +00:00
Thales Lima
da634dae10 Merge "sysui: show a drag handler when QS is collapsed in split shade" into sc-v2-dev 2021-07-20 09:43:17 +00:00
TreeHugger Robot
801681db29 [automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" into sc-dev am: 9a9741b90c am: 454f12ca7c -s ours 
am skip reason: Merged-In Ie34997a08aa743642c66a20c4b756cd47bff4af1 with SHA-1 9acdb43f89 is already in history

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

Change-Id: I53c1b5cf3b778956c7f31b1a2d4382ade3a0610d
 2021-07-20 09:36:48 +00:00
TreeHugger Robot
c80d079a3b [automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" into sc-dev am: 9a9741b90c -s ours am: 34955f75e9 -s ours 
am skip reason: Merged-In Ie34997a08aa743642c66a20c4b756cd47bff4af1 with SHA-1 5e43390b9b is already in history

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

Change-Id: I1429905b96866e0fe378392f8d0f190fe000b398
 2021-07-20 09:36:23 +00:00
TreeHugger Robot
454f12ca7c Merge "Fixing the race condition in GenerateRkpKey" into sc-dev am: 9a9741b90c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14961081

Change-Id: I947269d5a67c31c818436de950c715817661162d
 2021-07-20 09:16:32 +00:00
TreeHugger Robot
34955f75e9 [automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" into sc-dev am: 9a9741b90c -s ours 
am skip reason: Merged-In Ie34997a08aa743642c66a20c4b756cd47bff4af1 with SHA-1 5e43390b9b is already in history

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

Change-Id: Ic85f3204841987115984dbe3d37fcff53969839a
 2021-07-20 09:16:07 +00:00
TreeHugger Robot
9a9741b90c Merge "Fixing the race condition in GenerateRkpKey" into sc-dev 2021-07-20 09:04:54 +00:00
Max Bires
9acdb43f89 Fixing the race condition in GenerateRkpKey 
This file was written on the assumption that bindService was
synchronous, which it isn't. This change adds a CountDownLatch to force
the class to wait for the binding to finish. If the relevant key
generation service is not present on the system, then this
functionality will just silently be skipped over.

Bug: 190222116
Test: atest RemoteProvisionerUnitTests
Change-Id: Ie34997a08aa743642c66a20c4b756cd47bff4af1
Merged-In: Ie34997a08aa743642c66a20c4b756cd47bff4af1
 2021-07-20 09:04:17 +00:00
Treehugger Robot
268db7453e Merge "Gracefully handle integer overflows." am: edbf08efe4 am: d4909b9aa9 am: f305d79b2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714119

Change-Id: Idcf0ab5837a3d8c02e31895e97ed6bdffe529abe
 2021-07-20 08:29:13 +00:00
Treehugger Robot
f305d79b2f Merge "Gracefully handle integer overflows." am: edbf08efe4 am: d4909b9aa9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714119

Change-Id: I95ef9e71987fc39250e6edd107fe2ec597b1ea17
 2021-07-20 08:15:13 +00:00
Treehugger Robot
d4909b9aa9 Merge "Gracefully handle integer overflows." am: edbf08efe4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1714119

Change-Id: Ie9e65036aed6448183c45c0c526976474b5555ab
 2021-07-20 07:59:01 +00:00
Treehugger Robot
edbf08efe4 Merge "Gracefully handle integer overflows." 2021-07-20 07:36:56 +00:00
Wei Sheng Shih
0249861f81 Merge "Correct StartingWindowInfo for non-top activity." into sc-dev am: 6b43ea0a73 am: abe57dc593 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287622

Change-Id: Ib477477cca273d49cd880126acf9510b890773c8
 2021-07-20 06:23:01 +00:00
Wei Sheng Shih
d379a4bece Merge "Correct StartingWindowInfo for non-top activity." into sc-dev am: 6b43ea0a73 am: dcd0eb03f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287622

Change-Id: I811752dc4ea7f7bf60bfdb0febbddb86d91c6ea8
 2021-07-20 06:22:44 +00:00
Wei Sheng Shih
dcd0eb03f7 Merge "Correct StartingWindowInfo for non-top activity." into sc-dev am: 6b43ea0a73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287622

Change-Id: I7dd3ab48d7c58521af19a7718be320a7e580749e
 2021-07-20 06:11:59 +00:00
Wei Sheng Shih
abe57dc593 Merge "Correct StartingWindowInfo for non-top activity." into sc-dev am: 6b43ea0a73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287622

Change-Id: I743af3c56aec67e1a9487235f1a4a4e64cbaf4a3
 2021-07-20 06:10:34 +00:00
Wei Sheng Shih
6b43ea0a73 Merge "Correct StartingWindowInfo for non-top activity." into sc-dev 2021-07-20 06:00:39 +00:00
Lyn Han
0af5f37c16 Merge "Use alpha instead of invisible for views below shelf to skip redraw" into sc-dev am: 27a1fdb018 am: 202ca05bd6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331191

Change-Id: I8013e795feae00201b73c0a0d254a69fd8289e8f
 2021-07-20 05:09:52 +00:00
Lyn Han
d64e6ed07a Merge "Use alpha instead of invisible for views below shelf to skip redraw" into sc-dev am: 27a1fdb018 am: 34644987c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331191

Change-Id: Ie703fdd8884320d7c21878ad43943cac0392a8b0
 2021-07-20 05:09:31 +00:00
Lyn Han
34644987c6 Merge "Use alpha instead of invisible for views below shelf to skip redraw" into sc-dev am: 27a1fdb018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331191

Change-Id: Ie9ece86634d0131b2515ec1b78f12c9260ae472e
 2021-07-20 04:55:33 +00:00
Lyn Han
202ca05bd6 Merge "Use alpha instead of invisible for views below shelf to skip redraw" into sc-dev am: 27a1fdb018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331191

Change-Id: I90ae6879a6a93ee870ffe262fc9679667cde668b
 2021-07-20 04:54:42 +00:00
Lyn Han
27a1fdb018 Merge "Use alpha instead of invisible for views below shelf to skip redraw" into sc-dev 2021-07-20 04:43:36 +00:00
TreeHugger Robot
fa493561e3 Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-qpr-dev am: e3ac127d7a am: fdcfed3935 am: 7cdb475ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287613

Change-Id: I2b3c563ba159d34c91e6d656de93d42f0fdb9331
 2021-07-20 04:31:19 +00:00
TreeHugger Robot
1e623cd076 Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into sc-dev am: 72c0350b44 am: 501378107e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287614

Change-Id: I44c2732dc512995db8f1732387b66e3a103040bf
 2021-07-20 04:30:40 +00:00
TreeHugger Robot
570e8e3b52 Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev am: 30c6383d1d am: 3d3db03f9f am: 2e5af9fd16 am: 3e83a6ff93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287612

Change-Id: I994b28dca9741f812798b4036657e07176d1ae74
 2021-07-20 04:30:05 +00:00
TreeHugger Robot
0eb6b6da46 Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-dev am: 30c6383d1d am: 17d1be8efc am: 5cb13bbebf am: 5c074eea36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287612

Change-Id: I949f1047cc073882a66c9757669bf66b2981ac11
 2021-07-20 04:29:55 +00:00
Rambo Wang
d9b7d2f1fb [automerger skipped] Merge "Clear binder identity in callback of IMS IPC interfaces" into sc-dev am: 4696dc9bf8 -s ours am: 0923560b25 -s ours 
am skip reason: Merged-In I34225e32111879e155c9f7865f0045430d171467 with SHA-1 c18002c465 is already in history

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

Change-Id: I599a621b33d31a9e375d54db3695e7b2852297ea
 2021-07-20 04:29:48 +00:00
Tracy Zhou
f3e05d4085 Merge "Merge "Remove RecentsOnboarding" into sc-dev am: 6a8ca02c6f am: fba35062c5" into sc-v2-dev-plus-aosp 2021-07-20 04:26:12 +00:00
TreeHugger Robot
62f5022a4e Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-qpr-dev am: e3ac127d7a am: fdcfed3935 am: 1718accee3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287613

Change-Id: I778a0d017c34d7ad11d7fed26abc9f64ab2b69a9
 2021-07-20 04:13:20 +00:00
TreeHugger Robot
2703b2b8dd Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into sc-dev am: 72c0350b44 am: fcf5cf1b34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287614

Change-Id: Ia2f33ea199efc047141505fb67f565538352cb17
 2021-07-20 04:12:54 +00:00
TreeHugger Robot
7cdb475ccb Merge "Revert "wifidisplay: restrict broadcast by the proper permission"" into rvc-qpr-dev am: e3ac127d7a am: fdcfed3935 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287613

Change-Id: I63a8a2e2595e33a97d09fbe393d797cffee5ecf1
 2021-07-20 03:58:41 +00:00