Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I2ddfef0c,I49bee0c9 am: ca046e898b am: a6109ea3a0

Browse Source 
am: 39f2eb4abd

Change-Id: I369bf5d92a3f70e789043d33bcbc85099aebbb69
This commit is contained in:
Chalard Jean
2019-01-21 11:28:55 -08:00
committed by android-build-merger
parent 96892aae33 39f2eb4abd
commit 75437d2310
6 changed files with 653 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/net/ipmemorystore/Status.java
View File

@@ -18,6 +18,8 @@ package android.net.ipmemorystore;
import android.annotation.NonNull;
import com.android.internal.annotations.VisibleForTesting;
/**
* A parcelable status representing the result of an operation.
* Parcels as StatusParceled.
@@ -26,7 +28,10 @@ import android.annotation.NonNull;
public class Status {
public static final int SUCCESS = 0;
public static final int ERROR_DATABASE_CANNOT_BE_OPENED = -1;
public static final int ERROR_GENERIC = -1;
public static final int ERROR_ILLEGAL_ARGUMENT = -2;
public static final int ERROR_DATABASE_CANNOT_BE_OPENED = -3;
public static final int ERROR_STORAGE = -4;
public final int resultCode;
@@ -34,7 +39,8 @@ public class Status {
this.resultCode = resultCode;
}
Status(@NonNull final StatusParcelable parcelable) {
@VisibleForTesting
public Status(@NonNull final StatusParcelable parcelable) {
this(parcelable.resultCode);
}
@@ -55,7 +61,12 @@ public class Status {
public String toString() {
switch (resultCode) {
case SUCCESS: return "SUCCESS";
case ERROR_GENERIC: return "GENERIC ERROR";
case ERROR_ILLEGAL_ARGUMENT: return "ILLEGAL ARGUMENT";
case ERROR_DATABASE_CANNOT_BE_OPENED: return "DATABASE CANNOT BE OPENED";
// "DB storage error" is not very helpful but SQLite does not provide specific error
// codes upon store failure. Thus this indicates SQLite returned some error upon store
case ERROR_STORAGE: return "DATABASE STORAGE ERROR";
default: return "Unknown value ?!";
}
}

19
core/java/android/net/ipmemorystore/Utils.java
View File

@@ -17,18 +17,25 @@
package android.net.ipmemorystore;
import android.annotation.NonNull;
import android.annotation.Nullable;
/** {@hide} */
public class Utils {
/** Pretty print */
public static String blobToString(final Blob blob) {
final StringBuilder sb = new StringBuilder("Blob : [");
if (blob.data.length <= 24) {
appendByteArray(sb, blob.data, 0, blob.data.length);
public static String blobToString(@Nullable final Blob blob) {
return "Blob : " + byteArrayToString(null == blob ? null : blob.data);
}
/** Pretty print */
public static String byteArrayToString(@Nullable final byte[] data) {
if (null == data) return "null";
final StringBuilder sb = new StringBuilder("[");
if (data.length <= 24) {
appendByteArray(sb, data, 0, data.length);
} else {
appendByteArray(sb, blob.data, 0, 16);
appendByteArray(sb, data, 0, 16);
sb.append("...");
appendByteArray(sb, blob.data, blob.data.length - 8, blob.data.length);
appendByteArray(sb, data, data.length - 8, data.length);
}
sb.append("]");
return sb.toString();