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

Commit 4ba2817c authored by Steve Howard's avatar Steve Howard Committed by Android (Google) Code Review
Browse files

Merge "Avoid NPE when viewing failed legacy download with no local path" into gingerbread

parents 0a972acf 99047d7b

core/java/android/app/DownloadManager.java

+5 −1
Original line number Diff line number Diff line
@@ -923,7 +923,11 @@ public class DownloadManager { 


            if (destinationType == Downloads.Impl.DESTINATION_EXTERNAL) {

                // return stored destination for legacy external download

                return Uri.fromFile(new File(getUnderlyingString(Downloads.Impl._DATA))).toString();

                String localPath = getUnderlyingString(Downloads.Impl._DATA);

                if (localPath == null) {

                    return null;

                }

                return Uri.fromFile(new File(localPath)).toString();

            }



            // return content URI for cache download