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

Commit 81491a12 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Replaced Build.IS_DEBUGGABLE"

parents 775540c6 60b37c37

telephony/java/android/telephony/LocationAccessPolicy.java

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

import android.widget.Toast;



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



import java.util.List;



/**
@@ -162,7 +164,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) {

telephony/java/android/telephony/SubscriptionInfo.java

+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)

telephony/java/android/telephony/data/DataProfile.java

+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 + "/"