Rename AppInstallInfo to AppInfo.
This lets us add other app properties like usage time to the same class.
Bug: 215739909
Test: TH
Change-Id: I47358deb3babc829d3cbc71dc2894bf937bc85bd
diff --git a/framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.aidl b/framework/java/android/adservices/ondevicepersonalization/AppInfo.aidl
similarity index 95%
rename from framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.aidl
rename to framework/java/android/adservices/ondevicepersonalization/AppInfo.aidl
index 2a8aa98..fa69edb 100644
--- a/framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.aidl
+++ b/framework/java/android/adservices/ondevicepersonalization/AppInfo.aidl
@@ -16,4 +16,4 @@
package android.adservices.ondevicepersonalization;
-parcelable AppInstallInfo;
+parcelable AppInfo;
diff --git a/framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.java b/framework/java/android/adservices/ondevicepersonalization/AppInfo.java
similarity index 82%
rename from framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.java
rename to framework/java/android/adservices/ondevicepersonalization/AppInfo.java
index c6d5789..ab6084c 100644
--- a/framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.java
+++ b/framework/java/android/adservices/ondevicepersonalization/AppInfo.java
@@ -23,12 +23,12 @@
import com.android.ondevicepersonalization.internal.util.DataClass;
/**
- * Installation information for an app.
+ * Information about apps.
*
* @hide
*/
@DataClass(genBuilder = true, genEqualsHashCode = true)
-public final class AppInstallInfo implements Parcelable {
+public final class AppInfo implements Parcelable {
/** Whether the app is installed. */
@NonNull boolean mInstalled = false;
@@ -40,7 +40,7 @@
// CHECKSTYLE:OFF Generated code
//
// To regenerate run:
- // $ codegen $ANDROID_BUILD_TOP/packages/modules/OnDevicePersonalization/framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.java
+ // $ codegen $ANDROID_BUILD_TOP/packages/modules/OnDevicePersonalization/framework/java/android/adservices/ondevicepersonalization/AppInfo.java
//
// To exclude the generated code from IntelliJ auto-formatting enable (one-time):
// Settings > Editor > Code Style > Formatter Control
@@ -48,7 +48,7 @@
@DataClass.Generated.Member
- /* package-private */ AppInstallInfo(
+ /* package-private */ AppInfo(
@NonNull boolean installed) {
this.mInstalled = installed;
AnnotationValidations.validate(
@@ -69,13 +69,13 @@
@DataClass.Generated.Member
public boolean equals(@android.annotation.Nullable Object o) {
// You can override field equality logic by defining either of the methods like:
- // boolean fieldNameEquals(AppInstallInfo other) { ... }
+ // boolean fieldNameEquals(AppInfo other) { ... }
// boolean fieldNameEquals(FieldType otherValue) { ... }
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
@SuppressWarnings("unchecked")
- AppInstallInfo that = (AppInstallInfo) o;
+ AppInfo that = (AppInfo) o;
//noinspection PointlessBooleanExpression
return true
&& mInstalled == that.mInstalled;
@@ -110,7 +110,7 @@
/** @hide */
@SuppressWarnings({"unchecked", "RedundantCast"})
@DataClass.Generated.Member
- /* package-private */ AppInstallInfo(@NonNull android.os.Parcel in) {
+ /* package-private */ AppInfo(@NonNull android.os.Parcel in) {
// You can override field unparcelling by defining methods like:
// static FieldType unparcelFieldName(Parcel in) { ... }
@@ -125,21 +125,21 @@
}
@DataClass.Generated.Member
- public static final @NonNull Parcelable.Creator<AppInstallInfo> CREATOR
- = new Parcelable.Creator<AppInstallInfo>() {
+ public static final @NonNull Parcelable.Creator<AppInfo> CREATOR
+ = new Parcelable.Creator<AppInfo>() {
@Override
- public AppInstallInfo[] newArray(int size) {
- return new AppInstallInfo[size];
+ public AppInfo[] newArray(int size) {
+ return new AppInfo[size];
}
@Override
- public AppInstallInfo createFromParcel(@NonNull android.os.Parcel in) {
- return new AppInstallInfo(in);
+ public AppInfo createFromParcel(@NonNull android.os.Parcel in) {
+ return new AppInfo(in);
}
};
/**
- * A builder for {@link AppInstallInfo}
+ * A builder for {@link AppInfo}
*/
@SuppressWarnings("WeakerAccess")
@DataClass.Generated.Member
@@ -164,14 +164,14 @@
}
/** Builds the instance. This builder should not be touched after calling this! */
- public @NonNull AppInstallInfo build() {
+ public @NonNull AppInfo build() {
checkNotUsed();
mBuilderFieldsSet |= 0x2; // Mark builder used
if ((mBuilderFieldsSet & 0x1) == 0) {
mInstalled = false;
}
- AppInstallInfo o = new AppInstallInfo(
+ AppInfo o = new AppInfo(
mInstalled);
return o;
}
@@ -185,10 +185,10 @@
}
@DataClass.Generated(
- time = 1693265003084L,
+ time = 1694022624774L,
codegenVersion = "1.0.23",
- sourceFile = "packages/modules/OnDevicePersonalization/framework/java/android/adservices/ondevicepersonalization/AppInstallInfo.java",
- inputSignatures = " @android.annotation.NonNull boolean mInstalled\nclass AppInstallInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.ondevicepersonalization.internal.util.DataClass(genBuilder=true, genEqualsHashCode=true)")
+ sourceFile = "packages/modules/OnDevicePersonalization/framework/java/android/adservices/ondevicepersonalization/AppInfo.java",
+ inputSignatures = " @android.annotation.NonNull boolean mInstalled\nclass AppInfo extends java.lang.Object implements [android.os.Parcelable]\n@com.android.ondevicepersonalization.internal.util.DataClass(genBuilder=true, genEqualsHashCode=true)")
@Deprecated
private void __metadata() {}
diff --git a/framework/java/android/adservices/ondevicepersonalization/UserData.java b/framework/java/android/adservices/ondevicepersonalization/UserData.java
index eeb8cd5..6475da8 100644
--- a/framework/java/android/adservices/ondevicepersonalization/UserData.java
+++ b/framework/java/android/adservices/ondevicepersonalization/UserData.java
@@ -82,8 +82,8 @@
/** Whether the network is metered. False - not metered. True - metered. @hide */
boolean mNetworkMetered = false;
- /** The history of installed/uninstalled packages. */
- @NonNull Map<String, AppInstallInfo> mAppInstallInfo = Collections.emptyMap();
+ /** Information about installed and uninstalled apps. */
+ @NonNull Map<String, AppInfo> mAppInfo = Collections.emptyMap();
/** The app usage history in the last 30 days, sorted by total time spent. @hide */
@NonNull List<AppUsageStatus> mAppUsageHistory = Collections.emptyList();
@@ -155,7 +155,7 @@
@ConnectionType int connectionType,
@IntRange(from = 0) long networkConnectionSpeedKbps,
boolean networkMetered,
- @NonNull Map<String,AppInstallInfo> appInstallInfo,
+ @NonNull Map<String,AppInfo> appInfo,
@NonNull List<AppUsageStatus> appUsageHistory,
@NonNull Location currentLocation,
@NonNull List<LocationStatus> locationHistory) {
@@ -198,9 +198,9 @@
IntRange.class, null, mNetworkConnectionSpeedKbps,
"from", 0);
this.mNetworkMetered = networkMetered;
- this.mAppInstallInfo = appInstallInfo;
+ this.mAppInfo = appInfo;
AnnotationValidations.validate(
- NonNull.class, null, mAppInstallInfo);
+ NonNull.class, null, mAppInfo);
this.mAppUsageHistory = appUsageHistory;
AnnotationValidations.validate(
NonNull.class, null, mAppUsageHistory);
@@ -281,11 +281,11 @@
}
/**
- * The history of installed/uninstalled packages.
+ * Information about installed and uninstalled apps.
*/
@DataClass.Generated.Member
- public @NonNull Map<String,AppInstallInfo> getAppInstallInfo() {
- return mAppInstallInfo;
+ public @NonNull Map<String,AppInfo> getAppInfo() {
+ return mAppInfo;
}
/**
@@ -333,7 +333,7 @@
&& mConnectionType == that.mConnectionType
&& mNetworkConnectionSpeedKbps == that.mNetworkConnectionSpeedKbps
&& mNetworkMetered == that.mNetworkMetered
- && java.util.Objects.equals(mAppInstallInfo, that.mAppInstallInfo)
+ && java.util.Objects.equals(mAppInfo, that.mAppInfo)
&& java.util.Objects.equals(mAppUsageHistory, that.mAppUsageHistory)
&& java.util.Objects.equals(mCurrentLocation, that.mCurrentLocation)
&& java.util.Objects.equals(mLocationHistory, that.mLocationHistory);
@@ -354,7 +354,7 @@
_hash = 31 * _hash + mConnectionType;
_hash = 31 * _hash + Long.hashCode(mNetworkConnectionSpeedKbps);
_hash = 31 * _hash + Boolean.hashCode(mNetworkMetered);
- _hash = 31 * _hash + java.util.Objects.hashCode(mAppInstallInfo);
+ _hash = 31 * _hash + java.util.Objects.hashCode(mAppInfo);
_hash = 31 * _hash + java.util.Objects.hashCode(mAppUsageHistory);
_hash = 31 * _hash + java.util.Objects.hashCode(mCurrentLocation);
_hash = 31 * _hash + java.util.Objects.hashCode(mLocationHistory);
@@ -377,7 +377,7 @@
dest.writeString(mCarrier);
dest.writeInt(mConnectionType);
dest.writeLong(mNetworkConnectionSpeedKbps);
- dest.writeMap(mAppInstallInfo);
+ dest.writeMap(mAppInfo);
dest.writeParcelableList(mAppUsageHistory, flags);
dest.writeTypedObject(mCurrentLocation, flags);
dest.writeParcelableList(mLocationHistory, flags);
@@ -403,8 +403,8 @@
String carrier = in.readString();
int connectionType = in.readInt();
long networkConnectionSpeedKbps = in.readLong();
- Map<String,AppInstallInfo> appInstallInfo = new java.util.LinkedHashMap<>();
- in.readMap(appInstallInfo, AppInstallInfo.class.getClassLoader());
+ Map<String,AppInfo> appInfo = new java.util.LinkedHashMap<>();
+ in.readMap(appInfo, AppInfo.class.getClassLoader());
List<AppUsageStatus> appUsageHistory = new java.util.ArrayList<>();
in.readParcelableList(appUsageHistory, AppUsageStatus.class.getClassLoader());
Location currentLocation = (Location) in.readTypedObject(Location.CREATOR);
@@ -450,9 +450,9 @@
IntRange.class, null, mNetworkConnectionSpeedKbps,
"from", 0);
this.mNetworkMetered = networkMetered;
- this.mAppInstallInfo = appInstallInfo;
+ this.mAppInfo = appInfo;
AnnotationValidations.validate(
- NonNull.class, null, mAppInstallInfo);
+ NonNull.class, null, mAppInfo);
this.mAppUsageHistory = appUsageHistory;
AnnotationValidations.validate(
NonNull.class, null, mAppUsageHistory);
@@ -495,7 +495,7 @@
private @ConnectionType int mConnectionType;
private @IntRange(from = 0) long mNetworkConnectionSpeedKbps;
private boolean mNetworkMetered;
- private @NonNull Map<String,AppInstallInfo> mAppInstallInfo;
+ private @NonNull Map<String,AppInfo> mAppInfo;
private @NonNull List<AppUsageStatus> mAppUsageHistory;
private @NonNull Location mCurrentLocation;
private @NonNull List<LocationStatus> mLocationHistory;
@@ -596,13 +596,13 @@
}
/**
- * The history of installed/uninstalled packages.
+ * Information about installed and uninstalled apps.
*/
@DataClass.Generated.Member
- public @NonNull Builder setAppInstallInfo(@NonNull Map<String,AppInstallInfo> value) {
+ public @NonNull Builder setAppInfo(@NonNull Map<String,AppInfo> value) {
checkNotUsed();
mBuilderFieldsSet |= 0x100;
- mAppInstallInfo = value;
+ mAppInfo = value;
return this;
}
@@ -669,7 +669,7 @@
mNetworkMetered = false;
}
if ((mBuilderFieldsSet & 0x100) == 0) {
- mAppInstallInfo = Collections.emptyMap();
+ mAppInfo = Collections.emptyMap();
}
if ((mBuilderFieldsSet & 0x200) == 0) {
mAppUsageHistory = Collections.emptyList();
@@ -689,7 +689,7 @@
mConnectionType,
mNetworkConnectionSpeedKbps,
mNetworkMetered,
- mAppInstallInfo,
+ mAppInfo,
mAppUsageHistory,
mCurrentLocation,
mLocationHistory);
@@ -705,10 +705,10 @@
}
@DataClass.Generated(
- time = 1693528589621L,
+ time = 1694023783291L,
codegenVersion = "1.0.23",
sourceFile = "packages/modules/OnDevicePersonalization/framework/java/android/adservices/ondevicepersonalization/UserData.java",
- inputSignatures = " int mTimezoneUtcOffsetMins\n int mOrientation\n @android.annotation.IntRange long mAvailableStorageBytes\n @android.annotation.IntRange int mBatteryPercentage\n @android.annotation.NonNull java.lang.String mCarrier\npublic static final int CONNECTION_TYPE_UNKNOWN\npublic static final int CONNECTION_TYPE_ETHERNET\npublic static final int CONNECTION_TYPE_WIFI\npublic static final int CONNECTION_TYPE_CELLULAR_2G\npublic static final int CONNECTION_TYPE_CELLULAR_3G\npublic static final int CONNECTION_TYPE_CELLULAR_4G\npublic static final int CONNECTION_TYPE_CELLULAR_5G\n @android.adservices.ondevicepersonalization.UserData.ConnectionType int mConnectionType\n @android.annotation.IntRange long mNetworkConnectionSpeedKbps\n boolean mNetworkMetered\n @android.annotation.NonNull java.util.Map<java.lang.String,android.adservices.ondevicepersonalization.AppInstallInfo> mAppInstallInfo\n @android.annotation.NonNull java.util.List<android.adservices.ondevicepersonalization.AppUsageStatus> mAppUsageHistory\n @android.annotation.NonNull android.adservices.ondevicepersonalization.Location mCurrentLocation\n @android.annotation.NonNull java.util.List<android.adservices.ondevicepersonalization.LocationStatus> mLocationHistory\nclass UserData extends java.lang.Object implements [android.os.Parcelable]\n@com.android.ondevicepersonalization.internal.util.DataClass(genBuilder=true, genEqualsHashCode=true)")
+ inputSignatures = " int mTimezoneUtcOffsetMins\n int mOrientation\n @android.annotation.IntRange long mAvailableStorageBytes\n @android.annotation.IntRange int mBatteryPercentage\n @android.annotation.NonNull java.lang.String mCarrier\npublic static final int CONNECTION_TYPE_UNKNOWN\npublic static final int CONNECTION_TYPE_ETHERNET\npublic static final int CONNECTION_TYPE_WIFI\npublic static final int CONNECTION_TYPE_CELLULAR_2G\npublic static final int CONNECTION_TYPE_CELLULAR_3G\npublic static final int CONNECTION_TYPE_CELLULAR_4G\npublic static final int CONNECTION_TYPE_CELLULAR_5G\n @android.adservices.ondevicepersonalization.UserData.ConnectionType int mConnectionType\n @android.annotation.IntRange long mNetworkConnectionSpeedKbps\n boolean mNetworkMetered\n @android.annotation.NonNull java.util.Map<java.lang.String,android.adservices.ondevicepersonalization.AppInfo> mAppInfo\n @android.annotation.NonNull java.util.List<android.adservices.ondevicepersonalization.AppUsageStatus> mAppUsageHistory\n @android.annotation.NonNull android.adservices.ondevicepersonalization.Location mCurrentLocation\n @android.annotation.NonNull java.util.List<android.adservices.ondevicepersonalization.LocationStatus> mLocationHistory\nclass UserData extends java.lang.Object implements [android.os.Parcelable]\n@com.android.ondevicepersonalization.internal.util.DataClass(genBuilder=true, genEqualsHashCode=true)")
@Deprecated
private void __metadata() {}
diff --git a/src/com/android/ondevicepersonalization/services/policyengine/data/GeneratedDTD.kt b/src/com/android/ondevicepersonalization/services/policyengine/data/GeneratedDTD.kt
index b29080d..940513b 100644
--- a/src/com/android/ondevicepersonalization/services/policyengine/data/GeneratedDTD.kt
+++ b/src/com/android/ondevicepersonalization/services/policyengine/data/GeneratedDTD.kt
@@ -32,8 +32,8 @@
"connectionType" to FieldType.Integer
"connectionSpeedKbps" to FieldType.Long
"networkMetered" to FieldType.Boolean
- "appInstallInfo" to FieldType.List(dataTypeDescriptor(name =
- "chronicle_dtd.AppInstallInfo", cls = AppInstallInfo::class) {
+ "appInfo" to FieldType.List(dataTypeDescriptor(name =
+ "chronicle_dtd.AppInfo", cls = AppInfo::class) {
"packageName" to FieldType.String
"installed" to FieldType.Boolean
})
diff --git a/src/com/android/ondevicepersonalization/services/policyengine/data/UserData.kt b/src/com/android/ondevicepersonalization/services/policyengine/data/UserData.kt
index 1dcf526..ac966fd 100644
--- a/src/com/android/ondevicepersonalization/services/policyengine/data/UserData.kt
+++ b/src/com/android/ondevicepersonalization/services/policyengine/data/UserData.kt
@@ -35,13 +35,13 @@
val connectionType: Int,
val connectionSpeedKbps: Long,
val networkMetered: Boolean,
- val appInstallInfo: List<AppInstallInfo>,
+ val appInstallInfo: List<AppInfo>,
val appUsageHistory: List<AppUsageStatus>,
val currentLocation: Location,
val locationHistory: List<LocationStatus>,
)
-data class AppInstallInfo (
+data class AppInfo (
val packageName: String,
val installed: Boolean
)
diff --git a/src/com/android/ondevicepersonalization/services/policyengine/data/impl/UserDataConnectionProvider.kt b/src/com/android/ondevicepersonalization/services/policyengine/data/impl/UserDataConnectionProvider.kt
index 01e2129..4e192f2 100644
--- a/src/com/android/ondevicepersonalization/services/policyengine/data/impl/UserDataConnectionProvider.kt
+++ b/src/com/android/ondevicepersonalization/services/policyengine/data/impl/UserDataConnectionProvider.kt
@@ -20,7 +20,7 @@
import android.adservices.ondevicepersonalization.OSVersion
import android.adservices.ondevicepersonalization.DeviceMetrics
import android.adservices.ondevicepersonalization.Location
-import android.adservices.ondevicepersonalization.AppInstallInfo
+import android.adservices.ondevicepersonalization.AppInfo
import android.adservices.ondevicepersonalization.AppUsageStatus
import android.adservices.ondevicepersonalization.LocationStatus
import android.util.ArrayMap
@@ -81,17 +81,17 @@
.setLocationProvider(rawUserData.currentLocation.provider.ordinal)
.setPreciseLocation(rawUserData.currentLocation.isPreciseLocation)
.build())
- .setAppInstallInfo(getAppInstallInfo(rawUserData))
+ .setAppInfo(getAppInfo(rawUserData))
.setAppUsageHistory(getAppUsageHistory(rawUserData))
.setLocationHistory(getLocationHistory(rawUserData))
.build()
}
- private fun getAppInstallInfo(rawUserData: RawUserData): Map<String, AppInstallInfo> {
- var res = ArrayMap<String, AppInstallInfo>()
+ private fun getAppInfo(rawUserData: RawUserData): Map<String, AppInfo> {
+ var res = ArrayMap<String, AppInfo>()
for (appInfo in rawUserData.appsInfo) {
res.put(appInfo.packageName,
- AppInstallInfo.Builder()
+ AppInfo.Builder()
.setInstalled(appInfo.installed)
.build())
}
diff --git a/src/com/android/ondevicepersonalization/services/policyengine/policy/DataIngressPolicy.kt b/src/com/android/ondevicepersonalization/services/policyengine/policy/DataIngressPolicy.kt
index 3a9fb86..106ef0f 100644
--- a/src/com/android/ondevicepersonalization/services/policyengine/policy/DataIngressPolicy.kt
+++ b/src/com/android/ondevicepersonalization/services/policyengine/policy/DataIngressPolicy.kt
@@ -52,7 +52,7 @@
"connectionType" {rawUsage(UsageType.ANY)}
"connectionSpeedKbps" {rawUsage(UsageType.ANY)}
"networkMetered" {rawUsage(UsageType.ANY)}
- "appInstallInfo" {
+ "appInfo" {
"packageName" {rawUsage(UsageType.ANY)}
"installed" {rawUsage(UsageType.ANY)}
}
diff --git a/tests/endtoendtests/OdpSampleNetwork/src/com/example/odpsamplenetwork/SampleHandler.java b/tests/endtoendtests/OdpSampleNetwork/src/com/example/odpsamplenetwork/SampleHandler.java
index 6aac011..d48e739 100644
--- a/tests/endtoendtests/OdpSampleNetwork/src/com/example/odpsamplenetwork/SampleHandler.java
+++ b/tests/endtoendtests/OdpSampleNetwork/src/com/example/odpsamplenetwork/SampleHandler.java
@@ -16,7 +16,7 @@
package com.example.odpsamplenetwork;
-import android.adservices.ondevicepersonalization.AppInstallInfo;
+import android.adservices.ondevicepersonalization.AppInfo;
import android.adservices.ondevicepersonalization.DownloadInput;
import android.adservices.ondevicepersonalization.DownloadOutput;
import android.adservices.ondevicepersonalization.EventLogRecord;
@@ -412,8 +412,7 @@
return false;
}
- if (mUserData.getAppInstallInfo() == null
- || mUserData.getAppInstallInfo().isEmpty()) {
+ if (mUserData.getAppInfo() == null || mUserData.getAppInfo().isEmpty()) {
Log.i(TAG, "No installed apps.");
return false;
}
@@ -422,8 +421,8 @@
return false;
}
- for (String app: mUserData.getAppInstallInfo().keySet()) {
- AppInstallInfo value = mUserData.getAppInstallInfo().get(app);
+ for (String app: mUserData.getAppInfo().keySet()) {
+ AppInfo value = mUserData.getAppInfo().get(app);
if (value != null && value.isInstalled() && filter.contains(app)) {
return true;
}
@@ -438,8 +437,7 @@
return false;
}
- if (mUserData.getAppInstallInfo() == null
- || mUserData.getAppInstallInfo().isEmpty()) {
+ if (mUserData.getAppInfo() == null || mUserData.getAppInfo().isEmpty()) {
Log.i(TAG, "No installed apps.");
return false;
}
@@ -448,7 +446,7 @@
return false;
}
- for (String app: mUserData.getAppInstallInfo().keySet()) {
+ for (String app: mUserData.getAppInfo().keySet()) {
if (apps.contains(app)) {
return true;
}
diff --git a/tests/servicetests/src/com/android/ondevicepersonalization/services/policyengine/UserDataReaderTest.kt b/tests/servicetests/src/com/android/ondevicepersonalization/services/policyengine/UserDataReaderTest.kt
index 217621b..a7c1bcc 100644
--- a/tests/servicetests/src/com/android/ondevicepersonalization/services/policyengine/UserDataReaderTest.kt
+++ b/tests/servicetests/src/com/android/ondevicepersonalization/services/policyengine/UserDataReaderTest.kt
@@ -26,7 +26,7 @@
import android.util.Log
-import android.adservices.ondevicepersonalization.AppInstallInfo
+import android.adservices.ondevicepersonalization.AppInfo
import android.adservices.ondevicepersonalization.AppUsageStatus
import android.adservices.ondevicepersonalization.DeviceMetrics
import android.adservices.ondevicepersonalization.OSVersion
@@ -143,13 +143,13 @@
@Test
fun testAppInstallInfo() {
- var appInstallStatus1 = AppInstallInfo.Builder()
+ var appInstallStatus1 = AppInfo.Builder()
.setInstalled(true)
.build()
var parcel = Parcel.obtain()
appInstallStatus1.writeToParcel(parcel, 0)
parcel.setDataPosition(0);
- var appInstallStatus2 = AppInstallInfo.CREATOR.createFromParcel(parcel)
+ var appInstallStatus2 = AppInfo.CREATOR.createFromParcel(parcel)
assertThat(appInstallStatus1).isEqualTo(appInstallStatus2)
assertThat(appInstallStatus1.hashCode()).isEqualTo(appInstallStatus2.hashCode())
assertThat(appInstallStatus1.describeContents()).isEqualTo(0)
@@ -242,7 +242,7 @@
@Test
fun testUserData() {
- val appInstalledHistory: Map<String, AppInstallInfo> = mapOf<String, AppInstallInfo>();
+ val appInstalledHistory: Map<String, AppInfo> = mapOf<String, AppInfo>();
val appUsageHistory: List<AppUsageStatus> = listOf();
var location = Location.Builder()
.setTimestampSeconds(111111)
@@ -261,7 +261,7 @@
.setConnectionType(2)
.setNetworkConnectionSpeedKbps(666)
.setNetworkMetered(true)
- .setAppInstallInfo(appInstalledHistory)
+ .setAppInfo(appInstalledHistory)
.setAppUsageHistory(appUsageHistory)
.setCurrentLocation(location)
.setLocationHistory(locationHistory)
@@ -294,7 +294,7 @@
assertThat(currentLocation.getLocationProvider()).isEqualTo(rawUserData.currentLocation.provider.ordinal)
assertThat(currentLocation.isPreciseLocation()).isEqualTo(rawUserData.currentLocation.isPreciseLocation)
- assertThat(userData.getAppInstallInfo().size).isEqualTo(rawUserData.appsInfo.size)
+ assertThat(userData.getAppInfo().size).isEqualTo(rawUserData.appsInfo.size)
assertThat(userData.getAppUsageHistory().size).isEqualTo(rawUserData.appUsageHistory.size)
assertThat(userData.getLocationHistory().size).isEqualTo(rawUserData.locationHistory.size)
}
