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

am 340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev

Browse Source 
* commit '340b198ccbd1a05e67d586c345139617d4b84ce0':
  Handle null projection properly if provider app op is not enabled.
This commit is contained in:
Svet Ganov
2015-04-28 16:20:43 +00:00
committed by Android Git Automerger
parent 59f9592ff4 340b198ccb
commit 565d274f30
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/content/ContentProvider.java
View File

@@ -211,7 +211,27 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
// We do not call ContentProvider#query with a modified where clause since
// the implementation is not guaranteed to be backed by a SQL database, hence
// it may not handle properly the tautology where clause we would have created.
return new MatrixCursor(projection, 0);
if (projection != null) {
return new MatrixCursor(projection, 0);
}
// Null projection means all columns but we have no idea which they are.
// However, the caller may be expecting to access them my index. Hence,
// we have to execute the query as if allowed to get a cursor with the
// columns. We then use the column names to return an empty cursor.
Cursor cursor = ContentProvider.this.query(uri, projection, selection,
selectionArgs, sortOrder, CancellationSignal.fromTransport(
cancellationSignal));
// Create a projection for all columns.
final int columnCount = cursor.getCount();
String[] allColumns = new String[columnCount];
for (int i = 0; i < columnCount; i++) {
allColumns[i] = cursor.getColumnName(i);
}
// Return an empty cursor for all columns.
return new MatrixCursor(allColumns, 0);
}
final String original = setCallingPackage(callingPkg);
try {