Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7b3b32f authored by Jon Mann's avatar Jon Mann Committed by android-build-merger
Browse files

Merge "Fixed crash caused by a cursor not having extras." into oc-dev 

am: eba8bb03

Change-Id: I53ee331423694b9d810e9147955f91ca7a783c9d
parents 58171ac8 eba8bb03

src/com/android/documentsui/roots/RootCursorWrapper.java

+12 −1
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ package com.android.documentsui.roots; 
import android.database.AbstractCursor;

import android.database.Cursor;

import android.os.Bundle;

import android.util.Log;



import static com.android.documentsui.base.Shared.VERBOSE;



/**

 * Cursor wrapper that adds columns to identify which root a document came from.
@@ -37,6 +40,7 @@ public class RootCursorWrapper extends AbstractCursor { 


    public static final String COLUMN_AUTHORITY = "android:authority";

    public static final String COLUMN_ROOT_ID = "android:rootId";

    private static final String TAG = "RootCursorWrapper";



    public RootCursorWrapper(String authority, String rootId, Cursor cursor, int maxCount) {

        mAuthority = authority;
@@ -65,7 +69,14 @@ public class RootCursorWrapper extends AbstractCursor { 


    @Override

    public Bundle getExtras() {

        return mCursor.getExtras();

        Bundle extras = mCursor.getExtras();



        if (extras == null) {

            if (VERBOSE) Log.v(TAG, "Cursor for root " + mRootId + " does not have any extras.");

            return Bundle.EMPTY;

        }



        return extras;

    }



    @Override