From 57fdc2b9ab68bff217d4c9c605ef89cefd66f678 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Thu, 22 Mar 2018 01:06:19 -0700 Subject: Increase minSdk to 24. Manually set to M - MissedCallNotifierTest (not sure what the issue is here...) - CallLogGroupBuilderTest (because a check was removed, some NPEs are thrown) - MainSearchControllerTest (/system/etc/fonts.xml (No such file or directory)) Ignore Tests - a few random ones in incallui/answer/impl/hint (shared prefs aren't working for some reason) - VisualVoicemailUpdateTaskTest (disabled the whole test, issue unclear) Bug: 73902692 Test: tap PiperOrigin-RevId: 190030202 Change-Id: I1e9b61d758a61582c5a183ee884dd2181d1c10de --- java/com/android/dialer/app/AndroidManifest.xml | 2 +- java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java | 4 +++- .../dialer/app/calllog/CallLogNotificationsQueryHelper.java | 6 +++--- java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java | 6 ------ .../dialer/app/calllog/VoicemailNotificationJobService.java | 9 ++------- 5 files changed, 9 insertions(+), 18 deletions(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml index 0c1a362bb..e77bbe250 100644 --- a/java/com/android/dialer/app/AndroidManifest.xml +++ b/java/com/android/dialer/app/AndroidManifest.xml @@ -55,7 +55,7 @@ diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java index 08f5585b0..b306e756a 100644 --- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java +++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java @@ -34,7 +34,8 @@ import com.android.dialer.common.concurrent.AsyncTaskExecutors; import com.android.dialer.util.PermissionsUtil; import com.android.voicemail.VoicemailClient; -@TargetApi(VERSION_CODES.M) +/** TODO(calderwoodra): documentation */ +@TargetApi(VERSION_CODES.N) public class CallLogAsyncTaskUtil { private static final String TAG = "CallLogAsyncTaskUtil"; @@ -155,6 +156,7 @@ public class CallLogAsyncTaskUtil { UPDATE_DURATION, } + /** TODO(calderwoodra): documentation */ public interface CallLogAsyncTaskListener { void onDeleteVoicemail(); } diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java index 3afb6bb87..ce6e5baf4 100644 --- a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java +++ b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java @@ -51,7 +51,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; /** Helper class operating on call log notifications. */ -@TargetApi(Build.VERSION_CODES.M) +@TargetApi(Build.VERSION_CODES.N) public class CallLogNotificationsQueryHelper { @VisibleForTesting @@ -341,14 +341,14 @@ public class CallLogNotificationsQueryHelper { @Override @Nullable - @TargetApi(Build.VERSION_CODES.M) + @TargetApi(Build.VERSION_CODES.N) public List query(int type) { return query(type, NO_THRESHOLD); } @Override @Nullable - @TargetApi(Build.VERSION_CODES.M) + @TargetApi(Build.VERSION_CODES.N) @SuppressWarnings("MissingPermission") public List query(int type, long thresholdMillis) { if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_CALL_LOG)) { diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java index 78d307521..cba389cc3 100644 --- a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java +++ b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java @@ -233,9 +233,6 @@ final class VisualVoicemailNotifier { @Nullable private static Uri getVoicemailRingtoneUri( @NonNull Context context, @Nullable PhoneAccountHandle handle) { - if (VERSION.SDK_INT < VERSION_CODES.N) { - return null; - } if (handle == null) { LogUtil.i("VisualVoicemailNotifier.getVoicemailRingtoneUri", "null handle, getting fallback"); handle = getFallbackAccount(context); @@ -251,9 +248,6 @@ final class VisualVoicemailNotifier { private static int getNotificationDefaultFlags( @NonNull Context context, @Nullable PhoneAccountHandle handle) { - if (VERSION.SDK_INT < VERSION_CODES.N) { - return Notification.DEFAULT_ALL; - } if (handle == null) { LogUtil.i( "VisualVoicemailNotifier.getNotificationDefaultFlags", "null handle, getting fallback"); diff --git a/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java b/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java index ba61601ae..754ab2727 100644 --- a/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java +++ b/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java @@ -22,7 +22,6 @@ import android.app.job.JobScheduler; import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; -import android.os.Build; import android.provider.VoicemailContract; import com.android.dialer.common.LogUtil; import com.android.dialer.constants.ScheduledJobIds; @@ -37,12 +36,8 @@ public class VoicemailNotificationJobService extends JobService { * notification is visible. */ public static void scheduleJob(Context context) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - LogUtil.i("VoicemailNotificationJobService.scheduleJob", "not supported"); - } else { - context.getSystemService(JobScheduler.class).schedule(getJobInfo(context)); - LogUtil.i("VoicemailNotificationJobService.scheduleJob", "job scheduled"); - } + context.getSystemService(JobScheduler.class).schedule(getJobInfo(context)); + LogUtil.i("VoicemailNotificationJobService.scheduleJob", "job scheduled"); } /** -- cgit v1.2.3