diff options
| author | Kenny Root <kroot@google.com> | 2013-05-07 09:47:34 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-05-07 09:51:31 -0700 |
| commit | add582122dcec5aeb20d9e8f8c49348e00a5fe76 (patch) | |
| tree | eab3b5e88db580b7865d277abd45e27b77a2d15e /cmds/am | |
| parent | cfba6a07fd24559bfb6bb51007520b8ca3cd5c48 (diff) | |
| parent | 485d7a31a8a07c825281cbae789ca0d04f3949d7 (diff) | |
| download | frameworks_base-add582122dcec5aeb20d9e8f8c49348e00a5fe76.zip frameworks_base-add582122dcec5aeb20d9e8f8c49348e00a5fe76.tar.gz frameworks_base-add582122dcec5aeb20d9e8f8c49348e00a5fe76.tar.bz2 | |
resolved conflicts for merge of 485d7a31 to master
Change-Id: I058e19af8732df44457bdc614ee810a642dc25e4
Diffstat (limited to 'cmds/am')
| -rw-r--r-- | cmds/am/src/com/android/commands/am/Am.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 95343f9..dca873e 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -1109,6 +1109,18 @@ public class Am extends BaseCommand { } } + @Override + public int systemNotResponding(String message) + throws RemoteException { + synchronized (this) { + System.out.println("** ERROR: PROCESS NOT RESPONDING"); + System.out.println("message: " + message); + System.out.println("#"); + System.out.println("Allowing system to die."); + return -1; + } + } + void killGdbLocked() { mGotGdbPrint = false; if (mGdbProcess != null) { |