PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Kotlin List & NonNull String

Browse Source 
To avoid Room compiler error / warning.

Bug: 332487783
Test: m Settings
Flag: EXEMPT refactor
Change-Id: I79a4991c1a0009e347f0916f4f204229dc07581a
This commit is contained in:
Chaohui Wang
2024-06-18 14:39:49 +08:00
parent 861ae9c156
commit 80a81431f4
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDao.kt
View File

@@ -21,11 +21,9 @@ import androidx.room.Insert;
import androidx.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import androidx.room.Query; import androidx.room.Query;
import java.util.List;
/** DAO for accessing {@link BatteryReattributeEntity} in the database. */ /** DAO for accessing {@link BatteryReattributeEntity} in the database. */
@Dao @Dao
public interface BatteryReattributeDao { interface BatteryReattributeDao {
/** Inserts a {@link BatteryReattributeEntity} data into the database. */ /** Inserts a {@link BatteryReattributeEntity} data into the database. */
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)

8
src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntity.java
View File

@@ -18,14 +18,14 @@ package com.android.settings.fuelgauge.batteryusage.db;
import static com.android.settings.fuelgauge.batteryusage.ConvertUtils.utcToLocalTimeForLogging; 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.NonNull;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.room.Entity; import androidx.room.Entity;
import androidx.room.PrimaryKey; 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. */ /** A {@link Entity} for battery usage reattribution data in the database. */
@Entity @Entity
public class BatteryReattributeEntity { public class BatteryReattributeEntity {
@@ -38,7 +38,7 @@ public class BatteryReattributeEntity {
public final long timestampEnd; public final long timestampEnd;
/** The battery usage reattribution data for corresponding uids. */ /** The battery usage reattribution data for corresponding uids. */
public final String reattributeData; @NonNull public final String reattributeData;
public BatteryReattributeEntity(@NonNull BatteryReattribute batteryReattribute) { public BatteryReattributeEntity(@NonNull BatteryReattribute batteryReattribute) {
this( this(