Merge "Use Kotlin List & NonNull String" into main (38c21b18) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDao.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -21,11 +21,9 @@ import androidx.room.Insert;
		import androidx.room.OnConflictStrategy;
		import androidx.room.Query;

		import java.util.List;

		/** DAO for accessing {@link BatteryReattributeEntity} in the database. */
		@Dao
		public interface BatteryReattributeDao {
		interface BatteryReattributeDao {

		/** Inserts a {@link BatteryReattributeEntity} data into the database. */
		@Insert(onConflict = OnConflictStrategy.REPLACE)

+4 −4

Original line number	Diff line number	Diff line
		@@ -18,14 +18,14 @@ package com.android.settings.fuelgauge.batteryusage.db;

		import static com.android.settings.fuelgauge.batteryusage.ConvertUtils.utcToLocalTimeForLogging;

		import com.android.settings.fuelgauge.batteryusage.BatteryReattribute;
		import com.android.settings.fuelgauge.batteryusage.ConvertUtils;

		import androidx.annotation.NonNull;
		import androidx.annotation.VisibleForTesting;
		import androidx.room.Entity;
		import androidx.room.PrimaryKey;

		import com.android.settings.fuelgauge.batteryusage.BatteryReattribute;
		import com.android.settings.fuelgauge.batteryusage.ConvertUtils;

		/** A {@link Entity} for battery usage reattribution data in the database. */
		@Entity
		public class BatteryReattributeEntity {
		@@ -38,7 +38,7 @@ public class BatteryReattributeEntity {
		public final long timestampEnd;

		/** The battery usage reattribution data for corresponding uids. */
		public final String reattributeData;
		@NonNull public final String reattributeData;

		public BatteryReattributeEntity(@NonNull BatteryReattribute batteryReattribute) {
		this(