Remove unneeded new RIL command.
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.
Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 97b78e5..36907ed 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -172,9 +172,9 @@
private static final String TAG = "ConnectivityService";
private static final boolean DBG = true;
- private static final boolean VDBG = true;
+ private static final boolean VDBG = false;
- private static final boolean LOGD_RULES = true;
+ private static final boolean LOGD_RULES = false;
// TODO: create better separation between radio types and network types
@@ -4569,7 +4569,6 @@
* @param seconds
*/
private static void sleep(int seconds) {
- log("XXXXX sleeping for " + seconds + " sec");
long stopTime = System.nanoTime() + (seconds * 1000000000);
long sleepTime;
while ((sleepTime = stopTime - System.nanoTime()) > 0) {
@@ -4578,7 +4577,6 @@
} catch (InterruptedException ignored) {
}
}
- log("XXXXX returning from sleep");
}
private static void log(String s) {