From 4ab4cb96b78d8d09a0b8302a0edb2af6a62fba0e Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 23 Jan 2017 23:50:47 +0100 Subject: Remove Google Play Services dependency PS2: inline hasGms usage, don't use addprefix for a single entry, remove unused imports Change-Id: I1eb1fb76e4b80e26992599e3511d265abbfa1cd7 --- src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java | 5 ++++- src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java index 3226044..4674b1f 100644 --- a/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java +++ b/src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java @@ -29,6 +29,8 @@ import com.android.internal.telephony.TelephonyIntents; import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.util.SetupWizardUtils; +import org.cyanogenmod.internal.util.PackageManagerUtils; + import java.util.ArrayList; public class CMSetupWizardData extends AbstractSetupData { @@ -68,7 +70,8 @@ public class CMSetupWizardData extends AbstractSetupData { pages.add(new MobileDataPage(mContext, this) .setHidden(!isSimInserted() || mMobileDataEnabled)); } - final boolean hasGMS = SetupWizardUtils.hasGMS(mContext); + final boolean hasGMS = PackageManagerUtils + .isAppInstalled(mContext, "com.google.android.gms"); if (hasGMS) { pages.add(new GmsAccountPage(mContext, this)); } diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index 34961a9..a900e7d 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -39,8 +39,6 @@ import android.util.Log; /*import com.android.internal.os.IKillSwitchService;*/ import com.cyanogenmod.setupwizard.SetupWizardApp; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GooglePlayServicesUtil; import cyanogenmod.providers.CMSettings; import static android.content.res.ThemeConfig.SYSTEM_DEFAULT; @@ -197,11 +195,6 @@ public class SetupWizardUtils { return UserHandle.getCallingUserHandle().isOwner(); } - public static boolean hasGMS(Context context) { - return GooglePlayServicesUtil.isGooglePlayServicesAvailable(context) != - ConnectionResult.SERVICE_MISSING; - } - public static boolean accountExists(Context context, String accountType) { return AccountManager.get(context).getAccountsByType(accountType).length > 0; } -- cgit v1.1