Remove app installed table and DAOs per decision to not persist this
info.
Test: atest
Bug: 246132780
Change-Id: Ied6b159440a16bb30cc6a0ab4239fce9f91d85b3
diff --git a/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelper.java b/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelper.java
index f197679..add0855 100644
--- a/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelper.java
+++ b/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelper.java
@@ -76,8 +76,6 @@
db.execSQL(UserDataTables.AppUsageHistory.CREATE_STARTING_TIME_SEC_INDEX_STATEMENT);
db.execSQL(UserDataTables.AppUsageHistory.CREATE_ENDING_TIME_SEC_INDEX_STATEMENT);
db.execSQL(UserDataTables.AppUsageHistory.CREATE_TOTAL_TIME_USED_SEC_INDEX_STATEMENT);
- db.execSQL(UserDataTables.AppInstalledHistory.CREATE_TABLE_STATEMENT);
- db.execSQL(UserDataTables.AppInstalledHistory.CREATE_INDEXES_STATEMENT);
}
@Override
diff --git a/src/com/android/ondevicepersonalization/services/data/user/UserDataDao.java b/src/com/android/ondevicepersonalization/services/data/user/UserDataDao.java
index fffc4de..ecdcbf8 100644
--- a/src/com/android/ondevicepersonalization/services/data/user/UserDataDao.java
+++ b/src/com/android/ondevicepersonalization/services/data/user/UserDataDao.java
@@ -87,29 +87,6 @@
}
/**
- * Inserts a single app installed/uninstalled activity.
- *
- * @return true if the insert succeeded, false otherwise.
- */
- public boolean insertAppInstalledData(String packageName, long timeSec, boolean installed) {
- try {
- SQLiteDatabase db = mDbHelper.getWritableDatabase();
- if (db == null) {
- return false;
- }
- ContentValues values = new ContentValues();
- values.put(UserDataTables.AppInstalledHistory.TIME_SEC, timeSec);
- values.put(UserDataTables.AppInstalledHistory.PACKAGE_NAME, packageName);
- values.put(UserDataTables.AppInstalledHistory.INSTALLED, installed);
- return db.insertWithOnConflict(UserDataTables.AppInstalledHistory.TABLE_NAME, null,
- values, SQLiteDatabase.CONFLICT_REPLACE) != -1;
- } catch (SQLiteException e) {
- Log.e(TAG, "Failed to insert app installed history data", e);
- return false;
- }
- }
-
- /**
* Inserts a single app usage history entry.
*
* @return true if the insert succeeded, false otherwise.
diff --git a/src/com/android/ondevicepersonalization/services/data/user/UserDataTables.java b/src/com/android/ondevicepersonalization/services/data/user/UserDataTables.java
index d2d6bfd..8a5d227 100644
--- a/src/com/android/ondevicepersonalization/services/data/user/UserDataTables.java
+++ b/src/com/android/ondevicepersonalization/services/data/user/UserDataTables.java
@@ -61,36 +61,6 @@
+ TIME_SEC + ")";
}
- /** App installed/uninstalled history table. */
- public static class AppInstalledHistory implements BaseColumns {
- /** The name of app installed/uninstalled history table. */
- public static final String TABLE_NAME = "app_installed_history";
-
- /** The index name of app installed/uninstalled history table. */
- public static final String INDEX_NAME = INDEX_PREFIX + TABLE_NAME;
-
- /** The timestamp when the app is installed or uninstalled in seconds. */
- public static final String TIME_SEC = "time_sec";
-
- /** The name of the app installed or uninstalled. */
- public static final String PACKAGE_NAME = "package_name";
-
- /** Is the app installed (1) or uninstalled (0) */
- public static final String INSTALLED = "installed";
-
- public static final String CREATE_TABLE_STATEMENT = "CREATE TABLE IF NOT EXISTS "
- + TABLE_NAME + " ("
- + _ID + " INTEGER PRIMARY KEY, "
- + TIME_SEC + " INTEGER NOT NULL, "
- + PACKAGE_NAME + " TEXT NOT NULL, "
- + INSTALLED + " INTEGER NOT NULL)";
-
- public static final String CREATE_INDEXES_STATEMENT = "CREATE INDEX IF NOT EXISTS "
- + INDEX_NAME + " ON "
- + TABLE_NAME + "("
- + TIME_SEC + ")";
- }
-
/** App usage stats history table. */
public static class AppUsageHistory implements BaseColumns {
/** The name of app usage stats table. */
diff --git a/tests/servicetests/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelperTest.java b/tests/servicetests/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelperTest.java
index 09e55d7..ef188db 100644
--- a/tests/servicetests/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelperTest.java
+++ b/tests/servicetests/src/com/android/ondevicepersonalization/services/data/OnDevicePersonalizationDbHelperTest.java
@@ -57,8 +57,6 @@
assertTrue(hasEntity(UserDataTables.AppUsageHistory.ENDING_TIME_SEC_INDEX_NAME, "index"));
assertTrue(hasEntity(
UserDataTables.AppUsageHistory.TOTAL_TIME_USED_SEC_INDEX_NAME, "index"));
- assertTrue(hasEntity(UserDataTables.AppInstalledHistory.TABLE_NAME, "table"));
- assertTrue(hasEntity(UserDataTables.AppInstalledHistory.INDEX_NAME, "index"));
}
@Test
diff --git a/tests/servicetests/src/com/android/ondevicepersonalization/services/data/user/UserDataDaoTest.java b/tests/servicetests/src/com/android/ondevicepersonalization/services/data/user/UserDataDaoTest.java
index 78dc886..74fae49 100644
--- a/tests/servicetests/src/com/android/ondevicepersonalization/services/data/user/UserDataDaoTest.java
+++ b/tests/servicetests/src/com/android/ondevicepersonalization/services/data/user/UserDataDaoTest.java
@@ -47,7 +47,6 @@
1234567890, "111.11111", "-222.22222", 1, true);
assertTrue(insertResult);
assertTrue(mDao.insertAppUsageHistoryData("TikTok", 999100, 999200, 100));
- assertTrue(mDao.insertAppInstalledData("Instagram", 990900, true));
}
@Test
