ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove STOPSHIPs in Email/Emailcommon"

Browse Source
This commit is contained in:
Marc Blank 2011-08-10 16:50:48 -07:00 committed by Android (Google) Code Review
commit b9e8c2def1
5 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emailcommon/src/com/android/emailcommon/Device.java
View File

@ -17,12 +17,12 @@
package com.android.emailcommon;
import com.android.emailcommon.utility.Utility;
import android.content.Context;
import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.emailcommon.utility.Utility;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@ -64,10 +64,6 @@ public class Device {
if (!f.delete()) {
Log.e(Logging.LOG_TAG, "Can't delete null deviceName file; try overwrite.");
}
} else {
// STOPSHIP Remove logging
Log.w(Logging.LOG_TAG, "deviceId read as: " + id);
return id;
}
} else {
Log.w(Logging.LOG_TAG, f.getAbsolutePath() + ": File exists, but can't read?" +

1
emailcommon/src/com/android/emailcommon/provider/Policy.java
View File

@ -40,7 +40,6 @@ import java.util.ArrayList;
* a limit on the sync window for the Account)
*/
public final class Policy extends EmailContent implements EmailContent.PolicyColumns, Parcelable {
// STOPSHIP Change to false after a few days of debugging
public static final boolean DEBUG_POLICY = false; // DO NOT SUBMIT WITH THIS SET TO TRUE
public static final String TAG = "Email/Policy";

3
src/com/android/email/activity/UIControllerBase.java
View File

@ -383,8 +383,7 @@ abstract class UIControllerBase implements MailboxListFragment.Callback,
return;
}
if (!mRemovedFragments.contains(fragment)) {
// STOPSHIP Remove log/catch. b/4905749 - b/4981556
Log.d(Logging.LOG_TAG, "Removing " + fragment);
// Remove try/catch when b/4981556 is fixed (framework bug)
try {
ft.remove(fragment);
} catch (IllegalStateException ex) {

2
src/com/android/email/activity/setup/AccountSetupOptions.java
View File

@ -68,9 +68,7 @@ public class AccountSetupOptions extends AccountSetupActivity implements OnClick
public static final int REQUEST_CODE_ACCEPT_POLICIES = 1;
/** Default sync window for new EAS accounts */
// STOPSHIP Change default for now to auto
private static final int SYNC_WINDOW_EAS_DEFAULT = SyncWindow.SYNC_WINDOW_AUTO;
// Was SYNC_WINDOW_3_DAYS;
public static void actionOptions(Activity fromActivity) {
fromActivity.startActivity(new Intent(fromActivity, AccountSetupOptions.class));

4
src/com/android/email/service/AttachmentDownloadService.java
View File

@ -919,7 +919,6 @@ public class AttachmentDownloadService extends Service implements Runnable {
}
if (intent != null && intent.hasExtra(EXTRA_ATTACHMENT)) {
Attachment att = (Attachment)intent.getParcelableExtra(EXTRA_ATTACHMENT);
Log.d(TAG, "*** ONSTARTCOMMAND, changed: " + att.mId);
onChange(att);
}
return Service.START_STICKY;
@ -927,7 +926,6 @@ public class AttachmentDownloadService extends Service implements Runnable {
@Override
public void onCreate() {
Log.d(TAG, "**** ON CREATE!");
// Start up our service thread
new Thread(this, "AttachmentDownloadService").start();
}
@ -938,8 +936,6 @@ public class AttachmentDownloadService extends Service implements Runnable {
@Override
public void onDestroy() {
// STOPSHIP Remove this, and other, lifecycle logging
Log.d(TAG, "**** ON DESTROY!");
// Mark this instance of the service as stopped
mStop = true;
if (sRunningService != null) {