1 files changed, 13 insertions, 18 deletions

diff --git a/src/com/android/deskclock/provider/ClockProvider.java b/src/com/android/deskclock/provider/ClockProvider.java
index 0e8882421..680e3f4b3 100644
--- a/src/com/android/deskclock/provider/ClockProvider.java
+++ b/src/com/android/deskclock/provider/ClockProvider.java
@@ -16,7 +16,11 @@
 
 package com.android.deskclock.provider;
 
-import android.annotation.TargetApi;
+import static com.android.deskclock.provider.ClockContract.AlarmsColumns;
+import static com.android.deskclock.provider.ClockContract.InstancesColumns;
+import static com.android.deskclock.provider.ClockDatabaseHelper.ALARMS_TABLE_NAME;
+import static com.android.deskclock.provider.ClockDatabaseHelper.INSTANCES_TABLE_NAME;
+
 import android.content.ContentProvider;
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -28,20 +32,16 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.os.Build;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 
+import androidx.annotation.NonNull;
+
 import com.android.deskclock.LogUtils;
 import com.android.deskclock.Utils;
 
 import java.util.Map;
 
-import static com.android.deskclock.provider.ClockContract.AlarmsColumns;
-import static com.android.deskclock.provider.ClockContract.InstancesColumns;
-import static com.android.deskclock.provider.ClockDatabaseHelper.ALARMS_TABLE_NAME;
-import static com.android.deskclock.provider.ClockDatabaseHelper.INSTANCES_TABLE_NAME;
-
 public class ClockProvider extends ContentProvider {
 
     private ClockDatabaseHelper mOpenHelper;
@@ -126,20 +126,15 @@ public class ClockProvider extends ContentProvider {
     }
 
     @Override
-    @TargetApi(Build.VERSION_CODES.N)
     public boolean onCreate() {
         final Context context = getContext();
         final Context storageContext;
-        if (Utils.isNOrLater()) {
-            // All N devices have split storage areas, but we may need to
-            // migrate existing database into the new device encrypted
-            // storage area, which is where our data lives from now on.
-            storageContext = context.createDeviceProtectedStorageContext();
-            if (!storageContext.moveDatabaseFrom(context, ClockDatabaseHelper.DATABASE_NAME)) {
-                LogUtils.wtf("Failed to migrate database: %s", ClockDatabaseHelper.DATABASE_NAME);
-            }
-        } else {
-            storageContext = context;
+        // All N devices have split storage areas, but we may need to
+        // migrate existing database into the new device encrypted
+        // storage area, which is where our data lives from now on.
+        storageContext = context.createDeviceProtectedStorageContext();
+        if (!storageContext.moveDatabaseFrom(context, ClockDatabaseHelper.DATABASE_NAME)) {
+            LogUtils.wtf("Failed to migrate database: %s", ClockDatabaseHelper.DATABASE_NAME);
         }
 
         mOpenHelper = new ClockDatabaseHelper(storageContext);