Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,643 Commits 3 Branches 0 Tags
3ebb7ced3100f004fce033b7ed835eaee19cfbed
Commit Graph

635643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Pietal
3ebb7ced31 Smartspace + shelf - Remove space 
No need to any top margins. Move the shelf closer.

Bug: 172360102
Test: manual
Change-Id: I42ef1d1e960ccfcca69cccf1e7c2cf1ec831ff77
 2021-04-14 10:06:06 -04:00
Anton Hansson
f63b7f0501 [automerger skipped] Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6 am: ad986df778 -s ours 
am skip reason: skip tag Change-Id Idef6f2fd89116490c43427bba55202f46377a83d with SHA-1 9c74c744fc is already in history

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

Change-Id: Ice6855b8b985465ff1657fed66f9029fcf57a48d
 2021-04-14 11:16:31 +00:00
Anton Hansson
ad986df778 Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab am: 774da343c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673391

Change-Id: Ib95e1f34d7fa382d05c6e191ddb021b5bf5dad3c
 2021-04-14 10:51:40 +00:00
Matt Pietal
1233b55e1e Merge "Smartspace - Align large clock" into sc-dev 2021-04-14 10:34:57 +00:00
Anton Hansson
774da343c6 Merge "Inline usage of jarjar_rules.txt" am: c6a0cddfab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673391

Change-Id: I1b320ba1c7332b1126843c106ed6f5452e98472a
 2021-04-14 10:10:47 +00:00
Issei Suzuki
fa2ddbe2ef Merge "Wait OCCLUDE transition until screen turning on activity becomes ready." into sc-dev 2021-04-14 10:00:02 +00:00
Pavel Grafov
7ecbda5d91 Merge "API review: change getKeyPairGrants return type" into sc-dev 2021-04-14 09:58:49 +00:00
Issei Suzuki
8560c1c2b1 Merge "Let keyguard (un)occlude animation run even when no activity exists." into sc-dev 2021-04-14 09:50:32 +00:00
Anton Hansson
c6a0cddfab Merge "Inline usage of jarjar_rules.txt" 2021-04-14 09:45:00 +00:00
Shan Huang
10cbd1f1e5 Merge "Set charging animation windows as trusted overlays so that touches can pass through." into sc-dev 2021-04-14 09:12:50 +00:00
Shan Huang
d7217299a7 Merge "Fix a bug that ripple might get readded to WM and cause crash." into sc-dev 2021-04-14 09:11:53 +00:00
Nataniel Borges
6788d2b5d6 Merge changes from topics "3button-runner", "re-enable-flicker" into sc-dev 
* changes:
  Disable some trace assertions
  Fix use of NavigationModeRule on flicker
 2021-04-14 08:35:07 +00:00
TYM Tsai
f379c17e98 Merge "Fallback to the default platform password manager" into sc-dev 2021-04-14 07:45:16 +00:00
Tianjie Xu
9bf277f905 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da am: cd4836d197 am: f3bde71026 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: Ie1a2e4e87e1dcda0b53044c0cb577b938455fdee
 2021-04-14 07:17:25 +00:00
