LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Abort connecting to native daemon during shutdown"

Browse Source 
am: aa8608db31

Change-Id: I5b8984d51ff0715b29074cee98197263b5ce1c29
This commit is contained in:
Tetsutoki Shiozawa
2017-09-13 22:36:59 +00:00
committed by android-build-merger
parent 67fbf6ac5e aa8608db31
commit af741b2b0b
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.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties;
import android.util.LocalLog; import android.util.LocalLog;
import android.util.Slog; import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.server.power.ShutdownThread;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -136,6 +138,12 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
listenToSocket(); listenToSocket();
} catch (Exception e) { } catch (Exception e) {
loge("Error in NativeDaemonConnector: " + 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); SystemClock.sleep(5000);
} }
} }