From ebd86f6267228ddc44e28a5d57892f162b118a83 Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Thu, 16 Jul 2020 17:06:12 +0800
Subject: [PATCH] Some code cleanup (1/n)

1. make #isLinkPossible a static method which doesn't access members.
2. access members directly when already in the lock.

Bug: 161199857
Test: m
Change-Id: Ice3041861b5b07368f650f09ab5a05db82388fcf
---
 .../server/pm/PackageInstallerSession.java    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index 00cb22e9d4b56..25bce32a63d8a 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -2438,7 +2438,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
      * Determine if creating hard links between source and destination is
      * possible. That is, do they all live on the same underlying device.
      */
-    private boolean isLinkPossible(List<File> fromFiles, File toDir) {
+    private static boolean isLinkPossible(List<File> fromFiles, File toDir) {
         try {
             final StructStat toStat = Os.stat(toDir.getAbsolutePath());
             for (File fromFile : fromFiles) {
@@ -3004,16 +3004,17 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
                 detailMessage).sendToTarget();
     }
 
+    @GuardedBy("mLock")
+    private int[] getChildSessionIdsLocked() {
+        final int[] childSessionIds = mChildSessionIds.copyKeys();
+        return childSessionIds != null ? childSessionIds : EMPTY_CHILD_SESSION_ARRAY;
+    }
+
     @Override
     public int[] getChildSessionIds() {
-        final int[] childSessionIds;
         synchronized (mLock) {
-            childSessionIds = mChildSessionIds.copyKeys();
+            return getChildSessionIdsLocked();
         }
-        if (childSessionIds != null) {
-            return childSessionIds;
-        }
-        return EMPTY_CHILD_SESSION_ARRAY;
     }
 
     private boolean canBeAddedAsChild(int parentCandidate) {
@@ -3470,10 +3471,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
             if (stageCid != null) {
                 writeStringAttribute(out, ATTR_SESSION_STAGE_CID, stageCid);
             }
-            writeBooleanAttribute(out, ATTR_PREPARED, isPrepared());
-            writeBooleanAttribute(out, ATTR_COMMITTED, isCommitted());
-            writeBooleanAttribute(out, ATTR_DESTROYED, isDestroyed());
-            writeBooleanAttribute(out, ATTR_SEALED, isSealed());
+            writeBooleanAttribute(out, ATTR_PREPARED, mPrepared);
+            writeBooleanAttribute(out, ATTR_COMMITTED, mCommitted);
+            writeBooleanAttribute(out, ATTR_DESTROYED, mDestroyed);
+            writeBooleanAttribute(out, ATTR_SEALED, mSealed);
 
             writeBooleanAttribute(out, ATTR_MULTI_PACKAGE, params.isMultiPackage);
             writeBooleanAttribute(out, ATTR_STAGED_SESSION, params.isStaged);
@@ -3535,7 +3536,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
 
                 params.appIconLastModified = appIconFile.lastModified();
             }
-            final int[] childSessionIds = getChildSessionIds();
+            final int[] childSessionIds = getChildSessionIdsLocked();
             for (int childSessionId : childSessionIds) {
                 out.startTag(null, TAG_CHILD_SESSION);
                 writeIntAttribute(out, ATTR_SESSION_ID, childSessionId);
@@ -3543,7 +3544,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
             }
 
             final InstallationFile[] files = getInstallationFilesLocked();
-            for (InstallationFile file : getInstallationFilesLocked()) {
+            for (InstallationFile file : files) {
                 out.startTag(null, TAG_SESSION_FILE);
                 writeIntAttribute(out, ATTR_LOCATION, file.getLocation());
                 writeStringAttribute(out, ATTR_NAME, file.getName());