ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "DO NOT MERGE: Harden Device.getDeviceId()" into honeycomb-mr1

Browse Source
This commit is contained in:
Andy Stadler 2011-03-07 17:34:32 -08:00 committed by Android (Google) Code Review
commit add274a704
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emailcommon/src/com/android/emailcommon/Device.java
View File

@ -59,9 +59,14 @@ public class Device {
rdr = new BufferedReader(new FileReader(f), 128); rdr = new BufferedReader(new FileReader(f), 128);
id = rdr.readLine(); id = rdr.readLine();
rdr.close(); rdr.close();
// STOPSHIP Remove logging if (id == null) {
Log.w(Logging.LOG_TAG, "deviceId read as: " + id); // It's very bad if we read a null device id; let's delete that file
return id; if (!f.delete()) {
Log.e(Logging.LOG_TAG, "Can't delete null deviceName file; try overwrite.");
}
} else {
return id;
}
} else { } else {
Log.w(Logging.LOG_TAG, f.getAbsolutePath() + ": File exists, but can't read?" + Log.w(Logging.LOG_TAG, f.getAbsolutePath() + ": File exists, but can't read?" +
" Trying to remove."); " Trying to remove.");