From bd784e961c560a2069e2df75fb17282013c198d2 Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Wed, 27 Apr 2016 15:50:16 -0700 Subject: [PATCH] Some cleanup for change. Addresses comments made in: https://googleplex-android-review.git.corp.google.com/#/c/976512 Bug: 26880306 Change-Id: I382fb39f3bb5de5a03506f5526d909cf55530542 --- .../core/java/com/android/server/pm/OtaDexoptService.java | 2 -- .../java/com/android/server/pm/PackageManagerService.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/OtaDexoptService.java b/services/core/java/com/android/server/pm/OtaDexoptService.java index 50b86708c14a8..649a27cb7cd68 100644 --- a/services/core/java/com/android/server/pm/OtaDexoptService.java +++ b/services/core/java/com/android/server/pm/OtaDexoptService.java @@ -22,9 +22,7 @@ import static com.android.server.pm.InstructionSets.getDexCodeInstructionSets; import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.content.pm.IOtaDexopt; -import android.content.pm.PackageManager; import android.content.pm.PackageParser; import android.os.Environment; import android.os.RemoteException; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 4b0eeedbe1255..77017dae0904a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -498,8 +498,8 @@ public class PackageManagerService extends IPackageManager.Stub { public static final int REASON_LAST = REASON_FORCED_DEXOPT; - // Special String to skip shared libraries check during compilation. - private static final String SPECIAL_SHARED_LIBRARY = "&"; + /** Special library name that skips shared libraries check during compilation. */ + private static final String SKIP_SHARED_LIBRARY_CHECK = "&"; final ServiceThread mHandlerThread; @@ -2336,7 +2336,7 @@ public class PackageManagerService extends IPackageManager.Stub { dexoptNeeded, DEXOPT_PUBLIC /*dexFlags*/, getCompilerFilterForReason(REASON_SHARED_APK), StorageManager.UUID_PRIVATE_INTERNAL, - SPECIAL_SHARED_LIBRARY); + SKIP_SHARED_LIBRARY_CHECK); } } catch (FileNotFoundException e) { Slog.w(TAG, "Library not found: " + lib);