commit 723c206d520b1af74ab5b3a70ffcb890d7f89489
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 29 21:47:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 29 21:47:42 2019 +0000
tree be45f7492ec891e2ce86a87ccf492910bf3a869f
parent 0fbcf57edf839d49da342e8851e98763e0d8efe8
parent dcf19166c3d4102fcc4c1cd5c9b86b140e08fb72

Merge "Applies INSTALL_REPLACE_EXISTING outside of while loop" into qt-dev

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index f5c8049..81de8e26 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 @@
                 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;
     }