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

Commit ab6ee15f authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 474b0f29: Merge change 7686 into donut 

Merge commit '474b0f29'

* commit '474b0f29':
  MediaScanner: Add check for null object in empty title handling code.
parents bc9b8075 474b0f29

media/java/android/media/MediaScanner.java

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ public class MediaScanner 


            ContentValues values = toValues();

            String title = values.getAsString(MediaStore.MediaColumns.TITLE);

            if (TextUtils.isEmpty(title.trim())) {

            if (title == null || TextUtils.isEmpty(title.trim())) {

                title = values.getAsString(MediaStore.MediaColumns.DATA);

                // extract file name after last slash

                int lastSlash = title.lastIndexOf('/');