diff options
author | Jeff Brown <jeffbrown@google.com> | 2013-08-16 21:07:09 -0700 |
---|---|---|
committer | Chong Zhang <chz@google.com> | 2013-10-21 11:23:24 -0700 |
commit | 6a81c4be1649b8812296645db06bbaf93b3eb7cf (patch) | |
tree | 92b734a5e2a51c9addd030a4def10e842233b9ad /samples/Support7Demos | |
parent | 3404cd16bfd0fadf7d50a10351ca407d938dbf28 (diff) | |
download | android_development-6a81c4be1649b8812296645db06bbaf93b3eb7cf.tar.gz android_development-6a81c4be1649b8812296645db06bbaf93b3eb7cf.tar.bz2 android_development-6a81c4be1649b8812296645db06bbaf93b3eb7cf.zip |
Fix NPE in sample code.
Change-Id: I61b348192cd39813027ae5b4d2cedb2e84b701f1
Diffstat (limited to 'samples/Support7Demos')
-rw-r--r-- | samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java index 7f621800c..cad1584d3 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java @@ -33,6 +33,7 @@ import android.media.MediaMetadataRetriever; import android.media.RemoteControlClient; import android.net.Uri; import android.os.Build; +import android.os.Environment; import android.os.Handler; import android.os.Bundle; import android.os.SystemClock; @@ -365,15 +366,18 @@ public class SampleMediaRouterActivity extends ActionBarActivity { "[streaming] "+mediaNames[i], Uri.parse(mediaUris[i]))); } - // Scan local /sdcard/ directory for media files. - String sdcard = "/sdcard/"; - File file = new File(sdcard); - File list[] = file.listFiles(); - for (int i = 0; i < list.length; i++) { - String filename = list[i].getName(); - if (filename.matches(".*\\.(m4v|mp4)")) { - mLibraryItems.add(new MediaItem( - "[local] "+filename, Uri.parse("file:///sdcard/" + filename))); + // Scan local external storage directory for media files. + File externalDir = Environment.getExternalStorageDirectory(); + if (externalDir != null) { + File list[] = externalDir.listFiles(); + if (list != null) { + for (int i = 0; i < list.length; i++) { + String filename = list[i].getName(); + if (filename.matches(".*\\.(m4v|mp4)")) { + mLibraryItems.add(new MediaItem("[local] " + filename, + Uri.fromFile(list[i]))); + } + } } } |