Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-18 23:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset d3f38905e7a0 (bug 827445) since pushed by mistake on a CLOSED TREE

Browse Source
This commit is contained in:
Ed Morley 2013-05-24 21:41:17 +01:00
parent d8d2db4268
commit e0a9ea36e1
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/android/base/UpdateService.java
View File

@ -115,11 +115,9 @@ public class UpdateService extends IntentService {
registerForUpdates(false);
} else if (UpdateServiceHelper.ACTION_CHECK_FOR_UPDATE.equals(intent.getAction())) {
Log.i(LOGTAG, "XYZZY Coming from Point 1");
startUpdate(intent.getIntExtra(UpdateServiceHelper.EXTRA_UPDATE_FLAGS_NAME, 0));
} else if (UpdateServiceHelper.ACTION_DOWNLOAD_UPDATE.equals(intent.getAction())) {
// We always want to do the download here
Log.i(LOGTAG, "XYZZY Coming from Point 2");
startUpdate(UpdateServiceHelper.FLAG_FORCE_DOWNLOAD);
} else if (UpdateServiceHelper.ACTION_APPLY_UPDATE.equals(intent.getAction())) {
applyUpdate(intent.getStringExtra(UpdateServiceHelper.EXTRA_PACKAGE_PATH_NAME));
@ -160,7 +158,6 @@ public class UpdateService extends IntentService {
// We've either never attempted an update, or we are passed the desired
// time. Start an update now.
Log.i(LOGTAG, "no update has ever been attempted, checking now");
Log.i(LOGTAG, "XYZZY Coming from Point 3");
startUpdate(0);
return;
}
@ -204,7 +201,6 @@ public class UpdateService extends IntentService {
int connectionType = netInfo.getType();
int autoDownloadPolicy = getAutoDownloadPolicy();
Log.i(LOGTAG, "XYZZY Checking AutoDownloadPolicy " + Integer.toString(autoDownloadPolicy));
/**
@ -214,9 +210,6 @@ public class UpdateService extends IntentService {
* - The preference is set to 'always'
* - The preference is set to 'wifi' and we are actually using wifi (or regular ethernet)
*/
Log.i(LOGTAG, "XYZZY " + Integer.toString(flags));
boolean shouldStartDownload = hasFlag(flags, UpdateServiceHelper.FLAG_FORCE_DOWNLOAD) ||
autoDownloadPolicy == UpdateServiceHelper.AUTODOWNLOAD_ENABLED ||
(autoDownloadPolicy == UpdateServiceHelper.AUTODOWNLOAD_WIFI &&
@ -567,11 +560,9 @@ public class UpdateService extends IntentService {
}
private void setAutoDownloadPolicy(int policy) {
Log.i(LOGTAG, "XYZZY Setting AutoDownloadPolicy " + Integer.toString(policy));
SharedPreferences.Editor editor = mPrefs.edit();
editor.putInt(KEY_AUTODOWNLOAD_POLICY, policy);
editor.commit();
Log.i(LOGTAG, "XYZZY Verifying AutoDownloadPolicy " + Integer.toString(getAutoDownloadPolicy()));
}
private void saveUpdateInfo(UpdateInfo info, File downloaded) {