Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6a116d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Change version checks to use SdkLevel.isAtLeast*"" into tm-dev am: 74b14fad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17766956



Change-Id: I5b7a910411469144c8ea461ebfeb7e3d5e52c0f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 933f58be 74b14fad

packages/SettingsLib/Utils/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ android_library { 


    static_libs: [

        "androidx.annotation_annotation",

        "modules-utils-build",

    ],



    sdk_version: "system_current",

packages/SettingsLib/Utils/src/com/android/settingslib/utils/BuildCompatUtils.java

+4 −5
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ 
package com.android.settingslib.utils;



import android.os.Build;

import android.os.Build.VERSION;



import androidx.annotation.ChecksSdkIntAtLeast;



import com.android.modules.utils.build.SdkLevel;



/**

 * An util class to check whether the current OS version is higher or equal to sdk version of

 * device.
@@ -35,7 +34,7 @@ public final class BuildCompatUtils { 
     */

    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S)

    public static boolean isAtLeastS() {

        return SdkLevel.isAtLeastS();

        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;

    }



    /**
@@ -45,7 +44,7 @@ public final class BuildCompatUtils { 
     */

    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S_V2)

    public static boolean isAtLeastSV2() {

        return SdkLevel.isAtLeastSv2();

        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S_V2;

    }



    /**
@@ -55,7 +54,7 @@ public final class BuildCompatUtils { 
     */

    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.TIRAMISU)

    public static boolean isAtLeastT() {

        return SdkLevel.isAtLeastT();

        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU;

    }



    private BuildCompatUtils() {}

packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import android.util.Log; 
import androidx.annotation.RequiresApi;

import androidx.annotation.VisibleForTesting;



import com.android.modules.utils.build.SdkLevel;

import com.android.settingslib.utils.BuildCompatUtils;



import java.io.BufferedReader;

import java.io.FileReader;
@@ -221,7 +221,7 @@ public class DeviceInfoUtils { 
    }



    private static String getRawPhoneNumber(Context context, int subscriptionId) {

        if (SdkLevel.isAtLeastT()) {

        if (BuildCompatUtils.isAtLeastT()) {

            return getRawPhoneNumberFromT(context, subscriptionId);

        } else {

            final TelephonyManager telephonyManager = context.getSystemService(

packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import androidx.annotation.RequiresApi; 
import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



import com.android.modules.utils.build.SdkLevel;

import com.android.settingslib.utils.BuildCompatUtils;



/**

 * Helper class for managing settings preferences that can be disabled
@@ -106,7 +106,7 @@ public class RestrictedPreferenceHelper { 
        if (mDisabledSummary) {

            final TextView summaryView = (TextView) holder.findViewById(android.R.id.summary);

            if (summaryView != null) {

                final CharSequence disabledText = SdkLevel.isAtLeastT()

                final CharSequence disabledText = BuildCompatUtils.isAtLeastT()

                        ? getDisabledByAdminUpdatableString()

                        : mContext.getString(R.string.disabled_by_admin_summary_text);

                if (mDisabledByAdmin) {

packages/SettingsLib/src/com/android/settingslib/Utils.java

+2 −2
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.UserIcons;

import com.android.launcher3.icons.BaseIconFactory.IconOptions;

import com.android.launcher3.icons.IconFactory;

import com.android.modules.utils.build.SdkLevel;

import com.android.settingslib.drawable.UserIconDrawable;

import com.android.settingslib.fuelgauge.BatteryStatus;

import com.android.settingslib.utils.BuildCompatUtils;



import java.text.NumberFormat;
@@ -130,7 +130,7 @@ public class Utils { 
        String name = info != null ? info.name : null;

        if (info.isManagedProfile()) {

            // We use predefined values for managed profiles

            return  SdkLevel.isAtLeastT()

            return  BuildCompatUtils.isAtLeastT()

                    ? getUpdatableManagedUserTitle(context)

                    : context.getString(R.string.managed_user_title);

        } else if (info.isGuest()) {