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

Merge changes I9971c466,Ib42474fd into mnc-dev

Browse Source 
* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
This commit is contained in:
Jeff Sharkey
2015-07-08 21:55:52 +00:00
committed by Android (Google) Code Review
parent f34946fabb 6928e332da
commit b1f84a006f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/NativeDaemonConnector.java
View File

@@ -69,7 +69,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
private AtomicInteger mSequenceNumber; private AtomicInteger mSequenceNumber;
private static final int DEFAULT_TIMEOUT = 1 * 60 * 1000; /* 1 minute */ private static final long DEFAULT_TIMEOUT = 1 * 60 * 1000; /* 1 minute */
private static final long WARN_EXECUTE_DELAY_MS = 500; /* .5 sec */ private static final long WARN_EXECUTE_DELAY_MS = 500; /* .5 sec */
/** Lock held whenever communicating with native daemon. */ /** Lock held whenever communicating with native daemon. */
@@ -337,7 +337,12 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
*/ */
public NativeDaemonEvent execute(String cmd, Object... args) public NativeDaemonEvent execute(String cmd, Object... args)
throws NativeDaemonConnectorException { throws NativeDaemonConnectorException {
final NativeDaemonEvent[] events = executeForList(cmd, args); return execute(DEFAULT_TIMEOUT, cmd, args);
}
public NativeDaemonEvent execute(long timeoutMs, String cmd, Object... args)
throws NativeDaemonConnectorException {
final NativeDaemonEvent[] events = executeForList(timeoutMs, cmd, args);
if (events.length != 1) { if (events.length != 1) {
throw new NativeDaemonConnectorException( throw new NativeDaemonConnectorException(
"Expected exactly one response, but received " + events.length); "Expected exactly one response, but received " + events.length);
@@ -372,7 +377,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
*/ */
public NativeDaemonEvent[] executeForList(String cmd, Object... args) public NativeDaemonEvent[] executeForList(String cmd, Object... args)
throws NativeDaemonConnectorException { throws NativeDaemonConnectorException {
return execute(DEFAULT_TIMEOUT, cmd, args); return executeForList(DEFAULT_TIMEOUT, cmd, args);
} }
/** /**
@@ -387,7 +392,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
* {@link NativeDaemonEvent#isClassClientError()} or * {@link NativeDaemonEvent#isClassClientError()} or
* {@link NativeDaemonEvent#isClassServerError()}. * {@link NativeDaemonEvent#isClassServerError()}.
*/ */
public NativeDaemonEvent[] execute(int timeout, String cmd, Object... args) public NativeDaemonEvent[] executeForList(long timeoutMs, String cmd, Object... args)
throws NativeDaemonConnectorException { throws NativeDaemonConnectorException {
final long startTime = SystemClock.elapsedRealtime(); final long startTime = SystemClock.elapsedRealtime();
@@ -418,7 +423,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
NativeDaemonEvent event = null; NativeDaemonEvent event = null;
do { do {
event = mResponseQueue.remove(sequenceNumber, timeout, logCmd); event = mResponseQueue.remove(sequenceNumber, timeoutMs, logCmd);
if (event == null) { if (event == null) {
loge("timed-out waiting for response to " + logCmd); loge("timed-out waiting for response to " + logCmd);
throw new NativeDaemonTimeoutException(logCmd, event); throw new NativeDaemonTimeoutException(logCmd, event);
@@ -606,7 +611,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
// note that the timeout does not count time in deep sleep. If you don't want // note that the timeout does not count time in deep sleep. If you don't want
// the device to sleep, hold a wakelock // the device to sleep, hold a wakelock
public NativeDaemonEvent remove(int cmdNum, int timeoutMs, String logCmd) { public NativeDaemonEvent remove(int cmdNum, long timeoutMs, String logCmd) {
PendingCmd found = null; PendingCmd found = null;
synchronized (mPendingCmds) { synchronized (mPendingCmds) {
for (PendingCmd pendingCmd : mPendingCmds) { for (PendingCmd pendingCmd : mPendingCmds) {