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

Commit 4281a68d authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am a97f49c0: Merge "Tweak RIL.java debug." into honeycomb-LTE 

* commit 'a97f49c0':
  Tweak RIL.java debug.
parents b9be4520 a97f49c0

telephony/java/com/android/internal/telephony/RIL.java

+7 −5
Original line number Diff line number Diff line
@@ -207,9 +207,8 @@ class RILRequest { 
 */

public final class RIL extends BaseCommands implements CommandsInterface {

    static final String LOG_TAG = "RILJ";

    private static final boolean DBG = false;

    static final boolean RILJ_LOGD = Config.LOGD;

    static final boolean RILJ_LOGV = DBG ? Config.LOGD : Config.LOGV;

    static final boolean RILJ_LOGD = true;

    static final boolean RILJ_LOGV = false; // STOP SHIP if true



    /**

     * Wake lock timeout should be longer than the longest timeout in
@@ -2069,7 +2068,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                if (RILJ_LOGD) Log.d(LOG_TAG, "Radio ON @ init; reset to OFF");

                setRadioPower(false, null);

            } else {

                if (DBG) Log.d(LOG_TAG, "Radio OFF @ init");

                if (RILJ_LOGD) Log.d(LOG_TAG, "Radio OFF @ init");

                setRadioState(newState);

                setPreferredNetworkType(mNetworkMode, null);

            }
@@ -2366,8 +2365,11 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
            case RIL_REQUEST_GET_IMSI:

            case RIL_REQUEST_GET_IMEI:

            case RIL_REQUEST_GET_IMEISV:

                if (!RILJ_LOGV) {

                    // If not versbose logging just return and don't display IMSI and IMEI, IMEISV

                    return "";

                }

        }



        StringBuilder sb;

        String s;