From 13f8161ab657cac53637986da9e453c0c9eff54c Mon Sep 17 00:00:00 2001 From: Gavin Corkery Date: Wed, 20 Mar 2019 18:22:58 +0000 Subject: [PATCH] Make updatedMillis a private field Test: make Bug: 122677682 Change-Id: I54804d589994b01ac358ac5a9d55672ee7339771 --- .../android/server/pm/PackageInstallerService.java | 2 +- .../android/server/pm/PackageInstallerSession.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index ad17549d7448e..59c442f724a7d 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -360,7 +360,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements final long age = System.currentTimeMillis() - session.createdMillis; final long timeSinceUpdate = - System.currentTimeMillis() - session.updatedMillis; + System.currentTimeMillis() - session.getUpdatedMillis(); final boolean valid; if (session.isStaged()) { if (timeSinceUpdate >= MAX_TIME_SINCE_UPDATE_MILLIS diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 66b530f19ed84..e29273b549475 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -202,7 +202,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { /** Timestamp of the last time this session changed state */ @GuardedBy("mLock") - long updatedMillis; + private long updatedMillis; /** Uid of the creator of this session. */ private final int mOriginalInstallerUid; @@ -1740,6 +1740,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } + /** + * @return the timestamp of when this session last changed state + */ + public long getUpdatedMillis() { + synchronized (mLock) { + return updatedMillis; + } + } + String getInstallerPackageName() { synchronized (mLock) { return mInstallerPackageName;