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

am c83443b4: am ccfe6bd4: Merge "Remove unused local field." into lmp-mr1-dev

Browse Source 
* commit 'c83443b43ab13b4e9797d4ffa47529a0eb01076f':
  Remove unused local field.
This commit is contained in:
Narayan Kamath
2014-11-12 13:38:40 +00:00
committed by Android Git Automerger
parent 3a35bf3f9c c83443b43a
commit d57eefa4dd
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1423,8 +1423,6 @@ public class PackageManagerService extends IPackageManager.Stub {
Slog.w(TAG, "No SYSTEMSERVERCLASSPATH found!"); Slog.w(TAG, "No SYSTEMSERVERCLASSPATH found!");
} }
boolean didDexOptLibraryOrTool = false;
final List<String> allInstructionSets = getAllInstructionSets(); final List<String> allInstructionSets = getAllInstructionSets();
final String[] dexCodeInstructionSets = final String[] dexCodeInstructionSets =
getDexCodeInstructionSets(allInstructionSets.toArray(new String[allInstructionSets.size()])); getDexCodeInstructionSets(allInstructionSets.toArray(new String[allInstructionSets.size()]));
@@ -1457,7 +1455,6 @@ public class PackageManagerService extends IPackageManager.Stub {
} else { } else {
mInstaller.patchoat(lib, Process.SYSTEM_UID, true, dexCodeInstructionSet); mInstaller.patchoat(lib, Process.SYSTEM_UID, true, dexCodeInstructionSet);
} }
didDexOptLibraryOrTool = true;
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Slog.w(TAG, "Library not found: " + lib); Slog.w(TAG, "Library not found: " + lib);
@@ -1508,10 +1505,8 @@ public class PackageManagerService extends IPackageManager.Stub {
false); false);
if (dexoptRequired == DexFile.DEXOPT_NEEDED) { if (dexoptRequired == DexFile.DEXOPT_NEEDED) {
mInstaller.dexopt(path, Process.SYSTEM_UID, true, dexCodeInstructionSet); mInstaller.dexopt(path, Process.SYSTEM_UID, true, dexCodeInstructionSet);
didDexOptLibraryOrTool = true;
} else if (dexoptRequired == DexFile.PATCHOAT_NEEDED) { } else if (dexoptRequired == DexFile.PATCHOAT_NEEDED) {
mInstaller.patchoat(path, Process.SYSTEM_UID, true, dexCodeInstructionSet); mInstaller.patchoat(path, Process.SYSTEM_UID, true, dexCodeInstructionSet);
didDexOptLibraryOrTool = true;
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
Slog.w(TAG, "Jar not found: " + path); Slog.w(TAG, "Jar not found: " + path);