diff --git a/src/com/android/phone/CallController.java b/src/com/android/phone/CallController.java index 2f09a38bf..fd9cbae08 100644 --- a/src/com/android/phone/CallController.java +++ b/src/com/android/phone/CallController.java @@ -61,7 +61,8 @@ public class CallController extends Handler { private static final String TAG = "CallController"; private static final boolean DBG = (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1); - private static final boolean VDBG = (PhoneApp.DBG_LEVEL >= 2); + // Do not check in with VDBG = true, since that may write PII to the system log. + private static final boolean VDBG = false; /** The singleton CallController instance. */ private static CallController sInstance; @@ -139,8 +140,7 @@ public void handleMessage(Message msg) { default: Log.wtf(TAG, "handleMessage: unexpected code: " + msg); - // STOPSHIP: remove throw after initial testing, replace with "break;" - throw new IllegalStateException("handleMessage: unexpected code: " + msg); + break; } } @@ -204,11 +204,11 @@ public void placeCall(Intent intent) { String scheme = uri.getScheme(); String number = PhoneNumberUtils.getNumberFromIntent(intent, mApp); - if (DBG) { + if (VDBG) { log("- action: " + action); log("- uri: " + uri); log("- scheme: " + scheme); - log("- number: " + number); // STOPSHIP: don't log number (PII) + log("- number: " + number); } // This method should only be used with the various flavors of CALL @@ -330,7 +330,7 @@ private CallStatusCode placeCallInternal(Intent intent) { try { number = getInitialNumber(intent); - if (DBG) log("- actual number to dial: '" + number + "'"); // STOPSHIP: don't log PII + if (VDBG) log("- actual number to dial: '" + number + "'"); // find the phone first // TODO Need a way to determine which phone to place the call @@ -638,7 +638,7 @@ public static String getInitialNumber(Intent intent) String actualNumberToDial = intent.getStringExtra(OutgoingCallBroadcaster.EXTRA_ACTUAL_NUMBER_TO_DIAL); if (VDBG) log("==> got EXTRA_ACTUAL_NUMBER_TO_DIAL; returning '" - + actualNumberToDial + "'"); // STOPSHIP: don't log number (PII) + + actualNumberToDial + "'"); return actualNumberToDial; } diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java index ce2376047..9e01a5070 100644 --- a/src/com/android/phone/OutgoingCallBroadcaster.java +++ b/src/com/android/phone/OutgoingCallBroadcaster.java @@ -55,6 +55,8 @@ public class OutgoingCallBroadcaster extends Activity private static final String TAG = "OutgoingCallBroadcaster"; private static final boolean DBG = (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1); + // Do not check in with VDBG = true, since that may write PII to the system log. + private static final boolean VDBG = false; public static final String ACTION_SIP_SELECT_PHONE = "com.android.phone.SIP_SELECT_PHONE"; public static final String EXTRA_ALREADY_CALLED = "android.phone.extra.ALREADY_CALLED"; @@ -111,8 +113,7 @@ public void doReceive(Context context, Intent intent) { // placed.) number = getResultData(); - // STOPSHIP: disable this log message before ship (PII) - if (DBG) Log.v(TAG, "- got number from resultData: '" + number + "'"); + if (VDBG) Log.v(TAG, "- got number from resultData: '" + number + "'"); final PhoneApp app = PhoneApp.getInstance(); @@ -189,9 +190,8 @@ public void doReceive(Context context, Intent intent) { number = PhoneNumberUtils.stripSeparators(number); if (DBG) Log.v(TAG, "doReceive: proceeding with call..."); - // STOPSHIP: disable these two log messages before ship (PII): - if (DBG) Log.v(TAG, "- uri: " + uri); - if (DBG) Log.v(TAG, "- actual number to dial: '" + number + "'"); + if (VDBG) Log.v(TAG, "- uri: " + uri); + if (VDBG) Log.v(TAG, "- actual number to dial: '" + number + "'"); startSipCallOptionHandler(context, intent, uri, number); } @@ -230,11 +230,12 @@ public void doReceive(Context context, Intent intent) { */ private void startSipCallOptionHandler(Context context, Intent intent, Uri uri, String number) { - // Verbose debugging. Do not check in with this enabled (PII). - // Log.i(TAG, "startSipCallOptionHandler..."); - // Log.i(TAG, "- intent: " + intent); - // Log.i(TAG, "- uri: " + uri); - // Log.i(TAG, "- number: " + number); + if (VDBG) { + Log.i(TAG, "startSipCallOptionHandler..."); + Log.i(TAG, "- intent: " + intent); + Log.i(TAG, "- uri: " + uri); + Log.i(TAG, "- number: " + number); + } // Create a copy of the original CALL intent that started the whole // outgoing-call sequence. This intent will ultimately be passed to diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java index 9ca1a7992..ab6011c87 100644 --- a/src/com/android/phone/PhoneInterfaceManager.java +++ b/src/com/android/phone/PhoneInterfaceManager.java @@ -276,11 +276,6 @@ public void call(String number) { Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse(url)); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - intent.setClassName(mApp, PhoneApp.getCallScreenClassName()); - - // STOPSHIP: The ACTION_CALL intent needs to go to the - // OutgoingCallBroadcaster nowadays, not the InCallScreen! - mApp.startActivity(intent); } diff --git a/src/com/android/phone/RespondViaSmsManager.java b/src/com/android/phone/RespondViaSmsManager.java index 8a1b1cf55..91c85a84c 100644 --- a/src/com/android/phone/RespondViaSmsManager.java +++ b/src/com/android/phone/RespondViaSmsManager.java @@ -29,6 +29,7 @@ import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; +import android.os.SystemProperties; import android.preference.EditTextPreference; import android.preference.Preference; import android.preference.PreferenceActivity; @@ -48,9 +49,10 @@ */ public class RespondViaSmsManager { private static final String TAG = "RespondViaSmsManager"; - private static final boolean DBG = true; - // STOPSHIP: reduce DBG to - // (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1); + private static final boolean DBG = + (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1); + // Do not check in with VDBG = true, since that may write PII to the system log. + private static final boolean VDBG = false; /** * Reference to the InCallScreen activity that owns us. This may be @@ -134,7 +136,7 @@ public void showRespondViaSmsPopup(Call ringingCall) { // chooses a response.) Connection c = ringingCall.getLatestConnection(); - if (DBG) log("- connection: " + c); + if (VDBG) log("- connection: " + c); if (c == null) { // Uh oh -- the "ringingCall" doesn't have any connections any more. @@ -154,7 +156,7 @@ public void showRespondViaSmsPopup(Call ringingCall) { // first place.) String phoneNumber = c.getAddress(); - if (DBG) log("- phoneNumber: " + phoneNumber); // STOPSHIP: don't log PII + if (VDBG) log("- phoneNumber: " + phoneNumber); lv.setOnItemClickListener(new RespondViaSmsItemClickListener(phoneNumber)); AlertDialog.Builder builder = new AlertDialog.Builder(mInCallScreen) @@ -199,7 +201,7 @@ public void onItemClick(AdapterView parent, // The ListView long id) { if (DBG) log("RespondViaSmsItemClickListener.onItemClick(" + position + ")..."); String message = (String) parent.getItemAtPosition(position); - if (DBG) log("- message: '" + message + "'"); + if (VDBG) log("- message: '" + message + "'"); // The "Custom" choice is a special case. // (For now, it's guaranteed to be the last item.) @@ -285,9 +287,8 @@ public void onCancel(DialogInterface dialog) { * Sends a text message without any interaction from the user. */ private void sendText(String phoneNumber, String message) { - // STOPSHIP: disable all logging of PII (everywhere in this file) - if (DBG) log("sendText: number " - + phoneNumber + ", message '" + message + "'"); + if (VDBG) log("sendText: number " + + phoneNumber + ", message '" + message + "'"); Uri uri = Uri.fromParts(Constants.SCHEME_SMSTO, phoneNumber, null); Intent intent = new Intent("com.android.mms.intent.action.SENDTO_NO_CONFIRMATION", uri); @@ -299,12 +300,12 @@ private void sendText(String phoneNumber, String message) { * Brings up the standard SMS compose UI. */ private void launchSmsCompose(String phoneNumber) { - if (DBG) log("launchSmsCompose: number " + phoneNumber); + if (VDBG) log("launchSmsCompose: number " + phoneNumber); Uri uri = Uri.fromParts(Constants.SCHEME_SMS, phoneNumber, null); Intent intent = new Intent(Intent.ACTION_VIEW, uri); - if (DBG) log("- Launching SMS compose UI: " + intent); // STOPSHIP: disable logging of PII + if (VDBG) log("- Launching SMS compose UI: " + intent); mInCallScreen.startActivity(intent); // TODO: One open issue here: if the user selects "Custom message" @@ -381,8 +382,8 @@ protected void onCreate(Bundle icicle) { // Preference.OnPreferenceChangeListener implementation public boolean onPreferenceChange(Preference preference, Object newValue) { if (DBG) log("onPreferenceChange: key = " + preference.getKey()); - if (DBG) log(" preference = '" + preference + "'"); - if (DBG) log(" newValue = '" + newValue + "'"); + if (VDBG) log(" preference = '" + preference + "'"); + if (VDBG) log(" newValue = '" + newValue + "'"); EditTextPreference pref = (EditTextPreference) preference; diff --git a/src/com/android/phone/SipCallOptionHandler.java b/src/com/android/phone/SipCallOptionHandler.java index bdd8d7afd..0734cd767 100644 --- a/src/com/android/phone/SipCallOptionHandler.java +++ b/src/com/android/phone/SipCallOptionHandler.java @@ -97,8 +97,8 @@ public void onCreate(Bundle savedInstanceState) { if (!OutgoingCallBroadcaster.ACTION_SIP_SELECT_PHONE.equals(action)) { Log.wtf(TAG, "onCreate: got intent action '" + action + "', expected " + OutgoingCallBroadcaster.ACTION_SIP_SELECT_PHONE); - // STOPSHIP: remove this throw before ship (but leave the Log.wtf()) - throw new IllegalArgumentException("Unexpected intent action '" + action + "'"); + finish(); + return; } // mIntent is a copy of the original CALL intent that started the diff --git a/tests/res/layout/call_dial_test.xml b/tests/res/layout/call_dial_test.xml index 5d420f408..dd9af39b3 100644 --- a/tests/res/layout/call_dial_test.xml +++ b/tests/res/layout/call_dial_test.xml @@ -45,7 +45,7 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> + android:layout_weight="2" /> + + + +