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

am: 723c206d52 Change-Id: I504af51812b37aac2d4498032fb526abd985ce04
2019-05-29 14:56:08 -07:00
parent ec7c76de1d 723c206d52
commit 1b9f14008f
1 changed files with 3 additions and 3 deletions
--- 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;
    }