summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-11-12 13:30:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-12 13:30:18 +0000
commitccfe6bd479acc41e018bd38c4021614dc9326fbf (patch)
treebf4f5006a6d4c4d18fe4763152710eae7f6ff418
parent222722ee73c38dea5544118df6bd349e630d1c26 (diff)
parentfe46f4d90835671c7ddeebb6def1b7198ac41743 (diff)
downloadframeworks_base-ccfe6bd479acc41e018bd38c4021614dc9326fbf.zip
frameworks_base-ccfe6bd479acc41e018bd38c4021614dc9326fbf.tar.gz
frameworks_base-ccfe6bd479acc41e018bd38c4021614dc9326fbf.tar.bz2
Merge "Remove unused local field." into lmp-mr1-dev
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index a559bdd..25c31c1 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1423,8 +1423,6 @@ public class PackageManagerService extends IPackageManager.Stub {
Slog.w(TAG, "No SYSTEMSERVERCLASSPATH found!");
}
- boolean didDexOptLibraryOrTool = false;
-
final List<String> allInstructionSets = getAllInstructionSets();
final String[] dexCodeInstructionSets =
getDexCodeInstructionSets(allInstructionSets.toArray(new String[allInstructionSets.size()]));
@@ -1457,7 +1455,6 @@ public class PackageManagerService extends IPackageManager.Stub {
} else {
mInstaller.patchoat(lib, Process.SYSTEM_UID, true, dexCodeInstructionSet);
}
- didDexOptLibraryOrTool = true;
}
} catch (FileNotFoundException e) {
Slog.w(TAG, "Library not found: " + lib);
@@ -1508,10 +1505,8 @@ public class PackageManagerService extends IPackageManager.Stub {
false);
if (dexoptRequired == DexFile.DEXOPT_NEEDED) {
mInstaller.dexopt(path, Process.SYSTEM_UID, true, dexCodeInstructionSet);
- didDexOptLibraryOrTool = true;
} else if (dexoptRequired == DexFile.PATCHOAT_NEEDED) {
mInstaller.patchoat(path, Process.SYSTEM_UID, true, dexCodeInstructionSet);
- didDexOptLibraryOrTool = true;
}
} catch (FileNotFoundException e) {
Slog.w(TAG, "Jar not found: " + path);