Bill Yi
9b4ec0cd60 [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours am: d4aa3fc310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie382825bbc4a1b0cda64fe7a118dd6066b2cae7c
 2021-04-14 07:16:31 +00:00
Issei Suzuki
f8853f75c1 Wait OCCLUDE transition until screen turning on activity becomes ready. 
When the screen is off, WindowManger usually skips running an app
transition animation when updating visibility of activities. However, in
case the activity is going to turn on the screen, we should not skip an
app transition animation even if the screen is not yet on.

I extended ActivityRecord#okToAnimate, so that it can ignore screen
status and it can be used with ActivityRecord#canTurnScreenOn predicate.

Bug: 175687166
Bug: 182975035
Change-Id: Id8079df2027becadc9c5e8266149f6eb76b467b6
Test: Receive phone call while the screen is off.
 2021-04-14 09:05:39 +02:00
Tianjie Xu
f3bde71026 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da am: cd4836d197 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: I6aabf1250d67f6a79711e89fb05c68bf84849656
 2021-04-14 06:32:31 +00:00
Bill Yi
d4aa3fc310 [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

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

Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be
 2021-04-14 06:31:20 +00:00
Siarhei Vishniakou
f3779061f4 Merge "Revert "Check mInputEventReceiver before sending timeline"" into sc-dev 2021-04-14 06:26:45 +00:00
Ben Murdoch
35fccc4535 Revert "Check mInputEventReceiver before sending timeline" 
This reverts commit d2766d013f.

Reason for revert: Cheery pick for release build stabilisation

Bug: 169866723
Bug: 184255546
Bug: 184771626
Bug: 185015591

Change-Id: I1ee859aa8432598932efe918656146d257c6684e
 2021-04-14 06:24:10 +00:00
Tianjie Xu
cd4836d197 Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649651

Change-Id: I5fc640360434adc032c2bc3691e9fd15eb5ea4b9
 2021-04-14 05:55:51 +00:00
Bill Yi
b67a5b50fa [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

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

Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
 2021-04-14 05:46:16 +00:00
Benedict Wong
9dfb804a4e Convert VcnNetworkProvider to use NetworkOffers 
This change brings VcnNetworkProvider to full functionality in the new
NetworkProvider paradigm, where NetworkProviders offer networks, and are
notified based on NetworkOfferCallbacks.

Bug: 185204197
Test: atest FrameworksVcnTests
Change-Id: I88c69c0be9f6fd81839fb1595ed00341001694a5
 2021-04-14 05:41:51 +00:00
Benedict Wong
183576c844 Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,If2abfec1 into sc-dev 
* changes:
  Switch to using NetworkScore instead of legacy integer
  Remove use of network scores, and provider IDs in VcnNetworkProvider
  Improve dump detail
  Disable INTERNET/DUN when mobile data toggled off
  Remove unused variable in MtuUtils
 2021-04-14 05:41:39 +00:00
Tianjie Xu
246c14d6da Merge "Improve the error handling for armRebootEscrow" 2021-04-14 05:23:07 +00:00
Bill Yi
8e90abbe39 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:51 +00:00
Paul Hu
68c58b9ccd Merge "Add [get|set]MaxManifestReceiverApiLevel to test api for CTS" into sc-dev 2021-04-14 04:52:38 +00:00
Shan Huang
4d8cd6a0d7 Set charging animation windows as trusted overlays so that 
touches can pass through.

Test: Manual
Bug: 184867824
Change-Id: I8f37b68ea48076eb9ad90aa1d7d200b9316a2253
 2021-04-14 11:51:50 +08:00
Roshan Pius
9bed14ecc8 Merge changes from topic "uwb_aosp_service" into sc-dev 
* changes:
  UwbService: Handle vendor service death
  UwbService: Create a UwbRanging callback wrapper
  Uwb: Create a new Uwb system service
 2021-04-14 03:26:40 +00:00
Kyunglyul Hyun
90e33e72cb Merge "Change PlaybackState#isActiveState to isActive" into sc-dev 2021-04-14 03:18:06 +00:00
Allen Su
11d3489ba1 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde am: bf7c109ed6 am: 85f4d04ef2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: Iea60a39cb6fc3b2d5ed5732111b18fb64bf0bcdf
 2021-04-14 03:01:13 +00:00
Lorenzo Colitti
53ba814150 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: b2087b4635 am: 1a4acce753 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
 2021-04-14 03:00:32 +00:00
Chiachang Wang
f2488fcc1a Merge "Add framework-connectivity-test-defaults into integration test" into sc-dev 2021-04-14 02:46:42 +00:00
Chiachang Wang
a12c1f150d Add framework-connectivity-test-defaults into integration test 
Bug: 182859030
Test: m
Change-Id: I4421a582782d1bc0acdec26e7c9f60d68d649028
 2021-04-14 02:46:21 +00:00
Bill Yi
4167bf213c Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
 2021-04-13 19:36:45 -07:00
Allen Su
85f4d04ef2 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde am: bf7c109ed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: I02897bc33c500660aadf20a1aa198a9db10643b8
 2021-04-14 02:33:21 +00:00
Lorenzo Colitti
1a4acce753 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: b2087b4635 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
 2021-04-14 02:33:11 +00:00
Shan Huang
608087aa12 Fix a bug that ripple might get readded to WM and cause crash. 
Bug: 184868310
Test: SystemUITests
Test: Manually
Change-Id: Idfd7d25ee60065ef3b2d9b48a35b5a8c570fc945
 2021-04-14 09:58:32 +08:00
Bill Yi
a747410776 [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: d4df20e57f -s ours am: 4f15a7cf47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1d72d31954f31f9f1cefa3bd557c5bce3fb6f9e
 2021-04-14 01:30:08 +00:00
Allen Su
bf7c109ed6 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: I735b41ed53ce7d374b5d36c4aee79f73d0334234
 2021-04-14 01:28:46 +00:00
Lorenzo Colitti
b2087b4635 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
 2021-04-14 01:24:19 +00:00
Shivam Agrawal
95a8c189bf Merge "Device-Specific Display Settings Should Not Be Applied During Tests" into sc-dev 2021-04-14 01:22:06 +00:00
Benedict Wong
ffc912dace Switch to using NetworkScore instead of legacy integer 
This change switches the VcnNetworkAgent from using the legacy score
integer, and switches to using the new NetworkScore, using the legacy
integer as a internal representation.

Bug: 185204197
Test: FrameworksVcnTests
Change-Id: Ib0690243f176a2f074358fcc8430f1fd7c3d0d3c
 2021-04-13 17:50:36 -07:00
Benedict Wong
fff0f8ba33 Remove use of network scores, and provider IDs in VcnNetworkProvider 
This change updates the VcnNetworkProvider and associated
requestListeners to no longer use the network score and provider IDs, in
order to match the new NetworkProvider APIs.

Bug: 185204197
Test: atest FrameworksVcnTests
Change-Id: I0cabce702cfd8457fd1a152af07a847b87d67028
 2021-04-13 17:50:36 -07:00
Benedict Wong
1ce20d65e0 Improve dump detail 
This change improves the formatting and detail provided by the VCN dump

Bug: 8675309
Test: atest FrameworksVcnTests
Change-Id: I8f13a0d8fe54e9bf8948e9576e9705024fe79611
 2021-04-13 17:50:31 -07:00
Benedict Wong
fcacb06752 Disable INTERNET/DUN when mobile data toggled off 
This change disables INTERNET and DUN capabilities once the mobile data
toggle is turned off. Additionally, when the toggle is flipped, any
existing networks advertising either of those two capabilities will be
restarted in order to remove the capabilities.

Bug: 184864726
Test: atest FrameworksVcnTests
Change-Id: I81efeaa4b129443b08a597ff45e0037ddefeb414
 2021-04-13 17:50:31 -07:00
Benedict Wong
2abc46ac29 Remove unused variable in MtuUtils 
Bug: 8675309
Test: atest FrameworksNetTests
Change-Id: If2abfec1e5755b3f8cc17fb307ec3e1633bb3e18
 2021-04-13 17:50:25 -07:00
Jeff DeCew
f9139ded2a Merge "Add CallStyle.setIsVideo(boolean)" into sc-dev 2021-04-14 00:37:12 +00:00
Allen Su
23bbd41fde Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" 2021-04-14 00:31:16 +00:00
Bill Yi
4f15a7cf47 [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: d4df20e57f -s ours 
am skip reason: skip tag Change-Id I9af489ae7bdd448c552c97d4478f1760a13fb970 with SHA-1 4aed3924ff is already in history

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

Change-Id: I9999bfe514fffa9f300643e74942db5ae556670a
 2021-04-14 00:31:09 +00:00