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

DO NOT MERGE: Harden Device.getDeviceId() 

* If we read a null deviceName, delete the file and create a
new one.

Bug: 3506362
Backport of Ida670db2f4b75cb9c94636a0af541ae5df50addf

Change-Id: If844fe2a2f3d7096a8b18e826a3640a7d9dff830
This commit is contained in:
Andy Stadler 2011-03-07 17:05:00 -08:00
parent 71d4eb890c
commit c5b23e1e71
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);
id = rdr.readLine();
rdr.close();
// STOPSHIP Remove logging
Log.w(Logging.LOG_TAG, "deviceId read as: " + id);
return id;
if (id == null) {
// It's very bad if we read a null device id; let's delete that file
if (!f.delete()) {
Log.e(Logging.LOG_TAG, "Can't delete null deviceName file; try overwrite.");
}
} else {
return id;
}
} else {
Log.w(Logging.LOG_TAG, f.getAbsolutePath() + ": File exists, but can't read?" +
" Trying to remove.");