Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev

Browse Source 
* commit '17fe99ac01b8b6648d3d703fec1b28a792832331':
  Fix NPE in DropBoxManagerService.dump()
This commit is contained in:
Jeff Sharkey
2014-11-14 21:09:47 +00:00
committed by Android Git Automerger
parent 58fa003577 17fe99ac01
commit bec816adc7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/DropBoxManagerService.java
View File

@@ -408,9 +408,14 @@ public final class DropBoxManagerService extends IDropBoxManagerService.Stub {
if (!newline) out.append("\n"); if (!newline) out.append("\n");
} else { } else {
String text = dbe.getText(70); String text = dbe.getText(70);
boolean truncated = (text.length() == 70); out.append(" ");
out.append(" ").append(text.trim().replace('\n', '/')); if (text == null) {
if (truncated) out.append(" ..."); out.append("[null]");
} else {
boolean truncated = (text.length() == 70);
out.append(text.trim().replace('\n', '/'));
if (truncated) out.append(" ...");
}
out.append("\n"); out.append("\n");
} }
} catch (IOException e) { } catch (IOException e) {