Merge "Add system property to allow testing OTA with the same build image"

2017-10-10 22:51:47 +00:00
parent a30e82213b a27be6072e
commit f73f9ed570
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3365,7 +3365,9 @@ public class PackageManagerService extends IPackageManager.Stub
    @Override
    public boolean isUpgrade() {
        // allow instant applications
-        return mIsUpgrade;
+        // The system property allows testing ota flow when upgraded to the same image.
+        return mIsUpgrade || SystemProperties.getBoolean(
+                "persist.pm.mock-upgrade", false /* default */);
    }

    private @Nullable String getRequiredButNotReallyRequiredVerifierLPr() {