From 81b7b5362e4ddc7be2a52e6be27ea732acc7b8f7 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 17 Mar 2016 11:03:32 -0600
Subject: Follow framework refactoring.

Bug: 27531029
Change-Id: I1abfb08f8bcef310d25840101e92a237eccccceb
---
 AndroidManifest.xml                                   | 10 +++++-----
 src/com/android/deskclock/DeskClockBackupAgent.java   |  2 +-
 src/com/android/deskclock/Utils.java                  |  6 +++---
 src/com/android/deskclock/provider/ClockProvider.java | 19 +++++++++----------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 25d2c05a6..c2df019ff 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -48,7 +48,7 @@
         <provider android:name=".provider.ClockProvider"
                 android:authorities="com.android.deskclock"
                 android:exported="false"
-                android:encryptionAware="true" />
+                android:directBootAware="true" />
 
         <activity android:name="DeskClock"
                 android:label="@string/app_label"
@@ -105,7 +105,7 @@
                 android:theme="@style/AlarmAlertFullScreenTheme"
                 android:windowSoftInputMode="stateAlwaysHidden"
                 android:showOnLockScreen="true"
-                android:encryptionAware="true" />
+                android:directBootAware="true" />
 
         <activity android:name="ScreensaverActivity"
                 android:excludeFromRecents="true"
@@ -115,12 +115,12 @@
 
         <receiver android:name=".alarms.AlarmStateManager"
                   android:exported="false"
-                  android:encryptionAware="true">
+                  android:directBootAware="true">
         </receiver>
 
         <service android:name=".alarms.AlarmService"
                  android:exported="false"
-                 android:encryptionAware="true">
+                 android:directBootAware="true">
         </service>
 
         <activity android:name="HandleApiCalls"
@@ -235,7 +235,7 @@
         </activity>
 
         <receiver android:name="AlarmInitReceiver"
-                android:encryptionAware="true">
+                android:directBootAware="true">
             <intent-filter>
                 <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
diff --git a/src/com/android/deskclock/DeskClockBackupAgent.java b/src/com/android/deskclock/DeskClockBackupAgent.java
index 3b8ae9890..d29402e77 100644
--- a/src/com/android/deskclock/DeskClockBackupAgent.java
+++ b/src/com/android/deskclock/DeskClockBackupAgent.java
@@ -85,7 +85,7 @@ public class DeskClockBackupAgent extends BackupAgent {
     public void onRestoreFinished() {
         if (Utils.isNOrLater()) {
             // TODO: migrate restored database and preferences over into
-            // the device-encrypted storage area
+            // the device-protected storage area
         }
 
         // Write a preference to indicate a data restore has been completed.
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index 13c7c4c31..39a7b65d2 100644
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
@@ -709,10 +709,10 @@ public class Utils {
         final Context storageContext;
         if (isNOrLater()) {
             // All N devices have split storage areas, but we may need to
-            // migrate existing preferences into the new device encrypted
+            // migrate existing preferences into the new device protected
             // storage area, which is where our data lives from now on.
-            final Context deviceContext = context.createDeviceEncryptedStorageContext();
-            if (!deviceContext.migrateSharedPreferencesFrom(context,
+            final Context deviceContext = context.createDeviceProtectedStorageContext();
+            if (!deviceContext.moveSharedPreferencesFrom(context,
                     PreferenceManager.getDefaultSharedPreferencesName(context))) {
                 LogUtils.wtf("Failed to migrate shared preferences");
             }
diff --git a/src/com/android/deskclock/provider/ClockProvider.java b/src/com/android/deskclock/provider/ClockProvider.java
index c4ee7cc32..a96eb5e61 100644
--- a/src/com/android/deskclock/provider/ClockProvider.java
+++ b/src/com/android/deskclock/provider/ClockProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 The Android Open Source Project
+e * Copyright (C) 2013 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,9 @@
 
 package com.android.deskclock.provider;
 
+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;
@@ -26,20 +29,16 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 
 import com.android.deskclock.LogUtils;
 import com.android.deskclock.Utils;
+import com.android.deskclock.provider.ClockContract.AlarmsColumns;
+import com.android.deskclock.provider.ClockContract.InstancesColumns;
 
 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;
@@ -122,10 +121,10 @@ public class ClockProvider extends ContentProvider {
         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
+            // migrate existing database into the new device protected
             // storage area, which is where our data lives from now on.
-            final Context deviceContext = context.createDeviceEncryptedStorageContext();
-            if (!deviceContext.migrateDatabaseFrom(context, ClockDatabaseHelper.DATABASE_NAME)) {
+            final Context deviceContext = context.createDeviceProtectedStorageContext();
+            if (!deviceContext.moveDatabaseFrom(context, ClockDatabaseHelper.DATABASE_NAME)) {
                 LogUtils.wtf("Failed to migrate database");
             }
             storageContext = deviceContext;
-- 
cgit v1.2.3