summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Patrick Baumann <patb@google.com> 2019-05-29 15:02:48 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-29 15:02:48 -0700
commitc8d5b96579b723348057fea18f77759c22a6d593 (patch)
tree17b4363e3b6ea6486440f6085e1dd5eb23bc9130
parentf353c4ec8f9c259aa88903d5938bcbf3043d1208 (diff)
parent1b9f14008fb6c353931a69f0871e4995f23a567b (diff)
Merge "Applies INSTALL_REPLACE_EXISTING outside of while loop" into qt-dev am: 723c206d52
am: 1b9f14008f Change-Id: Icf6feb47dba277924ea1601883482dc238e41420
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerShellCommand.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index f5c8049dcb25..81de8e263299 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -2496,9 +2496,9 @@ class PackageManagerShellCommand extends ShellCommand {
default:
throw new IllegalArgumentException("Unknown option " + opt);
}
- if (replaceExisting) {
- sessionParams.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;
- }
+ }
+ if (replaceExisting) {
+ sessionParams.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;
}
return params;
}