LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 6a81c4be: Fix NPE in sample code.

Browse Source 
* commit '6a81c4be1649b8812296645db06bbaf93b3eb7cf':
  Fix NPE in sample code.
This commit is contained in:
Jeff Brown
2013-10-21 17:24:40 -07:00
committed by Android Git Automerger
parent 14794b209c 6a81c4be16
commit 10f2258723
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
View File

@@ -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])));
}
}
}
}