Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replaced Build.IS_DEBUGGABLE"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-16 02:32:58 +00:00
committed by Gerrit Code Review
parent 775540c6d6 60b37c37f0
commit 81491a1265
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/LocationAccessPolicy.java
View File

@@ -33,6 +33,8 @@ import android.os.UserManager;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.telephony.util.TelephonyUtils;
import java.util.List; import java.util.List;
/** /**
@@ -162,7 +164,7 @@ public final class LocationAccessPolicy {
} }
Log.e(TAG, errorMsg); Log.e(TAG, errorMsg);
try { try {
if (Build.IS_DEBUGGABLE) { if (TelephonyUtils.IS_DEBUGGABLE) {
Toast.makeText(context, errorMsg, Toast.LENGTH_SHORT).show(); Toast.makeText(context, errorMsg, Toast.LENGTH_SHORT).show();
} }
} catch (Throwable t) { } catch (Throwable t) {

8
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -30,7 +30,6 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter; import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.ParcelUuid; import android.os.ParcelUuid;
import android.os.Parcelable; import android.os.Parcelable;
@@ -38,6 +37,8 @@ import android.text.TextUtils;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import com.android.internal.telephony.util.TelephonyUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@@ -748,7 +749,7 @@ public class SubscriptionInfo implements Parcelable {
public static String givePrintableIccid(String iccId) { public static String givePrintableIccid(String iccId) {
String iccIdToPrint = null; String iccIdToPrint = null;
if (iccId != 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)); iccIdToPrint = iccId.substring(0, 9) + Rlog.pii(false, iccId.substring(9));
} else { } else {
iccIdToPrint = iccId; iccIdToPrint = iccId;
@@ -764,7 +765,8 @@ public class SubscriptionInfo implements Parcelable {
return "{id=" + mId + " iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex return "{id=" + mId + " iccId=" + iccIdToPrint + " simSlotIndex=" + mSimSlotIndex
+ " carrierId=" + mCarrierId + " displayName=" + mDisplayName + " carrierId=" + mCarrierId + " displayName=" + mDisplayName
+ " carrierName=" + mCarrierName + " nameSource=" + mNameSource + " 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 + " dataRoaming=" + mDataRoaming + " iconBitmap=" + mIconBitmap + " mcc " + mMcc
+ " mnc " + mMnc + "mCountryIso=" + mCountryIso + " isEmbedded " + mIsEmbedded + " mnc " + mMnc + "mCountryIso=" + mCountryIso + " isEmbedded " + mIsEmbedded
+ " nativeAccessRules " + Arrays.toString(mNativeAccessRules) + " nativeAccessRules " + Arrays.toString(mNativeAccessRules)

4
telephony/java/android/telephony/data/DataProfile.java
View File

@@ -22,7 +22,6 @@ import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.telephony.Annotation.ApnType; import android.telephony.Annotation.ApnType;
@@ -31,6 +30,7 @@ import android.telephony.data.ApnSetting.AuthType;
import android.text.TextUtils; import android.text.TextUtils;
import com.android.internal.telephony.RILConstants; import com.android.internal.telephony.RILConstants;
import com.android.internal.telephony.util.TelephonyUtils;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@@ -261,7 +261,7 @@ public final class DataProfile implements Parcelable {
@Override @Override
public String toString() { public String toString() {
return "DataProfile=" + mProfileId + "/" + mProtocolType + "/" + mAuthType return "DataProfile=" + mProfileId + "/" + mProtocolType + "/" + mAuthType
+ "/" + (Build.IS_USER ? "***/***/***" : + "/" + (TelephonyUtils.IS_USER ? "***/***/***" :
(mApn + "/" + mUserName + "/" + mPassword)) + "/" + mType + "/" (mApn + "/" + mUserName + "/" + mPassword)) + "/" + mType + "/"
+ mMaxConnectionsTime + "/" + mMaxConnections + "/" + mMaxConnectionsTime + "/" + mMaxConnections + "/"
+ mWaitTime + "/" + mEnabled + "/" + mSupportedApnTypesBitmask + "/" + mWaitTime + "/" + mEnabled + "/" + mSupportedApnTypesBitmask + "/"