From 3ed0a33ee79924e1a1037e6dbfa628a49eb27d3c Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Sun, 21 Apr 2024 00:16:44 -0500 Subject: [PATCH] Don't start wizard flow on atv when gms is present This matches the behaviour prior to the Lineage suw revamp on 21. Setupwraith hooks things in a completely different manner to the mobile gms suw. The Lineage suw should not run at all when atv gms is present, but the apk still needs to be available should the tvsetup intent hooks get implemented. Change-Id: Ic4943e8fd55d30fbd2856dc5eadc5a0ce6282f29 --- src/org/lineageos/setupwizard/SetupWizardActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/org/lineageos/setupwizard/SetupWizardActivity.java b/src/org/lineageos/setupwizard/SetupWizardActivity.java index 8991ee25..8e061d09 100644 --- a/src/org/lineageos/setupwizard/SetupWizardActivity.java +++ b/src/org/lineageos/setupwizard/SetupWizardActivity.java @@ -31,6 +31,10 @@ public class SetupWizardActivity extends AppCompatActivity { if (LOGV) { Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState); } + if (SetupWizardUtils.hasLeanback(this) && SetupWizardUtils.hasGMS(this)) { + finish(); + return; + } SetupWizardUtils.enableComponent(this, WizardManager.class); Intent intent = new Intent(ACTION_LOAD); if (SetupWizardUtils.isOwner()) {