tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "updater_sample: fix UpdateConfig"

Browse source 
am: 7217e7045d

Change-Id: I63af09b000961e79613798c818eeea626eb221b6
This commit is contained in:
Zhomart Mukhamejanov 2018-05-10 14:56:56 -07:00 committed by android-build-merger
commit 48294e3d86
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
updater_sample/res/raw/sample.json
View file

@ -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",

8
updater_sample/src/com/example/android/systemupdatersample/UpdateConfig.java
View file

@ -79,9 +79,13 @@ public class UpdateConfig implements Parcelable {
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 class UpdateConfig implements Parcelable {
}
public Optional<String> getAuthorization() {
return Optional.of(mAuthorization);
return mAuthorization == null ? Optional.empty() : Optional.of(mAuthorization);
}
}

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

@ -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;