Merge "Minor refactor to mark fields with respective annotations." into udc-qpr-dev

This commit is contained in:
Graciela Putri
2023-06-28 07:23:23 +00:00
committed by Android (Google) Code Review
2 changed files with 17 additions and 15 deletions

View File

@@ -337,7 +337,7 @@ public class PackageSetting extends SettingBase implements PackageStateInternal
final long previousFirstInstallTime =
replacedPkgSetting.getUserStateOrDefault(userId).getFirstInstallTimeMillis();
if (previousFirstInstallTime != 0) {
modifyUserState(userId).setFirstInstallTime(previousFirstInstallTime);
modifyUserState(userId).setFirstInstallTimeMillis(previousFirstInstallTime);
}
}
onChanged();
@@ -352,10 +352,10 @@ public class PackageSetting extends SettingBase implements PackageStateInternal
if (userId == UserHandle.USER_ALL) {
int userStateCount = mUserStates.size();
for (int i = 0; i < userStateCount; i++) {
mUserStates.valueAt(i).setFirstInstallTime(firstInstallTime);
mUserStates.valueAt(i).setFirstInstallTimeMillis(firstInstallTime);
}
} else {
modifyUserState(userId).setFirstInstallTime(firstInstallTime);
modifyUserState(userId).setFirstInstallTimeMillis(firstInstallTime);
}
onChanged();
return this;
@@ -894,7 +894,7 @@ public class PackageSetting extends SettingBase implements PackageStateInternal
.setVirtualPreload(virtualPreload)
.setHarmfulAppWarning(harmfulAppWarning)
.setSplashScreenTheme(splashScreenTheme)
.setFirstInstallTime(firstInstallTime);
.setFirstInstallTimeMillis(firstInstallTime);
onChanged();
}

File diff suppressed because one or more lines are too long