Merge "Remove STOPSHIP logging" into honeycomb-mr1

This commit is contained in:
Marc Blank 2011-03-17 07:58:04 -07:00 committed by Android (Google) Code Review
commit b50a766d4a
4 changed files with 3 additions and 5 deletions

View File

@ -85,8 +85,6 @@ public class Device {
}
w.write(id);
w.close();
// STOPSHIP Remove logging
Log.w(Logging.LOG_TAG, "deviceId written as: " + id);
return id;
}

View File

@ -383,7 +383,7 @@ public class MimeUtility {
try {
IOUtils.copy(in, out);
} catch (Base64DataException bde) {
// STOPSHIP Need to fix this somehow
// TODO Need to fix this somehow
//String warning = "\n\n" + Email.getMessageDecodeErrorString();
//out.write(warning.getBytes());
} finally {

View File

@ -25,7 +25,7 @@ import android.os.RemoteException;
import android.util.Log;
public class PolicyServiceProxy extends ServiceProxy implements IPolicyService {
private static final boolean DEBUG_PROXY = true; // STOPSHIP DO NOT CHECK THIS IN SET TO TRUE
private static final boolean DEBUG_PROXY = false; // DO NOT CHECK THIS IN SET TO TRUE
private static final String TAG = "PolicyServiceProxy";
// The intent used by sync adapter services to connect to the PolicyService

View File

@ -42,7 +42,7 @@ import android.util.Log;
*/
public abstract class ServiceProxy {
private static final boolean DEBUG_PROXY = true; // STOPSHIP DO NOT CHECK THIS IN SET TO TRUE
private static final boolean DEBUG_PROXY = false; // DO NOT CHECK THIS IN SET TO TRUE
private final String mTag;
private final Context mContext;