diff options
| author | Marvin W <git@larma.de> | 2017-01-23 23:50:47 +0100 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-18 11:38:01 +0800 |
| commit | 4ab4cb96b78d8d09a0b8302a0edb2af6a62fba0e (patch) | |
| tree | f413c59f1e354645d569b1ec9ecc71e3ac5fb8fb /src | |
| parent | 10f91eefaa3f5793fbe9a4100b87ed1f9500bc8f (diff) | |
| download | packages_apps_SetupWizard-4ab4cb96b78d8d09a0b8302a0edb2af6a62fba0e.zip packages_apps_SetupWizard-4ab4cb96b78d8d09a0b8302a0edb2af6a62fba0e.tar.gz packages_apps_SetupWizard-4ab4cb96b78d8d09a0b8302a0edb2af6a62fba0e.tar.bz2 | |
Remove Google Play Services dependency
PS2: inline hasGms usage, don't use addprefix for a single entry,
remove unused imports
Change-Id: I1eb1fb76e4b80e26992599e3511d265abbfa1cd7
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/setup/CMSetupWizardData.java | 5 | ||||
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java | 7 |
2 files changed, 4 insertions, 8 deletions
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; } |