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

Commit 1b21c4e9 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Use Build.IS_DEBUGGABLE" into jb-mr2-dev

parents b37b0722 2cc8c148

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

+2 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.net.LinkCapabilities; 
import android.net.LinkProperties;

import android.net.wifi.WifiManager;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -65,7 +66,6 @@ import java.util.concurrent.atomic.AtomicReference; 


public abstract class PhoneBase extends Handler implements Phone {

    private static final String LOG_TAG = "PhoneBase";

    protected static final boolean DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1;



    // Key used to read and write the saved network selection numeric value

    public static final String NETWORK_SELECTION_KEY = "network_selection_key";
@@ -255,7 +255,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
        mActionDetached = this.getClass().getPackage().getName() + ".action_detached";

        mActionAttached = this.getClass().getPackage().getName() + ".action_attached";



        if (DEBUGGABLE) {

        if (Build.IS_DEBUGGABLE) {

            mTelephonyTester = new TelephonyTester(this);

        }

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

+2 −4
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.os.Handler;

import android.os.SystemProperties;

import android.os.Build;

import android.telephony.Rlog;



import com.android.internal.telephony.PhoneBase;
@@ -35,7 +34,6 @@ import com.android.internal.telephony.PhoneBase; 
public class TelephonyTester {

    private static final String LOG_TAG = "TelephonyTester";

    private static final boolean DBG = true;

    private static final boolean DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1;



    private PhoneBase mPhone;
@@ -61,7 +59,7 @@ public class TelephonyTester { 
    TelephonyTester(PhoneBase phone) {

        mPhone = phone;



        if (DEBUGGABLE) {

        if (Build.IS_DEBUGGABLE) {

            IntentFilter filter = new IntentFilter();



            filter.addAction(mPhone.getActionDetached());

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.net.LinkCapabilities; 
import android.net.LinkProperties;

import android.net.ProxyProperties;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Message;

import android.os.SystemClock;

import android.os.SystemProperties;
@@ -70,7 +71,6 @@ import java.util.concurrent.atomic.AtomicInteger; 
public final class DataConnection extends StateMachine {

    private static final boolean DBG = true;

    private static final boolean VDBG = true;

    private static final boolean DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1;



    /** Retry configuration: A doubling of retry times from 5secs to 30minutes */

    private static final String DEFAULT_DATA_RETRY_CONFIG = "default_randomization=2000,"
@@ -329,7 +329,7 @@ public final class DataConnection extends StateMachine { 
    private String getRetryConfig(boolean forDefault) {

        int nt = mPhone.getServiceState().getNetworkType();



        if (DEBUGGABLE) {

        if (Build.IS_DEBUGGABLE) {

            String config = SystemProperties.get("test.data_retry_config");

            if (! TextUtils.isEmpty(config)) {

                return config;

src/java/com/android/internal/telephony/dataconnection/DcController.java

+2 −3
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ import android.net.LinkAddress; 
import android.net.NetworkUtils;

import android.net.LinkProperties.CompareResult;

import android.os.AsyncResult;

import android.os.Build;

import android.os.Handler;

import android.os.Message;

import android.os.SystemProperties;

import android.telephony.Rlog;

import com.android.internal.telephony.PhoneBase;

import com.android.internal.telephony.PhoneConstants;
@@ -43,7 +43,6 @@ import java.util.HashMap; 
class DcController extends StateMachine {

    private static final boolean DBG = true;

    private static final boolean VDBG = false;

    protected static final boolean DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1;



    private PhoneBase mPhone;

    private DcTrackerBase mDct;
@@ -127,7 +126,7 @@ class DcController extends StateMachine { 
                    DataConnection.EVENT_RIL_CONNECTED, null);

            mPhone.mCi.registerForDataNetworkStateChanged(getHandler(),

                    DataConnection.EVENT_DATA_STATE_CHANGED, null);

            if (DEBUGGABLE) {

            if (Build.IS_DEBUGGABLE) {

                mDcTesterDeactivateAll =

                        new DcTesterDeactivateAll(mPhone, DcController.this, getHandler());

            }

src/java/com/android/internal/telephony/dataconnection/DcRetryAlarmController.java

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.os.AsyncResult;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.telephony.Rlog;

import android.text.TextUtils;
@@ -36,7 +35,6 @@ import com.android.internal.telephony.RILConstants; 
public class DcRetryAlarmController {

    private String mLogTag = "DcRac";

    private static final boolean DBG = true;

    protected static final boolean DEBUGGABLE = SystemProperties.getInt("ro.debuggable", 0) == 1;



    private PhoneBase mPhone;

    private DataConnection mDc;