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

Commit 6a950917 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Change reference to Build.IS_DEBUGGABLE" am: 4d83e674 am:... 

Merge "Merge "Change reference to Build.IS_DEBUGGABLE" am: 4d83e674 am: 9ee90ab4" into qt-qpr1-dev-plus-aosp
parents 4ae69c01 a9b1d06d

telephony/common/com/android/internal/telephony/SmsNumberUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import android.content.Context; 
import android.database.Cursor;

import android.database.SQLException;

import android.os.Binder;

import android.os.Build;

import android.os.PersistableBundle;

import android.os.SystemProperties;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;
@@ -43,7 +43,7 @@ import java.util.HashMap; 
 */

public class 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 = "+";

telephony/java/android/telephony/CbGeoUtils.java

+4 −4
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 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;





/**

 * This utils class is used for geo-fencing of CellBroadcast messages and is used by the cell

 * broadcast module.
@@ -274,7 +274,7 @@ public class CbGeoUtils { 
        @Override

        public String toString() {

            String str = "Polygon: ";

            if (Build.IS_DEBUGGABLE) {

            if (TelephonyUtils.IS_DEBUGGABLE) {

                str += mVertices;

            }

            return str;
@@ -328,7 +328,7 @@ public class CbGeoUtils { 
        @Override

        public String toString() {

            String str = "Circle: ";

            if (Build.IS_DEBUGGABLE) {

            if (TelephonyUtils.IS_DEBUGGABLE) {

                str += mCenter + ", radius = " + mRadiusMeter;

            }

telephony/java/com/android/internal/telephony/Sms7BitEncodingTranslator.java

+2 −2
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.internal.telephony; 


import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.os.Build;

import android.telephony.Rlog;

import android.util.SparseIntArray;



import com.android.internal.telephony.cdma.sms.UserData;

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

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



import dalvik.annotation.compat.UnsupportedAppUsage;
@@ -30,7 +30,7 @@ import dalvik.annotation.compat.UnsupportedAppUsage; 
public class Sms7BitEncodingTranslator {

    private static final String TAG = "Sms7BitEncodingTranslator";

    @UnsupportedAppUsage

    private static final boolean DBG = Build.IS_DEBUGGABLE ;

    private static final boolean DBG = TelephonyUtils.IS_DEBUGGABLE;

    private static boolean mIs7BitTranslationTableLoaded = false;

    private static SparseIntArray mTranslationTable = null;

    @UnsupportedAppUsage