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

am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev

Browse Source 
* commit 'bd25b5f6021295932a8ce2a6fa534dc37dacf249':
  Fix ArrayIndexOutOfBoundsException in Transport.query
This commit is contained in:
Makoto Onuki
2015-06-13 00:35:26 +00:00
committed by Android Git Automerger
parent ae45557394 bd25b5f602
commit 5a9ef04f03
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,16 +223,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
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);
if (cursor == null) {
return null;
}
// Return an empty cursor for all columns.
return new MatrixCursor(allColumns, 0);
return new MatrixCursor(cursor.getColumnNames(), 0);
}
final String original = setCallingPackage(callingPkg);
try {