Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ee5f6b6 authored by Brandon Maxwell's avatar Brandon Maxwell
Browse files

Guarding use of Voicemails.DELETE to versions >= M

Bug: 25776171
Change-Id: Ib123da80c6f902c81ad09d9b9ca7fb93df057d1a
parent b2e47452
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.database.sqlite.SQLiteDiskIOException;
import android.database.sqlite.SQLiteException;
import android.database.sqlite.SQLiteFullException;
import android.net.Uri;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@@ -34,6 +35,7 @@ import android.provider.VoicemailContract.Status;
import android.provider.VoicemailContract.Voicemails;
import android.util.Log;

import com.android.contacts.common.compat.SdkVersionOverride;
import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
import com.android.contacts.common.util.PermissionsUtil;
import com.android.dialer.filterednumber.FilteredNumbersUtil;
@@ -167,8 +169,10 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
        List<String> selectionArgs = Lists.newArrayList();

        // Ignore voicemails marked as deleted
        where.append(Voicemails.DELETED);
        where.append(" = 0");
        if (SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M)
                >= Build.VERSION_CODES.M) {
            where.append(Voicemails.DELETED).append(" = 0");
        }

        if (newOnly) {
            where.append(" AND ");