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

Merge "Make San happy: use Environment.getExternalStorage... instead of hardcoding "/sdcard""

Browse Source
This commit is contained in:
Dan Egnor
2010-03-31 10:47:46 -07:00
committed by Android (Google) Code Review
parent 49608d9ce0 2bd1c8d96e
commit 4bb4d89cdb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/BugReportSender/src/com/android/bugreportsender/BugReportListActivity.java
View File

@@ -21,6 +21,7 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment;
import android.os.FileObserver; import android.os.FileObserver;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.util.Log;
@@ -42,7 +43,6 @@ import java.util.HashMap;
*/ */
public class BugReportListActivity extends ListActivity { public class BugReportListActivity extends ListActivity {
private static final String TAG = "BugReportListActivity"; private static final String TAG = "BugReportListActivity";
private static final File REPORT_DIR = new File("/sdcard/bugreports");
private static final int SYSTEM_LOG_ID = 1; private static final int SYSTEM_LOG_ID = 1;
private static final int MEMORY_ID = 2; private static final int MEMORY_ID = 2;
private static final int CPU_ID = 3; private static final int CPU_ID = 3;
@@ -56,6 +56,7 @@ public class BugReportListActivity extends ListActivity {
ID_MAP.put(PROCRANK_ID, "PROCRANK"); ID_MAP.put(PROCRANK_ID, "PROCRANK");
} }
private File mReportDir = null;
private ArrayAdapter<String> mAdapter = null; private ArrayAdapter<String> mAdapter = null;
private ArrayList<File> mFiles = null; private ArrayList<File> mFiles = null;
private Handler mHandler = null; private Handler mHandler = null;
@@ -64,12 +65,13 @@ public class BugReportListActivity extends ListActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mReportDir = new File(Environment.getExternalStorageDirectory(), "bugreports");
mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1); mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1);
mFiles = new ArrayList<File>(); mFiles = new ArrayList<File>();
mHandler = new Handler(); mHandler = new Handler();
int flags = FileObserver.CREATE | FileObserver.MOVED_TO; int flags = FileObserver.CREATE | FileObserver.MOVED_TO;
mObserver = new FileObserver(REPORT_DIR.getPath(), flags) { mObserver = new FileObserver(mReportDir.getPath(), flags) {
public void onEvent(int event, String path) { public void onEvent(int event, String path) {
mHandler.post(new Runnable() { public void run() { scanDirectory(); } }); mHandler.post(new Runnable() { public void run() { scanDirectory(); } });
} }
@@ -151,7 +153,7 @@ public class BugReportListActivity extends ListActivity {
mAdapter.clear(); mAdapter.clear();
mFiles.clear(); mFiles.clear();
File[] files = REPORT_DIR.listFiles(); File[] files = mReportDir.listFiles();
if (files == null) return; if (files == null) return;
// Sort in reverse order: newest bug reports first // Sort in reverse order: newest bug reports first