From 5d1780f595ed50a6966ed2d30bc9b19951b1de93 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Thu, 23 Jul 2020 12:53:03 -0500 Subject: [PATCH] ATV: Disable custom SUW if GMS SetupWraith is available This sets the partner customization flag to allow adding hooks later if necessary. Change-Id: Ie8dcb0f2eae8916ef00f812ea85661c020dce53b (cherry picked from commit 68b11675e1798fdf70374091a9aacb86d570f93a) --- AndroidManifest.xml | 2 ++ src/org/lineageos/setupwizard/util/SetupWizardUtils.java | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a10f1a44..cbce2aa1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -292,6 +292,8 @@ + + diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java index cca31260..08e31ffa 100644 --- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java +++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java @@ -73,6 +73,7 @@ public class SetupWizardUtils { private static final String GMS_PACKAGE = "com.google.android.gms"; private static final String GMS_SUW_PACKAGE = "com.google.android.setupwizard"; + private static final String GMS_TV_SUW_PACKAGE = "com.google.android.tungsten.setupwraith"; private static final String PROP_BUILD_DATE = "ro.build.date.utc"; @@ -169,14 +170,16 @@ public class SetupWizardUtils { } public static boolean hasGMS(Context context) { + String gmsSuwPackage = hasLeanback(context) ? GMS_TV_SUW_PACKAGE : GMS_SUW_PACKAGE; + if (PackageManagerUtils.isAppInstalled(context, GMS_PACKAGE) && - PackageManagerUtils.isAppInstalled(context, GMS_SUW_PACKAGE)) { + PackageManagerUtils.isAppInstalled(context, gmsSuwPackage)) { PackageManager packageManager = context.getPackageManager(); if (LOGV) { Log.v(TAG, GMS_SUW_PACKAGE + " state = " + - packageManager.getApplicationEnabledSetting(GMS_SUW_PACKAGE)); + packageManager.getApplicationEnabledSetting(gmsSuwPackage)); } - return packageManager.getApplicationEnabledSetting(GMS_SUW_PACKAGE) != + return packageManager.getApplicationEnabledSetting(gmsSuwPackage) != COMPONENT_ENABLED_STATE_DISABLED; } return false;