1 files changed, 29 insertions, 2 deletions
diff --git a/src/com/android/deskclock/provider/AlarmInstance.java b/src/com/android/deskclock/provider/AlarmInstance.java
index 9fb7a7b07..e5208b3ed 100644
--- a/src/com/android/deskclock/provider/AlarmInstance.java
+++ b/src/com/android/deskclock/provider/AlarmInstance.java
@@ -29,10 +29,12 @@ import com.android.deskclock.LogUtils;
 import com.android.deskclock.R;
 import com.android.deskclock.alarms.AlarmStateManager;
 import com.android.deskclock.data.DataModel;
+import lineageos.app.ProfileManager;
 
 import java.util.Calendar;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.UUID;
 
 public final class AlarmInstance implements ClockContract.InstancesColumns {
     /**
@@ -66,7 +68,9 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
             VIBRATE,
             RINGTONE,
             ALARM_ID,
-            ALARM_STATE
+            ALARM_STATE,
+            INCREASING_VOLUME,
+            PROFILE
     };
 
     /**
@@ -84,8 +88,10 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
     private static final int RINGTONE_INDEX = 8;
     private static final int ALARM_ID_INDEX = 9;
     private static final int ALARM_STATE_INDEX = 10;
+    private static final int INCREASING_VOLUME_INDEX = 11;
+    private static final int PROFILE_INDEX = 12;
 
-    private static final int COLUMN_COUNT = ALARM_STATE_INDEX + 1;
+    private static final int COLUMN_COUNT = PROFILE_INDEX + 1;
 
     public static ContentValues createContentValues(AlarmInstance instance) {
         ContentValues values = new ContentValues(COLUMN_COUNT);
@@ -109,6 +115,9 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
         }
         values.put(ALARM_ID, instance.mAlarmId);
         values.put(ALARM_STATE, instance.mAlarmState);
+        values.put(INCREASING_VOLUME, instance.mIncreasingVolume ? 1 : 0);
+        values.put(PROFILE, instance.mProfile.toString());
+
         return values;
     }
 
@@ -295,6 +304,8 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
     public Uri mRingtone;
     public Long mAlarmId;
     public int mAlarmState;
+    public boolean mIncreasingVolume;
+    public UUID mProfile;
 
     public AlarmInstance(Calendar calendar, Long alarmId) {
         this(calendar);
@@ -308,6 +319,8 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
         mVibrate = false;
         mRingtone = null;
         mAlarmState = SILENT_STATE;
+        mIncreasingVolume = false;
+        mProfile = ProfileManager.NO_PROFILE;
     }
 
     public AlarmInstance(AlarmInstance instance) {
@@ -322,6 +335,8 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
          this.mRingtone = instance.mRingtone;
          this.mAlarmId = instance.mAlarmId;
          this.mAlarmState = instance.mAlarmState;
+         this.mIncreasingVolume = instance.mIncreasingVolume;
+         this.mProfile = instance.mProfile;
     }
 
     public AlarmInstance(Cursor c, boolean joinedTable) {
@@ -356,6 +371,16 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
             mAlarmId = c.getLong(ALARM_ID_INDEX);
         }
         mAlarmState = c.getInt(ALARM_STATE_INDEX);
+        mIncreasingVolume = c.getInt(INCREASING_VOLUME_INDEX) == 1;
+        if (c.isNull(PROFILE_INDEX)) {
+            mProfile = ProfileManager.NO_PROFILE;
+        } else {
+            try {
+                mProfile = UUID.fromString(c.getString(PROFILE_INDEX));
+            } catch (IllegalArgumentException ex) {
+                mProfile = ProfileManager.NO_PROFILE;
+            }
+        }
     }
 
     /**
@@ -471,6 +496,8 @@ public final class AlarmInstance implements ClockContract.InstancesColumns {
                 ", mRingtone=" + mRingtone +
                 ", mAlarmId=" + mAlarmId +
                 ", mAlarmState=" + mAlarmState +
+                ", mIncreasingVolume=" + mIncreasingVolume +
+                ", mProfile=" + mProfile +
                 '}';
     }
 }