commit 96716cec6a26e31c41d514d81afe669e8824bd5c
author Ajay Panicker <apanicke@google.com> Fri Apr 13 12:37:28 2018 -0700
committer Ajay Panicker <apanicke@google.com> Fri Apr 13 13:32:56 2018 -0700
tree cbad79c2d5b4dfd76e677a485da83c7b4355b10b
parent 61d1bc9ba2851aafa795bca62d115dee8d049c5b

Check permission before queurying external storage.

Bug: 77238060
Test: Compile
Change-Id: Ibf6ba583b1eb20610d3ff9a0782c59a1a545f655

src/com/android/music/utils/MusicProvider.java

diff --git a/src/com/android/music/utils/MusicProvider.java b/src/com/android/music/utils/MusicProvider.java
index bda92ea..2796671 100644
--- a/src/com/android/music/utils/MusicProvider.java
+++ b/src/com/android/music/utils/MusicProvider.java
@@ -16,10 +16,13 @@
 
 package com.android.music.utils;
 
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -330,6 +333,11 @@
     }
 
     private synchronized boolean retrieveMedia() {
+        if (mContext.checkSelfPermission(READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+            return false;
+        }
+
         Cursor cursor =
                 mContext.getContentResolver().query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
                         null, MUSIC_SELECT_FILTER, null, MUSIC_SORT_ORDER);