diff options
Diffstat (limited to 'main/java/com/google/android/setupcompat/util')
-rw-r--r-- | main/java/com/google/android/setupcompat/util/BuildCompatUtils.java | 4 | ||||
-rw-r--r-- | main/java/com/google/android/setupcompat/util/WizardManagerHelper.java | 28 |
2 files changed, 8 insertions, 24 deletions
diff --git a/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java b/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java index cccc413..55f3ad6 100644 --- a/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java +++ b/main/java/com/google/android/setupcompat/util/BuildCompatUtils.java @@ -84,7 +84,7 @@ public final class BuildCompatUtils { */ public static boolean isAtLeastU() { return (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 34) - || isAtLeastPreReleaseCodename("UpsideDownCake"); + || isAtLeastPreReleaseCodename("UpsideDownCake"); } private static boolean isAtLeastPreReleaseCodename(String codename) { @@ -99,4 +99,4 @@ public final class BuildCompatUtils { } private BuildCompatUtils() {} -} +}
\ No newline at end of file diff --git a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java index f28cd6d..60b2e21 100644 --- a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java +++ b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java @@ -20,8 +20,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; import android.provider.Settings; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -151,17 +149,9 @@ public final class WizardManagerHelper { * @see #isDeviceProvisioned(Context) */ public static boolean isUserSetupComplete(Context context) { - if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { - return Settings.Secure.getInt( - context.getContentResolver(), SETTINGS_SECURE_USER_SETUP_COMPLETE, 0) - == 1; - } else { - // For versions below JB MR1, there are no user profiles. Just return the global device - // provisioned state. - return Settings.Secure.getInt( - context.getContentResolver(), SETTINGS_GLOBAL_DEVICE_PROVISIONED, 0) - == 1; - } + return Settings.Secure.getInt( + context.getContentResolver(), SETTINGS_SECURE_USER_SETUP_COMPLETE, 0) + == 1; } /** @@ -174,15 +164,9 @@ public final class WizardManagerHelper { * @see #isUserSetupComplete(Context) */ public static boolean isDeviceProvisioned(Context context) { - if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { - return Settings.Global.getInt( - context.getContentResolver(), SETTINGS_GLOBAL_DEVICE_PROVISIONED, 0) - == 1; - } else { - return Settings.Secure.getInt( - context.getContentResolver(), SETTINGS_GLOBAL_DEVICE_PROVISIONED, 0) - == 1; - } + return Settings.Global.getInt( + context.getContentResolver(), SETTINGS_GLOBAL_DEVICE_PROVISIONED, 0) + == 1; } /** |