From c85ef14c199d668470ea2983d2e3323a0df3efd8 Mon Sep 17 00:00:00 2001 From: Stanislav Baranov Date: Wed, 19 Dec 2018 10:31:54 -0800 Subject: [PATCH] Update dynamic patching terminilogy to match that of the flutter tool (flutter/engine#7248) --- .../io/flutter/view/ResourceExtractor.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/engine/src/flutter/shell/platform/android/io/flutter/view/ResourceExtractor.java b/engine/src/flutter/shell/platform/android/io/flutter/view/ResourceExtractor.java index 25b98bdb42..a5fd6dd102 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/view/ResourceExtractor.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/view/ResourceExtractor.java @@ -205,22 +205,22 @@ class ResourceExtractor { TIMESTAMP_PREFIX + packageInfo.versionCode + "-" + packageInfo.lastUpdateTime; if (updateManifest != null) { - String baselineVersion = updateManifest.optString("baselineVersion", null); - if (baselineVersion == null) { - Log.w(TAG, "Invalid update manifest: baselineVersion"); + String buildNumber = updateManifest.optString("buildNumber", null); + if (buildNumber == null) { + Log.w(TAG, "Invalid update manifest: buildNumber"); } - String updateVersion = updateManifest.optString("updateVersion", null); - if (updateVersion == null) { - Log.w(TAG, "Invalid update manifest: updateVersion"); + String patchNumber = updateManifest.optString("patchNumber", null); + if (patchNumber == null) { + Log.w(TAG, "Invalid update manifest: patchNumber"); } - if (baselineVersion != null && updateVersion != null) { - if (!baselineVersion.equals(Integer.toString(packageInfo.versionCode))) { + if (buildNumber != null && patchNumber != null) { + if (!buildNumber.equals(Integer.toString(packageInfo.versionCode))) { Log.w(TAG, "Outdated update file for " + packageInfo.versionCode); } else { final File updateFile = new File(FlutterMain.getUpdateInstallationPath()); - expectedTimestamp += "-" + updateVersion + "-" + updateFile.lastModified(); + expectedTimestamp += "-" + patchNumber + "-" + updateFile.lastModified(); } } }