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

Commit 76c72ec0 authored by Daniel Bright's avatar Daniel Bright
Browse files

Replaced Build.IS_DEBUGGABLE

Changed Build.IS_DEBUGGABLE to TelephonyUtils.IS_DEBUGGABLE and
Build.IS_USER to TelephonyUtils.IS_USER.

Bug: 145952396
Test: Telephony unit tests

Change-Id: If3ca3171f8c09552642e797fb0ce2d00ccacc999
parent 695bd671
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package android.telephony;

import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Build;
import android.text.TextUtils;

import com.android.internal.telephony.util.TelephonyUtils;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -262,7 +263,7 @@ public class CbGeoUtils {
        @Override
        public String toString() {
            String str = "Polygon: ";
            if (Build.IS_DEBUGGABLE) {
            if (TelephonyUtils.IS_DEBUGGABLE) {
                str += mVertices;
            }
            return str;
@@ -298,7 +299,7 @@ public class CbGeoUtils {
        @Override
        public String toString() {
            String str = "Circle: ";
            if (Build.IS_DEBUGGABLE) {
            if (TelephonyUtils.IS_DEBUGGABLE) {
                str += mCenter + ", radius = " + mRadiusMeter;
            }

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.os.UserManager;
import android.util.Log;
import android.widget.Toast;

import com.android.internal.telephony.util.TelephonyUtils;

import java.util.List;

/**
@@ -174,7 +176,7 @@ public final class LocationAccessPolicy {
        }
        Log.e(TAG, errorMsg);
        try {
            if (Build.IS_DEBUGGABLE) {
            if (TelephonyUtils.IS_DEBUGGABLE) {
                Toast.makeText(context, errorMsg, Toast.LENGTH_SHORT).show();
            }
        } catch (Throwable t) {
+5 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Parcel;
import android.os.ParcelUuid;
import android.os.Parcelable;
@@ -38,6 +37,8 @@ import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;

import com.android.internal.telephony.util.TelephonyUtils;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -748,7 +749,7 @@ public class SubscriptionInfo implements Parcelable {
    public static String givePrintableIccid(String iccId) {
        String iccIdToPrint = null;
        if (iccId != null) {
            if (iccId.length() > 9 && !Build.IS_DEBUGGABLE) {
            if (iccId.length() > 9 && !TelephonyUtils.IS_DEBUGGABLE) {
                iccIdToPrint = iccId.substring(0, 9) + Rlog.pii(false, iccId.substring(9));
            } else {
                iccIdToPrint = iccId;
@@ -764,7 +765,8 @@ public class SubscriptionInfo implements Parcelable {
        return "{id=" + mId + " iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex
                + " carrierId=" + mCarrierId + " displayName=" + mDisplayName
                + " carrierName=" + mCarrierName + " nameSource=" + mNameSource
                + " iconTint=" + mIconTint + " mNumber=" + Rlog.pii(Build.IS_DEBUGGABLE, mNumber)
                + " iconTint=" + mIconTint
                + " mNumber=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mNumber)
                + " dataRoaming=" + mDataRoaming + " iconBitmap=" + mIconBitmap + " mcc " + mMcc
                + " mnc " + mMnc + "mCountryIso=" + mCountryIso + " isEmbedded " + mIsEmbedded
                + " nativeAccessRules " + Arrays.toString(mNativeAccessRules)
+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.Annotation.ApnType;
@@ -31,6 +30,7 @@ import android.telephony.data.ApnSetting.AuthType;
import android.text.TextUtils;

import com.android.internal.telephony.RILConstants;
import com.android.internal.telephony.util.TelephonyUtils;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -261,7 +261,7 @@ public final class DataProfile implements Parcelable {
    @Override
    public String toString() {
        return "DataProfile=" + mProfileId + "/" + mProtocolType + "/" + mAuthType
                + "/" + (Build.IS_USER ? "***/***/***" :
                + "/" + (TelephonyUtils.IS_USER ? "***/***/***" :
                         (mApn + "/" + mUserName + "/" + mPassword)) + "/" + mType + "/"
                + mMaxConnectionsTime + "/" + mMaxConnections + "/"
                + mWaitTime + "/" + mEnabled + "/" + mSupportedApnTypesBitmask + "/"