diff options
| author | 2014-10-22 20:27:14 +0000 | |
|---|---|---|
| committer | 2014-10-22 20:27:15 +0000 | |
| commit | 6ab862747b913353ff63b7c9bd6c7ddcecb348c6 (patch) | |
| tree | f2e7eb5a3dddf1fac634ea089580474195101bc5 | |
| parent | 410f7ee4031bb754600ad9c984158b6ff4f056c8 (diff) | |
| parent | aad67a3e48ad1dc9a917e036f98021c6e4d1f748 (diff) | |
Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev
| -rw-r--r-- | services/core/java/com/android/server/job/JobSchedulerService.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java index c6d2db2ccf6e..83d6986a410f 100644 --- a/services/core/java/com/android/server/job/JobSchedulerService.java +++ b/services/core/java/com/android/server/job/JobSchedulerService.java @@ -137,11 +137,15 @@ public class JobSchedulerService extends com.android.server.SystemService public void onReceive(Context context, Intent intent) { Slog.d(TAG, "Receieved: " + intent.getAction()); if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { - int uidRemoved = intent.getIntExtra(Intent.EXTRA_UID, -1); - if (DEBUG) { - Slog.d(TAG, "Removing jobs for uid: " + uidRemoved); + // If this is an outright uninstall rather than the first half of an + // app update sequence, cancel the jobs associated with the app. + if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { + int uidRemoved = intent.getIntExtra(Intent.EXTRA_UID, -1); + if (DEBUG) { + Slog.d(TAG, "Removing jobs for uid: " + uidRemoved); + } + cancelJobsForUid(uidRemoved); } - cancelJobsForUid(uidRemoved); } else if (Intent.ACTION_USER_REMOVED.equals(intent.getAction())) { final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0); if (DEBUG) { |