joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Abort connecting to native daemon during shutdown"

Browse source 
am: 82c31fc6a1

Change-Id: I044badaab323b836580b5231e9f2661aa320d1e9
This commit is contained in:
Tetsutoki Shiozawa 2017-09-13 22:27:48 +00:00 • committed by android-build-merger
commit ac2c00d0df
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
services/core/java/com/android/server/NativeDaemonConnector.java
View file

@ -24,11 +24,13 @@ import android.os.Looper;
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 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
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);
}
}