Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationService.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationService.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationService.java |
| index e97b7d498e6f88d9002d88e97ce06dda013d8a3b..1317deb617a8aa697727171bae20b0d9e9c1b786 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationService.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationService.java |
| @@ -62,6 +62,8 @@ public class DownloadNotificationService extends Service { |
| private static final String NEXT_DOWNLOAD_NOTIFICATION_ID = "NextDownloadNotificationId"; |
| // Notification Id starting value, to avoid conflicts from IDs used in prior versions. |
| private static final int STARTING_NOTIFICATION_ID = 1000000; |
| + private static final String AUTO_RESUMPTION_ATTEMPT_LEFT = "ResumptionAttemptLeft"; |
| + private static final int MAX_RESUMPTION_ATTEMPT_LEFT = 5; |
| @VisibleForTesting static final int SECONDS_PER_MINUTE = 60; |
| @VisibleForTesting static final int SECONDS_PER_HOUR = 60 * 60; |
| @VisibleForTesting static final int SECONDS_PER_DAY = 24 * 60 * 60; |
| @@ -73,6 +75,7 @@ public class DownloadNotificationService extends Service { |
| private SharedPreferences mSharedPrefs; |
| private Context mContext; |
| private int mNextNotificationId; |
| + private int mNumAutoResumptionAttemptLeft; |
| /** |
| * Class for clients to access. |
| @@ -126,8 +129,10 @@ public class DownloadNotificationService extends Service { |
| allowMeteredConnection = true; |
| } |
| } |
| - DownloadResumptionScheduler.getDownloadResumptionScheduler(mContext).schedule( |
| - allowMeteredConnection); |
| + if (mNumAutoResumptionAttemptLeft > 0) { |
| + DownloadResumptionScheduler.getDownloadResumptionScheduler(mContext).schedule( |
| + allowMeteredConnection); |
| + } |
| } |
| stopSelf(); |
| } |
| @@ -137,8 +142,19 @@ public class DownloadNotificationService extends Service { |
| if (isDownloadOperationIntent(intent)) { |
| handleDownloadOperation(intent); |
| DownloadResumptionScheduler.getDownloadResumptionScheduler(mContext).cancelTask(); |
| + // Limit the number of auto resumption attempts in case Chrome falls into a vicious |
| + // cycle. |
| + if (intent.getAction() == ACTION_DOWNLOAD_RESUME_ALL) { |
| + if (mNumAutoResumptionAttemptLeft > 0) { |
| + mNumAutoResumptionAttemptLeft--; |
| + updateResumptionAttemptLeft(); |
| + } |
| + } else { |
| + // Reset number of attempts left if the action is triggered by user. |
| + mNumAutoResumptionAttemptLeft = MAX_RESUMPTION_ATTEMPT_LEFT; |
| + clearResumptionAttemptLeft(); |
| + } |
| } |
| - |
| // This should restart the service after Chrome gets killed. However, this |
| // doesn't work on Android 4.4.2. |
| return START_STICKY; |
| @@ -150,6 +166,26 @@ public class DownloadNotificationService extends Service { |
| } |
| /** |
| + * Helper method to update the remaining number of background resumption attempts left. |
| + * @param attamptLeft Number of attempt left. |
| + */ |
| + private void updateResumptionAttemptLeft() { |
| + SharedPreferences.Editor editor = mSharedPrefs.edit(); |
| + editor.putInt(AUTO_RESUMPTION_ATTEMPT_LEFT, mNumAutoResumptionAttemptLeft); |
| + editor.apply(); |
| + } |
| + |
| + /** |
| + * Helper method to clear the remaining number of background resumption attempts left. |
| + */ |
| + static void clearResumptionAttemptLeft() { |
| + SharedPreferences SharedPrefs = ContextUtils.getAppSharedPreferences(); |
| + SharedPreferences.Editor editor = SharedPrefs.edit(); |
| + editor.remove(AUTO_RESUMPTION_ATTEMPT_LEFT); |
| + editor.apply(); |
| + } |
| + |
| + /** |
| * Add a in-progress download notification. |
| * @param downloadGuid GUID of the download. |
| * @param fileName File name of the download. |
| @@ -551,6 +587,8 @@ public class DownloadNotificationService extends Service { |
| * @return a list of parsed DownloadSharedPreferenceEntry. |
|
Ted C
2016/06/27 17:13:07
update the comment here
qinmin
2016/06/27 22:02:33
Done.
|
| */ |
| void parseDownloadSharedPrefs() { |
| + mNumAutoResumptionAttemptLeft = mSharedPrefs.getInt(AUTO_RESUMPTION_ATTEMPT_LEFT, |
| + MAX_RESUMPTION_ATTEMPT_LEFT); |
| if (!mSharedPrefs.contains(PENDING_DOWNLOAD_NOTIFICATIONS)) return; |
| Set<String> entries = DownloadManagerService.getStoredDownloadInfo( |
| mSharedPrefs, PENDING_DOWNLOAD_NOTIFICATIONS); |