Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23791180

Change-Id: Iba10c6fbe41c605c3e7cd49cfe3ec4126357bf9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Graciela Putri
2023-06-28 08:16:30 +00:00
committed by Automerger Merge Worker
parent b12c187f80 643caf075e
commit fd4f386d85
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageSetting.java
View File

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

24
services/core/java/com/android/server/pm/pkg/PackageUserStateImpl.java
View File

File diff suppressed because one or more lines are too long