Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: throw an exception if an operation takes too long." into mnc-dev

Browse Source
This commit is contained in:
Dongwon Kang
2015-04-29 05:34:24 +00:00
committed by Android (Google) Code Review
parent b42d694691 21add3ecc9
commit 25466e0a8f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/java/android/media/tv/ITvInputSessionWrapper.java
View File

@@ -41,8 +41,9 @@ import com.android.internal.os.SomeArgs;
public class ITvInputSessionWrapper extends ITvInputSession.Stub implements HandlerCaller.Callback { public class ITvInputSessionWrapper extends ITvInputSession.Stub implements HandlerCaller.Callback {
private static final String TAG = "TvInputSessionWrapper"; private static final String TAG = "TvInputSessionWrapper";
private static final int MESSAGE_HANDLING_DURATION_THRESHOLD_MILLIS = 50; private static final int EXECUTE_MESSAGE_TIMEOUT_SHORT_MILLIS = 50;
private static final int MESSAGE_TUNE_DURATION_THRESHOLD_MILLIS = 2000; private static final int EXECUTE_MESSAGE_TUNE_TIMEOUT_MILLIS = 2000;
private static final int EXECUTE_MESSAGE_TIMEOUT_LONG_MILLIS = 5 * 1000;
private static final int DO_RELEASE = 1; private static final int DO_RELEASE = 1;
private static final int DO_SET_MAIN = 2; private static final int DO_SET_MAIN = 2;
@@ -184,14 +185,18 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
} }
} }
long duration = System.currentTimeMillis() - startTime; long duration = System.currentTimeMillis() - startTime;
if (duration > MESSAGE_HANDLING_DURATION_THRESHOLD_MILLIS) { if (duration > EXECUTE_MESSAGE_TIMEOUT_SHORT_MILLIS) {
Log.w(TAG, "Handling message (" + msg.what + ") took too long time (duration=" Log.w(TAG, "Handling message (" + msg.what + ") took too long time (duration="
+ duration + "ms)"); + duration + "ms)");
if (msg.what == DO_TUNE && duration > MESSAGE_TUNE_DURATION_THRESHOLD_MILLIS) { if (msg.what == DO_TUNE && duration > EXECUTE_MESSAGE_TUNE_TIMEOUT_MILLIS) {
throw new RuntimeException("Too much time to handle tune request. (" + duration throw new RuntimeException("Too much time to handle tune request. (" + duration
+ "ms > " + MESSAGE_TUNE_DURATION_THRESHOLD_MILLIS + "ms) " + "ms > " + EXECUTE_MESSAGE_TUNE_TIMEOUT_MILLIS + "ms) "
+ "Consider handling the tune request in a separate thread."); + "Consider handling the tune request in a separate thread.");
} }
if (duration > EXECUTE_MESSAGE_TIMEOUT_LONG_MILLIS) {
throw new RuntimeException("Too much time to handle a request. (type=" + msg.what +
", " + duration + "ms > " + EXECUTE_MESSAGE_TIMEOUT_LONG_MILLIS + "ms).");
}
} }
} }