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

Commit 2e97da7d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Replaced Build.IS_DEBUGGABLE"

parents 63c22e6a 6bd51614

src/java/com/android/internal/telephony/CellBroadcastHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.location.Location; 
import android.location.LocationListener;

import android.location.LocationManager;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;
@@ -52,6 +51,7 @@ import android.util.LocalLog; 
import android.util.Log;



import com.android.internal.telephony.metrics.TelephonyMetrics;

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



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -231,7 +231,7 @@ public class CellBroadcastHandler extends WakeLockStateMachine { 
            intent.putExtra(EXTRA_MESSAGE, message);

            SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mPhone.getPhoneId());



            if (Build.IS_DEBUGGABLE) {

            if (TelephonyUtils.IS_DEBUGGABLE) {

                // Send additional broadcast intent to the specified package. This is only for sl4a

                // automation tests.

                final String additionalPackage = Settings.Secure.getString(

src/java/com/android/internal/telephony/InboundSmsHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.database.SQLException; 
import android.net.Uri;

import android.os.AsyncResult;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.IDeviceIdleController;

import android.os.Message;
@@ -65,6 +64,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.telephony.SmsConstants.MessageClass;

import com.android.internal.telephony.metrics.TelephonyMetrics;

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

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

import com.android.internal.util.HexDump;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;
@@ -333,7 +333,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                default: {

                    String errorText = "processMessage: unhandled message type " + msg.what +

                        " currState=" + getCurrentState().getName();

                    if (Build.IS_DEBUGGABLE) {

                    if (TelephonyUtils.IS_DEBUGGABLE) {

                        loge("---- Dumping InboundSmsHandler ----");

                        loge("Total records=" + getLogRecCount());

                        for (int i = Math.max(getLogRecSize() - 20, 0); i < getLogRecSize(); i++) {

src/java/com/android/internal/telephony/LocaleTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -43,6 +42,7 @@ import android.util.LocalLog; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.MccTable.MccMnc;

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

import com.android.internal.util.IndentingPrintWriter;



import java.io.FileDescriptor;
@@ -246,7 +246,7 @@ public class LocaleTracker extends Handler { 


        final IntentFilter filter = new IntentFilter();

        filter.addAction(TelephonyManager.ACTION_SIM_CARD_STATE_CHANGED);

        if (Build.IS_DEBUGGABLE) {

        if (TelephonyUtils.IS_DEBUGGABLE) {

            filter.addAction(ACTION_COUNTRY_OVERRIDE);

        }

        mPhone.getContext().registerReceiver(mBroadcastReceiver, filter);

src/java/com/android/internal/telephony/MccTable.java

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.LocaleStore;

import com.android.internal.app.LocaleStore.LocaleInfo;

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



import libcore.timezone.TelephonyLookup;

import libcore.timezone.TelephonyNetwork;
@@ -308,7 +309,7 @@ public final class MccTable { 
    public static void updateMccMncConfiguration(Context context, String mccmnc) {

        Rlog.d(LOG_TAG, "updateMccMncConfiguration mccmnc='" + mccmnc);



        if (Build.IS_DEBUGGABLE) {

        if (TelephonyUtils.IS_DEBUGGABLE) {

            String overrideMcc = SystemProperties.get("persist.sys.override_mcc");

            if (!TextUtils.isEmpty(overrideMcc)) {

                mccmnc = overrideMcc;

src/java/com/android/internal/telephony/Phone.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.net.NetworkCapabilities; 
import android.net.NetworkStats;

import android.net.Uri;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -83,6 +82,7 @@ import com.android.internal.telephony.uicc.UiccCard; 
import com.android.internal.telephony.uicc.UiccCardApplication;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.UsimServiceTable;

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



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -498,7 +498,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                .makeAppSmsManager(context);

        mLocalLog = new LocalLog(64);



        if (Build.IS_DEBUGGABLE) {

        if (TelephonyUtils.IS_DEBUGGABLE) {

            mTelephonyTester = new TelephonyTester(this);

        }