commit 1ecfcece45c8d5b07a2c6b544fe424adf1a9951e
author Alex Buynytskyy <alexbuy@google.com> Tue Dec 17 12:10:41 2019 -0800
committer Alex Buynytskyy <alexbuy@google.com> Fri Dec 20 06:55:32 2019 -0800
tree 5fcee6cca7aeed5b4863787130949bee0b2026f1
parent 548d6dcf772ecfd14246963e9db96d286b99a8f6

Migrating Incremental* APIs to PackageManager APIs.

Step 2, merging Data Loader params.

Test: builds and flashes
Bug: b/136132412

Change-Id: I2102554316dadcdcb49790c133ece110c43c29b3

core/java/android/os/incremental/IncrementalFileStorages.java

diff --git a/core/java/android/os/incremental/IncrementalFileStorages.java b/core/java/android/os/incremental/IncrementalFileStorages.java
index fb94fc9..2138d553 100644
--- a/core/java/android/os/incremental/IncrementalFileStorages.java
+++ b/core/java/android/os/incremental/IncrementalFileStorages.java
@@ -87,8 +87,8 @@
         mPackageName = packageName;
         mStageDir = stageDir;
         mIncrementalManager = incrementalManager;
-        if (dataLoaderParams.getPackageName().equals("local")) {
-            final String incrementalPath = dataLoaderParams.getStaticArgs();
+        if (dataLoaderParams.getComponentName().getPackageName().equals("local")) {
+            final String incrementalPath = dataLoaderParams.getArguments();
             mDefaultStorage = mIncrementalManager.openStorage(incrementalPath);
             mDefaultDir = incrementalPath;
             return;