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

Commit cb4de956 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect storage calculation when SD card is inserted" am:... 

Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7 am: 2a0a88af am: dad4720a

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780



Change-Id: Ia8f4762a938a8b4dc2b8ac503b42792cc3cd882a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 326c0ea3 dad4720a

src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java

+9 −6
Original line number Diff line number Diff line
@@ -85,13 +85,15 @@ public class StorageAsyncLoader 


        for (UserInfo info : infos) {

            final StorageResult result = getAppsAndGamesSize(info.id);



            final Bundle media = new Bundle();

            media.putString(ContentResolver.QUERY_ARG_SQL_SELECTION, MediaColumns.VOLUME_NAME

                    + "= '" + MediaStore.VOLUME_EXTERNAL_PRIMARY + "'");

            result.imagesSize = getFilesSize(info.id, MediaStore.Images.Media.EXTERNAL_CONTENT_URI,

                    null /* queryArgs */);

                    media /* queryArgs */);

            result.videosSize = getFilesSize(info.id, MediaStore.Video.Media.EXTERNAL_CONTENT_URI,

                    null /* queryArgs */);

                    media /* queryArgs */);

            result.audioSize = getFilesSize(info.id, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,

                    null /* queryArgs */);

                    media /* queryArgs */);



            final Bundle documentsAndOtherQueryArgs = new Bundle();

            documentsAndOtherQueryArgs.putString(ContentResolver.QUERY_ARG_SQL_SELECTION,
@@ -100,13 +102,14 @@ public class StorageAsyncLoader 
                    + " AND " + FileColumns.MEDIA_TYPE + "!=" + FileColumns.MEDIA_TYPE_AUDIO

                    + " AND " + FileColumns.MIME_TYPE + " IS NOT NULL");

            result.documentsAndOtherSize = getFilesSize(info.id,

                    MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL),

                    MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY),

                    documentsAndOtherQueryArgs);



            final Bundle trashQueryArgs = new Bundle();

            trashQueryArgs.putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY);

            result.trashSize = getFilesSize(info.id,

                    MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL), trashQueryArgs);

                    MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY),

                    trashQueryArgs);



            results.put(info.id, result);

        }