commit d763e341b5cbe7449e7acba7179715e817b48c03
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 13 22:09:54 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 13 22:09:54 2017 +0000
tree 746b4dc48aada54b7ffc57e5c813911248731659
parent 0285ee851d295780f6e49d4a4c811ab031e35bcc
parent e83724e2686a88760683dd95dd00429c13824410

Merge "Abort connecting to native daemon during shutdown"

services/core/java/com/android/server/NativeDaemonConnector.java

diff --git a/services/core/java/com/android/server/NativeDaemonConnector.java b/services/core/java/com/android/server/NativeDaemonConnector.java
index f5f7732..b5a8332 100644
--- a/services/core/java/com/android/server/NativeDaemonConnector.java
+++ b/services/core/java/com/android/server/NativeDaemonConnector.java
@@ -24,11 +24,13 @@
 import android.os.Message;
 import android.os.PowerManager;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.util.LocalLog;
 import android.util.Slog;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.Preconditions;
+import com.android.server.power.ShutdownThread;
 import com.google.android.collect.Lists;
 
 import java.io.FileDescriptor;
@@ -136,6 +138,12 @@
                 listenToSocket();
             } catch (Exception e) {
                 loge("Error in NativeDaemonConnector: " + e);
+                String shutdownAct = SystemProperties.get(
+                        ShutdownThread.SHUTDOWN_ACTION_PROPERTY, "");
+                if (shutdownAct != null && shutdownAct.length() > 0) {
+                    // The device is in middle of shutdown.
+                    break;
+                }
                 SystemClock.sleep(5000);
             }
         }