diff options
| author | Sailesh Nepal <sail@google.com> | 2017-03-16 20:19:43 +0000 |
|---|---|---|
| committer | Sailesh Nepal <sail@google.com> | 2017-03-16 20:19:43 +0000 |
| commit | 2df4538eb90b896be15eebc1d9adf1206131c8a3 (patch) | |
| tree | b54abbb51fb7d66e7755a1fbb5db023ff601090b /java/com/android/voicemail | |
| parent | 1019500220518fb5fb023fcb7d370ab3cbf12307 (diff) | |
Revert "Update dialer to tap green cl 150332012."
This reverts commit 1019500220518fb5fb023fcb7d370ab3cbf12307.
Change-Id: Ie6e4f81a995fca7345132b596521b0bd06ceffb9
Diffstat (limited to 'java/com/android/voicemail')
| -rw-r--r-- | java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java | 2 | ||||
| -rw-r--r-- | java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java b/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java index 2c706d2a8..c255019fc 100644 --- a/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java +++ b/java/com/android/voicemail/impl/sync/OmtpVvmSyncService.java @@ -180,7 +180,7 @@ public class OmtpVvmSyncService { // The number of voicemails that exceed our threshold and should be deleted from the server int numVoicemails = imapHelper.getOccuupiedQuota() - - (int) (AUTO_DELETE_ARCHIVE_VM_THRESHOLD * imapHelper.getTotalQuota()); + - ((int) AUTO_DELETE_ARCHIVE_VM_THRESHOLD * imapHelper.getTotalQuota()); List<Voicemail> oldestVoicemails = mQueryHelper.oldestVoicemailsOnServer(numVoicemails); if (!oldestVoicemails.isEmpty()) { mQueryHelper.markArchivedInDatabase(oldestVoicemails); diff --git a/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java b/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java index fc8119a80..d129406ff 100644 --- a/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java +++ b/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java @@ -272,15 +272,14 @@ public class VoicemailsQueryHelper { String sortAndLimit = "date ASC limit " + numVoicemails; try (Cursor cursor = - mContentResolver.query(mSourceUri, PROJECTION, ARCHIVED_SELECTION, null, sortAndLimit)) { + mContentResolver.query(mSourceUri, null, ARCHIVED_SELECTION, null, sortAndLimit)) { Assert.isNotNull(cursor); List<Voicemail> voicemails = new ArrayList<>(); while (cursor.moveToNext()) { - final long id = cursor.getLong(_ID); final String sourceData = cursor.getString(SOURCE_DATA); - Voicemail voicemail = Voicemail.createForUpdate(id, sourceData).build(); + Voicemail voicemail = Voicemail.createForUpdate(cursor.getLong(_ID), sourceData).build(); voicemails.add(voicemail); } |