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

Commit 866fc753 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Use normal directory content uri if it is shortcut mode 

am: c44de88c6b

* commit 'c44de88c6b8180718f03d71b878d52d81a23ec1b':
  Use normal directory content uri if it is shortcut mode

Change-Id: I872afc15582abcc942397729fd03cc1572bacfc2
parents 511396ce 02b2d9ee

src/com/android/contacts/common/list/DirectoryListLoader.java

+12 −3
Original line number Original line Diff line number Diff line
@@ -45,7 +45,6 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> { 
    public static final int SEARCH_MODE_DATA_SHORTCUT = 3;

    public static final int SEARCH_MODE_DATA_SHORTCUT = 3;





    private static final class DirectoryQuery {

    private static final class DirectoryQuery {

        public static final Uri URI = DirectoryCompat.getContentUri();

        public static final String ORDER_BY = Directory._ID;

        public static final String ORDER_BY = Directory._ID;





        public static final String[] PROJECTION = {

        public static final String[] PROJECTION = {
@@ -61,6 +60,14 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> { 
        public static final int TYPE_RESOURCE_ID = 2;

        public static final int TYPE_RESOURCE_ID = 2;

        public static final int DISPLAY_NAME = 3;

        public static final int DISPLAY_NAME = 3;

        public static final int PHOTO_SUPPORT = 4;

        public static final int PHOTO_SUPPORT = 4;



        public static Uri getDirectoryUri(int mode) {

            if (mode == SEARCH_MODE_DATA_SHORTCUT || mode == SEARCH_MODE_CONTACT_SHORTCUT) {

                return Directory.CONTENT_URI;

            } else {

                return DirectoryCompat.getContentUri();

            }

        }

    }

    }





    // This is a virtual column created for a MatrixCursor.

    // This is a virtual column created for a MatrixCursor.
@@ -104,7 +111,8 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> { 
    @Override

    @Override

    protected void onStartLoading() {

    protected void onStartLoading() {

        getContext().getContentResolver().

        getContext().getContentResolver().

                registerContentObserver(DirectoryQuery.URI, false, mObserver);

                registerContentObserver(DirectoryQuery.getDirectoryUri(mDirectorySearchMode),

                        false, mObserver);

        forceLoad();

        forceLoad();

    }

    }
@@ -144,7 +152,8 @@ public class DirectoryListLoader extends AsyncTaskLoader<Cursor> { 
        }

        }

        Cursor cursor = null;

        Cursor cursor = null;

        try {

        try {

            cursor = context.getContentResolver().query(DirectoryQuery.URI,

            cursor = context.getContentResolver().query(

                    DirectoryQuery.getDirectoryUri(mDirectorySearchMode),

                    DirectoryQuery.PROJECTION, selection, null, DirectoryQuery.ORDER_BY);

                    DirectoryQuery.PROJECTION, selection, null, DirectoryQuery.ORDER_BY);





            if (cursor == null) {

            if (cursor == null) {