commit 48294e3d86a89d32f6372b3f0c3f5dfcca4e018a
author Zhomart Mukhamejanov <zhomart@google.com> Thu May 10 14:56:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 10 14:56:56 2018 -0700
tree 51fe2e69094925fe64814351bc654d59fb124e91
parent 319e1912381f8cd4c1257b7c8c869639bcdbe4a4
parent 7217e7045de6d86fdeb0230f354a9fb7ff6884df

Merge "updater_sample: fix UpdateConfig"
am: 7217e7045d

Change-Id: I63af09b000961e79613798c818eeea626eb221b6

updater_sample/res/raw/sample.json

diff --git a/updater_sample/res/raw/sample.json b/updater_sample/res/raw/sample.json
index 7ac8ffa..46fbfa3 100644
--- a/updater_sample/res/raw/sample.json
+++ b/updater_sample/res/raw/sample.json
@@ -1,7 +1,7 @@
 {
     "__name": "name will be visible on UI",
     "__url": "https:// or file:// uri to update package (zip, xz, ...)",
-    "__type": "NON_STREAMING (from a local file) OR STREAMING (on the fly)",
+    "__ab_install_type": "NON_STREAMING (from a local file) OR STREAMING (on the fly)",
     "name": "SAMPLE-cake-release BUILD-12345",
     "url": "http://foo.bar/builds/ota-001.zip",
     "ab_install_type": "NON_STREAMING",

updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java

diff --git a/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java b/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java
index b08bfd0..9bdd8b9 100644
--- a/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java
+++ b/updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java
@@ -79,9 +79,13 @@
                         p.getLong("offset"),
                         p.getLong("size"));
             }
+            String authorization = null;
+            if (meta.has("authorization")) {
+                authorization = meta.getString("authorization");
+            }
             c.mAbStreamingMetadata = new StreamingMetadata(
                     propertyFiles,
-                    meta.getString("authorization_token"));
+                    authorization);
         }
         c.mRawJson = json;
         return c;
@@ -196,7 +200,7 @@
         }
 
         public Optional<String> getAuthorization() {
-            return Optional.of(mAuthorization);
+            return mAuthorization == null ? Optional.empty() : Optional.of(mAuthorization);
         }
     }
 

updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java

diff --git a/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java b/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java
index 009610e..a136ff0 100644
--- a/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java
+++ b/updater_sample/tests/src/com/example/android/systemupdatersample/util/FileDownloaderTest.java
@@ -16,7 +16,7 @@
 
 package com.example.android.systemupdatersample.util;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;