diff options
| author | Robin Lee <rgl@google.com> | 2018-04-27 14:47:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-27 14:47:32 +0000 |
| commit | d3e83d59cb125606caf7e0b6787da60d1662a290 (patch) | |
| tree | 26985c9eece4573ef75814c90840e996d9cc1658 /core/java/android/os/ShellCommand.java | |
| parent | 177e935bb7571879ff649f75813e5685d9086cd4 (diff) | |
| parent | 56be27cbb6d95290276712d678a2b57278a5afc1 (diff) | |
Merge "Don't suggest writing to /tmp if we already are"
Diffstat (limited to 'core/java/android/os/ShellCommand.java')
| -rw-r--r-- | core/java/android/os/ShellCommand.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/os/ShellCommand.java b/core/java/android/os/ShellCommand.java index fa05a5e1b22e..5228d6dcb475 100644 --- a/core/java/android/os/ShellCommand.java +++ b/core/java/android/os/ShellCommand.java @@ -247,7 +247,11 @@ public abstract class ShellCommand { } if (DEBUG) Slog.d(TAG, "Error: Unable to open file: " + path); getErrPrintWriter().println("Error: Unable to open file: " + path); - getErrPrintWriter().println("Consider using a file under /data/local/tmp/"); + + String suggestedPath = "/data/local/tmp/"; + if (path == null || !path.startsWith(suggestedPath)) { + getErrPrintWriter().println("Consider using a file under " + suggestedPath); + } return null; } |