Merge "Add USB RNDIS enable/disable control"

2010-02-23 18:08:04 -08:00
parent 2e1818a4d1 65ae29bd85
commit 5cde63a60d
4 changed files with 238 additions and 32 deletions
--- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
@@ -440,10 +440,11 @@ public abstract class DataConnectionTracker extends Handler {
            return Phone.APN_REQUEST_FAILED;
        }

-        if(DBG) Log.d(LOG_TAG, "enableApnType("+type+"), isApnTypeActive = "
+        if (DBG) Log.d(LOG_TAG, "enableApnType("+type+"), isApnTypeActive = "
                + isApnTypeActive(type) + " and state = " + state);

        if (!isApnTypeAvailable(type)) {
+            if (DBG) Log.d(LOG_TAG, "type not available");
            return Phone.APN_TYPE_NOT_AVAILABLE;
        }