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

am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev

Browse Source 
* commit '39567dd6480ae2527af8f53199e0f42e1de80b2c':
  TIF: Handle notifyXXX() calls requested before the session initialization
This commit is contained in:
Dongwon Kang
2014-10-31 00:15:33 +00:00
committed by Android Git Automerger
parent 9d0a2dc15d 39567dd648
commit 27219325d5
1 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
media/java/android/media/tv/TvInputService.java
View File

@@ -48,6 +48,7 @@ import android.view.accessibility.CaptioningManager;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.os.SomeArgs; import com.android.internal.os.SomeArgs;
import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -250,7 +251,12 @@ public abstract class TvInputService extends Service {
private boolean mOverlayViewEnabled; private boolean mOverlayViewEnabled;
private IBinder mWindowToken; private IBinder mWindowToken;
private Rect mOverlayFrame; private Rect mOverlayFrame;
private Object mLock = new Object();
// @GuardedBy("mLock")
private ITvInputSessionCallback mSessionCallback; private ITvInputSessionCallback mSessionCallback;
// @GuardedBy("mLock")
private List<Runnable> mPendingActions = new ArrayList<>();
/** /**
* Creates a new Session. * Creates a new Session.
@@ -295,11 +301,12 @@ public abstract class TvInputService extends Service {
* @param eventArgs Optional arguments of the event. * @param eventArgs Optional arguments of the event.
* @hide * @hide
*/ */
@SystemApi
public void notifySessionEvent(final String eventType, final Bundle eventArgs) { public void notifySessionEvent(final String eventType, final Bundle eventArgs) {
if (eventType == null) { if (eventType == null) {
throw new IllegalArgumentException("eventType should not be null."); throw new IllegalArgumentException("eventType should not be null.");
} }
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -318,7 +325,7 @@ public abstract class TvInputService extends Service {
* @param channelUri The URI of a channel. * @param channelUri The URI of a channel.
*/ */
public void notifyChannelRetuned(final Uri channelUri) { public void notifyChannelRetuned(final Uri channelUri) {
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -355,7 +362,7 @@ public abstract class TvInputService extends Service {
trackIdSet.clear(); trackIdSet.clear();
// TODO: Validate the track list. // TODO: Validate the track list.
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -383,7 +390,7 @@ public abstract class TvInputService extends Service {
* @see #onSelectTrack * @see #onSelectTrack
*/ */
public void notifyTrackSelected(final int type, final String trackId) { public void notifyTrackSelected(final int type, final String trackId) {
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -404,7 +411,7 @@ public abstract class TvInputService extends Service {
* @see #notifyVideoUnavailable * @see #notifyVideoUnavailable
*/ */
public void notifyVideoAvailable() { public void notifyVideoAvailable() {
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -436,7 +443,7 @@ public abstract class TvInputService extends Service {
|| reason > TvInputManager.VIDEO_UNAVAILABLE_REASON_END) { || reason > TvInputManager.VIDEO_UNAVAILABLE_REASON_END) {
throw new IllegalArgumentException("Unknown reason: " + reason); throw new IllegalArgumentException("Unknown reason: " + reason);
} }
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -475,7 +482,7 @@ public abstract class TvInputService extends Service {
* @see TvInputManager * @see TvInputManager
*/ */
public void notifyContentAllowed() { public void notifyContentAllowed() {
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -515,7 +522,7 @@ public abstract class TvInputService extends Service {
* @see TvInputManager * @see TvInputManager
*/ */
public void notifyContentBlocked(final TvContentRating rating) { public void notifyContentBlocked(final TvContentRating rating) {
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -544,7 +551,7 @@ public abstract class TvInputService extends Service {
if (left > right || top > bottm) { if (left > right || top > bottm) {
throw new IllegalArgumentException("Invalid parameter"); throw new IllegalArgumentException("Invalid parameter");
} }
runOnMainThread(new Runnable() { executeOrPostRunnable(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
@@ -852,6 +859,10 @@ public abstract class TvInputService extends Service {
mSurface.release(); mSurface.release();
mSurface = null; mSurface = null;
} }
synchronized(mLock) {
mSessionCallback = null;
mPendingActions.clear();
}
} }
/** /**
@@ -1059,20 +1070,32 @@ public abstract class TvInputService extends Service {
} }
} }
private void setSessionCallback(ITvInputSessionCallback callback) { private void initialize(ITvInputSessionCallback callback) {
synchronized(mLock) {
mSessionCallback = callback; mSessionCallback = callback;
for (Runnable runnable : mPendingActions) {
runnable.run();
}
mPendingActions.clear();
}
} }
private final void runOnMainThread(Runnable action) { private final void executeOrPostRunnable(Runnable action) {
if (mHandler.getLooper().isCurrentThread() && mSessionCallback != null) { synchronized(mLock) {
if (mSessionCallback == null) {
// The session is not initialized yet.
mPendingActions.add(action);
} else {
if (mHandler.getLooper().isCurrentThread()) {
action.run(); action.run();
} else { } else {
// Posts the runnable if this is not called from the main thread or the session // Posts the runnable if this is not called from the main thread
// is not initialized yet.
mHandler.post(action); mHandler.post(action);
} }
} }
} }
}
}
/** /**
* Base class for a TV input session which represents an external device connected to a * Base class for a TV input session which represents an external device connected to a
@@ -1125,13 +1148,15 @@ public abstract class TvInputService extends Service {
mHardwareSession = session; mHardwareSession = session;
SomeArgs args = SomeArgs.obtain(); SomeArgs args = SomeArgs.obtain();
if (session != null) { if (session != null) {
args.arg1 = mProxySession; args.arg1 = HardwareSession.this;
args.arg2 = mProxySessionCallback; args.arg2 = mProxySession;
args.arg3 = session.getToken(); args.arg3 = mProxySessionCallback;
args.arg4 = session.getToken();
} else { } else {
args.arg1 = null; args.arg1 = null;
args.arg2 = mProxySessionCallback; args.arg2 = null;
args.arg3 = null; args.arg3 = mProxySessionCallback;
args.arg4 = null;
onRelease(); onRelease();
} }
mServiceHandler.obtainMessage(ServiceHandler.DO_NOTIFY_SESSION_CREATED, args) mServiceHandler.obtainMessage(ServiceHandler.DO_NOTIFY_SESSION_CREATED, args)
@@ -1269,7 +1294,6 @@ public abstract class TvInputService extends Service {
} }
return; return;
} }
sessionImpl.setSessionCallback(cb);
ITvInputSession stub = new ITvInputSessionWrapper(TvInputService.this, ITvInputSession stub = new ITvInputSessionWrapper(TvInputService.this,
sessionImpl, channel); sessionImpl, channel);
if (sessionImpl instanceof HardwareSession) { if (sessionImpl instanceof HardwareSession) {
@@ -1300,9 +1324,10 @@ public abstract class TvInputService extends Service {
proxySession.mHardwareSessionCallback, mServiceHandler); proxySession.mHardwareSessionCallback, mServiceHandler);
} else { } else {
SomeArgs someArgs = SomeArgs.obtain(); SomeArgs someArgs = SomeArgs.obtain();
someArgs.arg1 = stub; someArgs.arg1 = sessionImpl;
someArgs.arg2 = cb; someArgs.arg2 = stub;
someArgs.arg3 = null; someArgs.arg3 = cb;
someArgs.arg4 = null;
mServiceHandler.obtainMessage(ServiceHandler.DO_NOTIFY_SESSION_CREATED, mServiceHandler.obtainMessage(ServiceHandler.DO_NOTIFY_SESSION_CREATED,
someArgs).sendToTarget(); someArgs).sendToTarget();
} }
@@ -1310,14 +1335,18 @@ public abstract class TvInputService extends Service {
} }
case DO_NOTIFY_SESSION_CREATED: { case DO_NOTIFY_SESSION_CREATED: {
SomeArgs args = (SomeArgs) msg.obj; SomeArgs args = (SomeArgs) msg.obj;
ITvInputSession stub = (ITvInputSession) args.arg1; Session sessionImpl = (Session) args.arg1;
ITvInputSessionCallback cb = (ITvInputSessionCallback) args.arg2; ITvInputSession stub = (ITvInputSession) args.arg2;
IBinder hardwareSessionToken = (IBinder) args.arg3; ITvInputSessionCallback cb = (ITvInputSessionCallback) args.arg3;
IBinder hardwareSessionToken = (IBinder) args.arg4;
try { try {
cb.onSessionCreated(stub, hardwareSessionToken); cb.onSessionCreated(stub, hardwareSessionToken);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "error in onSessionCreated"); Log.e(TAG, "error in onSessionCreated");
} }
if (sessionImpl != null) {
sessionImpl.initialize(cb);
}
args.recycle(); args.recycle();
return; return;
} }