Merge "Replace Rlog with Log in CarrierDefaultApp" (56b33d2e) · Commits · e / os / android_frameworks_base

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.net.Uri;
		import android.net.http.SslError;
		import android.os.Bundle;
		import android.telephony.CarrierConfigManager;
		import android.telephony.Rlog;
		import android.telephony.SubscriptionManager;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		@@ -477,11 +476,11 @@ public class CaptivePortalLoginActivity extends Activity {
		}

		private static void logd(String s) {
		Rlog.d(TAG, s);
		Log.d(TAG, s);
		}

		private static void loge(String s) {
		Rlog.d(TAG, s);
		Log.d(TAG, s);
		}

		}

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CustomConfigLoader.java

+7 −9

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import android.content.Context;
		import android.content.Intent;
		import android.os.PersistableBundle;
		import android.telephony.CarrierConfigManager;
		import android.telephony.Rlog;
		import android.text.TextUtils;
		import android.util.Log;

		@@ -27,7 +26,6 @@ import com.android.internal.telephony.TelephonyIntents;
		import com.android.internal.util.ArrayUtils;

		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;

		/**
		@@ -44,7 +42,7 @@ public class CustomConfigLoader {
		private static final String INTER_GROUP_DELIMITER = "\\s:\\s";

		private static final String TAG = CustomConfigLoader.class.getSimpleName();
		private static final boolean VDBG = Rlog.isLoggable(TAG, Log.VERBOSE);
		private static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);

		/**
		* loads and parses the carrier config, return a list of carrier action for the given signal
		@@ -70,7 +68,7 @@ public class CustomConfigLoader {
		// return an empty list if no match found
		List<Integer> actionList = new ArrayList<>();
		if (carrierConfigManager == null) {
		Rlog.e(TAG, "load carrier config failure with carrier config manager uninitialized");
		Log.e(TAG, "load carrier config failure with carrier config manager uninitialized");
		return actionList;
		}
		PersistableBundle b = carrierConfigManager.getConfig();
		@@ -101,8 +99,8 @@ public class CustomConfigLoader {
		.EXTRA_DEFAULT_NETWORK_AVAILABLE_KEY, false));
		break;
		default:
		Rlog.e(TAG, "load carrier config failure with un-configured key: " +
		intent.getAction());
		Log.e(TAG, "load carrier config failure with un-configured key: "
		+ intent.getAction());
		break;
		}
		if (!ArrayUtils.isEmpty(configs)) {
		@@ -111,12 +109,12 @@ public class CustomConfigLoader {
		matchConfig(config, arg1, arg2, actionList);
		if (!actionList.isEmpty()) {
		// return the first match
		if (VDBG) Rlog.d(TAG, "found match action list: " + actionList.toString());
		if (VDBG) Log.d(TAG, "found match action list: " + actionList.toString());
		return actionList;
		}
		}
		}
		Rlog.d(TAG, "no matching entry for signal: " + intent.getAction() + "arg1: " + arg1
		Log.d(TAG, "no matching entry for signal: " + intent.getAction() + "arg1: " + arg1
		+ "arg2: " + arg2);
		}
		return actionList;
		@@ -166,7 +164,7 @@ public class CustomConfigLoader {
		try {
		actionList.add(Integer.parseInt(idx));
		} catch (NumberFormatException e) {
		Rlog.e(TAG, "NumberFormatException(string: " + idx + " config:" + config + "): "
		Log.e(TAG, "NumberFormatException(string: " + idx + " config:" + config + "): "
		+ e);
		}
		}