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

Merge "Change reference to Build.IS_DEBUGGABLE"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-19 23:36:16 +00:00
committed by Gerrit Code Review
parent 634f6969c4 5ea6d8a7d2
commit 4d83e67433
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/common/com/android/internal/telephony/SmsNumberUtils.java
View File

@@ -20,8 +20,8 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.SQLException; import android.database.SQLException;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.os.SystemProperties;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.PhoneNumberUtils; import android.telephony.PhoneNumberUtils;
import android.telephony.Rlog; import android.telephony.Rlog;
@@ -43,7 +43,7 @@ import java.util.HashMap;
*/ */
public class SmsNumberUtils { public class SmsNumberUtils {
private static final String TAG = "SmsNumberUtils"; private static final String TAG = "SmsNumberUtils";
private static final boolean DBG = Build.IS_DEBUGGABLE; private static final boolean DBG = SystemProperties.getInt("ro.debuggable", 0) == 1;
private static final String PLUS_SIGN = "+"; private static final String PLUS_SIGN = "+";

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

@@ -18,14 +18,14 @@ package android.telephony;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import com.android.internal.telephony.util.TelephonyUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* This utils class is used for geo-fencing of CellBroadcast messages and is used by the cell * This utils class is used for geo-fencing of CellBroadcast messages and is used by the cell
* broadcast module. * broadcast module.
@@ -274,7 +274,7 @@ public class CbGeoUtils {
@Override @Override
public String toString() { public String toString() {
String str = "Polygon: "; String str = "Polygon: ";
if (Build.IS_DEBUGGABLE) { if (TelephonyUtils.IS_DEBUGGABLE) {
str += mVertices; str += mVertices;
} }
return str; return str;
@@ -328,7 +328,7 @@ public class CbGeoUtils {
@Override @Override
public String toString() { public String toString() {
String str = "Circle: "; String str = "Circle: ";
if (Build.IS_DEBUGGABLE) { if (TelephonyUtils.IS_DEBUGGABLE) {
str += mCenter + ", radius = " + mRadiusMeter; str += mCenter + ", radius = " + mRadiusMeter;
} }

4
telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java
View File

@@ -18,11 +18,11 @@ package com.android.internal.telephony;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
import android.os.Build;
import android.telephony.Rlog; import android.telephony.Rlog;
import android.util.SparseIntArray; import android.util.SparseIntArray;
import com.android.internal.telephony.cdma.sms.UserData; import com.android.internal.telephony.cdma.sms.UserData;
import com.android.internal.telephony.util.TelephonyUtils;
import com.android.internal.telephony.util.XmlUtils; import com.android.internal.telephony.util.XmlUtils;
import dalvik.annotation.compat.UnsupportedAppUsage; import dalvik.annotation.compat.UnsupportedAppUsage;
@@ -30,7 +30,7 @@ import dalvik.annotation.compat.UnsupportedAppUsage;
public class Sms7BitEncodingTranslator { public class Sms7BitEncodingTranslator {
private static final String TAG = "Sms7BitEncodingTranslator"; private static final String TAG = "Sms7BitEncodingTranslator";
@UnsupportedAppUsage @UnsupportedAppUsage
private static final boolean DBG = Build.IS_DEBUGGABLE ; private static final boolean DBG = TelephonyUtils.IS_DEBUGGABLE;
private static boolean mIs7BitTranslationTableLoaded = false; private static boolean mIs7BitTranslationTableLoaded = false;
private static SparseIntArray mTranslationTable = null; private static SparseIntArray mTranslationTable = null;
@UnsupportedAppUsage @UnsupportedAppUsage