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

Add exception logging to aid debugging.

Browse Source 
Now we log both success and failure of ContentInterface calls.

Bug: 128782519
Test: manual
Change-Id: I5e81cc6a8ba1460331cad5e085aa01633d6741d6
This commit is contained in:
Jeff Sharkey
2019-03-17 11:05:32 -06:00
parent b3e900902a
commit 9bb54f203e
1 changed files with 126 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
core/java/android/content/LoggingContentInterface.java
View File

@@ -66,7 +66,12 @@ public class LoggingContentInterface implements ContentInterface {
} else {
sb.append(" = ").append(deepToString(res));
}
Log.v(tag, sb.toString());
if (res instanceof Exception) {
Log.e(tag, sb.toString());
} else {
Log.v(tag, sb.toString());
}
}
private String deepToString(Object value) {
@@ -81,119 +86,194 @@ public class LoggingContentInterface implements ContentInterface {
public @Nullable Cursor query(@NonNull Uri uri, @Nullable String[] projection,
@Nullable Bundle queryArgs, @Nullable CancellationSignal cancellationSignal)
throws RemoteException {
final Cursor res = delegate.query(uri, projection, queryArgs, cancellationSignal);
log("query", res, uri, projection, queryArgs, cancellationSignal);
return res;
try {
final Cursor res = delegate.query(uri, projection, queryArgs, cancellationSignal);
log("query", res, uri, projection, queryArgs, cancellationSignal);
return res;
} catch (Exception res) {
log("query", res, uri, projection, queryArgs, cancellationSignal);
throw res;
}
}
@Override
public @Nullable String getType(@NonNull Uri uri) throws RemoteException {
final String res = delegate.getType(uri);
log("getType", res, uri);
return res;
try {
final String res = delegate.getType(uri);
log("getType", res, uri);
return res;
} catch (Exception res) {
log("getType", res, uri);
throw res;
}
}
@Override
public @Nullable String[] getStreamTypes(@NonNull Uri uri, @NonNull String mimeTypeFilter)
throws RemoteException {
final String[] res = delegate.getStreamTypes(uri, mimeTypeFilter);
log("getStreamTypes", res, uri, mimeTypeFilter);
return res;
try {
final String[] res = delegate.getStreamTypes(uri, mimeTypeFilter);
log("getStreamTypes", res, uri, mimeTypeFilter);
return res;
} catch (Exception res) {
log("getStreamTypes", res, uri, mimeTypeFilter);
throw res;
}
}
@Override
public @Nullable Uri canonicalize(@NonNull Uri uri) throws RemoteException {
final Uri res = delegate.canonicalize(uri);
log("canonicalize", res, uri);
return res;
try {
final Uri res = delegate.canonicalize(uri);
log("canonicalize", res, uri);
return res;
} catch (Exception res) {
log("canonicalize", res, uri);
throw res;
}
}
@Override
public @Nullable Uri uncanonicalize(@NonNull Uri uri) throws RemoteException {
final Uri res = delegate.uncanonicalize(uri);
log("uncanonicalize", res, uri);
return res;
try {
final Uri res = delegate.uncanonicalize(uri);
log("uncanonicalize", res, uri);
return res;
} catch (Exception res) {
log("uncanonicalize", res, uri);
throw res;
}
}
@Override
public boolean refresh(@NonNull Uri uri, @Nullable Bundle args,
@Nullable CancellationSignal cancellationSignal) throws RemoteException {
final boolean res = delegate.refresh(uri, args, cancellationSignal);
log("refresh", res, uri, args, cancellationSignal);
return res;
try {
final boolean res = delegate.refresh(uri, args, cancellationSignal);
log("refresh", res, uri, args, cancellationSignal);
return res;
} catch (Exception res) {
log("refresh", res, uri, args, cancellationSignal);
throw res;
}
}
@Override
public @Nullable Uri insert(@NonNull Uri uri, @Nullable ContentValues initialValues)
throws RemoteException {
final Uri res = delegate.insert(uri, initialValues);
log("insert", res, uri, initialValues);
return res;
try {
final Uri res = delegate.insert(uri, initialValues);
log("insert", res, uri, initialValues);
return res;
} catch (Exception res) {
log("insert", res, uri, initialValues);
throw res;
}
}
@Override
public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] initialValues)
throws RemoteException {
final int res = delegate.bulkInsert(uri, initialValues);
log("bulkInsert", res, uri, initialValues);
return res;
try {
final int res = delegate.bulkInsert(uri, initialValues);
log("bulkInsert", res, uri, initialValues);
return res;
} catch (Exception res) {
log("bulkInsert", res, uri, initialValues);
throw res;
}
}
@Override
public int delete(@NonNull Uri uri, @Nullable String selection,
@Nullable String[] selectionArgs) throws RemoteException {
final int res = delegate.delete(uri, selection, selectionArgs);
log("delete", res, uri, selection, selectionArgs);
return res;
try {
final int res = delegate.delete(uri, selection, selectionArgs);
log("delete", res, uri, selection, selectionArgs);
return res;
} catch (Exception res) {
log("delete", res, uri, selection, selectionArgs);
throw res;
}
}
@Override
public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection,
@Nullable String[] selectionArgs) throws RemoteException {
final int res = delegate.update(uri, values, selection, selectionArgs);
log("update", res, uri, values, selection, selectionArgs);
return res;
try {
final int res = delegate.update(uri, values, selection, selectionArgs);
log("update", res, uri, values, selection, selectionArgs);
return res;
} catch (Exception res) {
log("update", res, uri, values, selection, selectionArgs);
throw res;
}
}
@Override
public @Nullable ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode,
@Nullable CancellationSignal signal) throws RemoteException, FileNotFoundException {
final ParcelFileDescriptor res = delegate.openFile(uri, mode, signal);
log("openFile", res, uri, mode, signal);
return res;
try {
final ParcelFileDescriptor res = delegate.openFile(uri, mode, signal);
log("openFile", res, uri, mode, signal);
return res;
} catch (Exception res) {
log("openFile", res, uri, mode, signal);
throw res;
}
}
@Override
public @Nullable AssetFileDescriptor openAssetFile(@NonNull Uri uri, @NonNull String mode,
@Nullable CancellationSignal signal) throws RemoteException, FileNotFoundException {
final AssetFileDescriptor res = delegate.openAssetFile(uri, mode, signal);
log("openAssetFile", res, uri, mode, signal);
return res;
try {
final AssetFileDescriptor res = delegate.openAssetFile(uri, mode, signal);
log("openAssetFile", res, uri, mode, signal);
return res;
} catch (Exception res) {
log("openAssetFile", res, uri, mode, signal);
throw res;
}
}
@Override
public @Nullable AssetFileDescriptor openTypedAssetFile(@NonNull Uri uri,
@NonNull String mimeTypeFilter, @Nullable Bundle opts,
@Nullable CancellationSignal signal) throws RemoteException, FileNotFoundException {
final AssetFileDescriptor res = delegate.openTypedAssetFile(uri, mimeTypeFilter, opts, signal);
log("openTypedAssetFile", res, uri, mimeTypeFilter, opts, signal);
return res;
try {
final AssetFileDescriptor res = delegate.openTypedAssetFile(uri, mimeTypeFilter, opts, signal);
log("openTypedAssetFile", res, uri, mimeTypeFilter, opts, signal);
return res;
} catch (Exception res) {
log("openTypedAssetFile", res, uri, mimeTypeFilter, opts, signal);
throw res;
}
}
@Override
public @NonNull ContentProviderResult[] applyBatch(@NonNull String authority,
@NonNull ArrayList<ContentProviderOperation> operations)
throws RemoteException, OperationApplicationException {
final ContentProviderResult[] res = delegate.applyBatch(authority, operations);
log("applyBatch", res, authority, operations);
return res;
try {
final ContentProviderResult[] res = delegate.applyBatch(authority, operations);
log("applyBatch", res, authority, operations);
return res;
} catch (Exception res) {
log("applyBatch", res, authority, operations);
throw res;
}
}
@Override
public @Nullable Bundle call(@NonNull String authority, @NonNull String method,
@Nullable String arg, @Nullable Bundle extras) throws RemoteException {
final Bundle res = delegate.call(authority, method, arg, extras);
log("call", res, authority, method, arg, extras);
return res;
try {
final Bundle res = delegate.call(authority, method, arg, extras);
log("call", res, authority, method, arg, extras);
return res;
} catch (Exception res) {
log("call", res, authority, method, arg, extras);
throw res;
}
}
}