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

Merge "TIAF-TIF broadcastinfo flow"

Browse Source
This commit is contained in:
Yixiao Luo
2021-11-30 18:02:59 +00:00
committed by Android (Google) Code Review
parent 05d7ea735a b488c1baf4
commit 0451ef6f81
9 changed files with 144 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/tv/BroadcastInfoResponse.java
View File

@@ -46,6 +46,10 @@ public final class BroadcastInfoResponse implements Parcelable {
requestId = source.readInt();
}
public int getRequestId() {
return requestId;
}
@Override
public int describeContents() {
return 0;

9
media/java/android/media/tv/TvInputManager.java
View File

@@ -657,13 +657,6 @@ public final class TvInputManager {
*/
void onError(Session session, @TvInputManager.RecordingError int error) {
}
/**
* @param session
* @param response
*/
public void onBroadcastInfoResponse(Session session, BroadcastInfoResponse response) {
}
}
private static final class SessionCallbackRecord {
@@ -848,7 +841,7 @@ public final class TvInputManager {
mHandler.post(new Runnable() {
@Override
public void run() {
mSessionCallback.onBroadcastInfoResponse(mSession, response);
mSession.getIAppSession().notifyBroadcastInfoResponse(response);
}
});
}

2
media/java/android/media/tv/interactive/ITvIAppClient.aidl
View File

@@ -15,6 +15,7 @@
*/
package android.media.tv.interactive;
import android.media.tv.BroadcastInfoRequest;
import android.view.InputChannel;
@@ -27,4 +28,5 @@ oneway interface ITvIAppClient {
void onSessionCreated(in String iAppServiceId, IBinder token, in InputChannel channel, int seq);
void onSessionReleased(int seq);
void onLayoutSurface(int left, int top, int right, int bottom, int seq);
void onBroadcastInfoRequest(in BroadcastInfoRequest request, int seq);
}

3
media/java/android/media/tv/interactive/ITvIAppManager.aidl
View File

@@ -19,6 +19,7 @@ package android.media.tv.interactive;
import android.media.tv.interactive.ITvIAppClient;
import android.media.tv.interactive.ITvIAppManagerCallback;
import android.media.tv.interactive.TvIAppInfo;
import android.media.tv.BroadcastInfoResponse;
import android.view.Surface;
/**
@@ -34,6 +35,8 @@ interface ITvIAppManager {
void setSurface(in IBinder sessionToken, in Surface surface, int userId);
void dispatchSurfaceChanged(in IBinder sessionToken, int format, int width, int height,
int userId);
void notifyBroadcastInfoResponse(in IBinder sessionToken, in BroadcastInfoResponse response,
int UserId);
void registerCallback(in ITvIAppManagerCallback callback, int userId);
void unregisterCallback(in ITvIAppManagerCallback callback, int userId);

2
media/java/android/media/tv/interactive/ITvIAppSession.aidl
View File

@@ -17,6 +17,7 @@
package android.media.tv.interactive;
import android.view.Surface;
import android.media.tv.BroadcastInfoResponse;
/**
* Sub-interface of ITvIAppService.aidl which is created per session and has its own context.
@@ -27,4 +28,5 @@ oneway interface ITvIAppSession {
void release();
void setSurface(in Surface surface);
void dispatchSurfaceChanged(int format, int width, int height);
void notifyBroadcastInfoResponse(in BroadcastInfoResponse response);
}

2
media/java/android/media/tv/interactive/ITvIAppSessionCallback.aidl
View File

@@ -17,6 +17,7 @@
package android.media.tv.interactive;
import android.media.tv.interactive.ITvIAppSession;
import android.media.tv.BroadcastInfoRequest;
/**
* Helper interface for ITvIAppSession to allow TvIAppService to notify the system service when
@@ -26,4 +27,5 @@ import android.media.tv.interactive.ITvIAppSession;
oneway interface ITvIAppSessionCallback {
void onSessionCreated(in ITvIAppSession session);
void onLayoutSurface(int left, int top, int right, int bottom);
void onBroadcastInfoRequest(in BroadcastInfoRequest request);
}

40
media/java/android/media/tv/interactive/TvIAppManager.java
View File

@@ -20,6 +20,8 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemService;
import android.content.Context;
import android.media.tv.BroadcastInfoRequest;
import android.media.tv.BroadcastInfoResponse;
import android.media.tv.TvInputManager;
import android.os.Handler;
import android.os.IBinder;
@@ -117,6 +119,18 @@ public final class TvIAppManager {
record.postLayoutSurface(left, top, right, bottom);
}
}
@Override
public void onBroadcastInfoRequest(BroadcastInfoRequest request, int seq) {
synchronized (mSessionCallbackRecordMap) {
SessionCallbackRecord record = mSessionCallbackRecordMap.get(seq);
if (record == null) {
Log.e(TAG, "Callback not found for seq " + seq);
return;
}
record.postBroadcastInfoRequest(request);
}
}
};
ITvIAppManagerCallback managerCallback = new ITvIAppManagerCallback.Stub() {
// TODO: handle IApp service state changes
@@ -485,6 +499,23 @@ public final class TvIAppManager {
}
}
/**
* Notifies of any broadcast info response passed in from TIS.
*
* @param response response passed in from TIS.
*/
public void notifyBroadcastInfoResponse(BroadcastInfoResponse response) {
if (mToken == null) {
Log.w(TAG, "The session has been already released");
return;
}
try {
mService.notifyBroadcastInfoResponse(mToken, response, mUserId);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Releases this session.
*/
@@ -744,6 +775,15 @@ public final class TvIAppManager {
}
});
}
void postBroadcastInfoRequest(final BroadcastInfoRequest request) {
mHandler.post(new Runnable() {
@Override
public void run() {
mSession.getInputSession().requestBroadcastInfo(request);
}
});
}
}
/**

47
media/java/android/media/tv/interactive/TvIAppService.java
View File

@@ -23,6 +23,8 @@ import android.annotation.SuppressLint;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.media.tv.BroadcastInfoRequest;
import android.media.tv.BroadcastInfoResponse;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
@@ -184,6 +186,14 @@ public abstract class TvIAppService extends Service {
public void onSurfaceChanged(int format, int width, int height) {
}
/**
* Called when a broadcast info response is received from TIS.
*
* @param response response received from TIS.
*/
public void onNotifyBroadcastInfoResponse(BroadcastInfoResponse response) {
}
/**
* Releases TvIAppService session.
* @hide
@@ -278,6 +288,26 @@ public abstract class TvIAppService extends Service {
});
}
public void requestBroadcastInfo(@NonNull final BroadcastInfoRequest request) {
executeOrPostRunnableOnMainThread(new Runnable() {
@MainThread
@Override
public void run() {
try {
if (DEBUG) {
Log.d(TAG, "requestBroadcastInfo (requestId="
+ request.getRequestId() + ")");
}
if (mSessionCallback != null) {
mSessionCallback.onBroadcastInfoRequest(request);
}
} catch (RemoteException e) {
Log.w(TAG, "error in requestBroadcastInfo", e);
}
}
});
}
void startIApp() {
onStartIApp();
}
@@ -356,6 +386,18 @@ public abstract class TvIAppService extends Service {
onSurfaceChanged(format, width, height);
}
/**
*
* Calls {@link #notifyBroadcastInfoResponse}.
*/
void notifyBroadcastInfoResponse(BroadcastInfoResponse response) {
if (DEBUG) {
Log.d(TAG, "notifyBroadcastInfoResponse (requestId="
+ response.getRequestId() + ")");
}
onNotifyBroadcastInfoResponse(response);
}
private void executeOrPostRunnableOnMainThread(Runnable action) {
synchronized (mLock) {
if (mSessionCallback == null) {
@@ -411,6 +453,11 @@ public abstract class TvIAppService extends Service {
mSessionImpl.dispatchSurfaceChanged(format, width, height);
}
@Override
public void notifyBroadcastInfoResponse(BroadcastInfoResponse response) {
mSessionImpl.notifyBroadcastInfoResponse(response);
}
private final class TvIAppEventReceiver extends InputEventReceiver {
TvIAppEventReceiver(InputChannel inputChannel, Looper looper) {
super(inputChannel, looper);

43
services/core/java/com/android/server/tv/interactive/TvIAppManagerService.java
View File

@@ -28,6 +28,8 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo;
import android.media.tv.BroadcastInfoRequest;
import android.media.tv.BroadcastInfoResponse;
import android.media.tv.interactive.ITvIAppClient;
import android.media.tv.interactive.ITvIAppManager;
import android.media.tv.interactive.ITvIAppManagerCallback;
@@ -744,6 +746,29 @@ public class TvIAppManagerService extends SystemService {
}
}
@Override
public void notifyBroadcastInfoResponse(IBinder sessionToken,
BroadcastInfoResponse response, int userId) {
final int callingUid = Binder.getCallingUid();
final int callingPid = Binder.getCallingPid();
final int resolvedUserId = resolveCallingUserId(callingPid, callingUid, userId,
"notifyBroadcastInfoResponse");
final long identity = Binder.clearCallingIdentity();
try {
synchronized (mLock) {
try {
SessionState sessionState = getSessionStateLocked(sessionToken, callingUid,
resolvedUserId);
getSessionLocked(sessionState).notifyBroadcastInfoResponse(response);
} catch (RemoteException | SessionNotFoundException e) {
Slogf.e(TAG, "error in notifyBroadcastInfoResponse", e);
}
}
} finally {
Binder.restoreCallingIdentity(identity);
}
}
@Override
public void registerCallback(final ITvIAppManagerCallback callback, int userId) {
int callingPid = Binder.getCallingPid();
@@ -1190,6 +1215,24 @@ public class TvIAppManagerService extends SystemService {
}
}
@Override
public void onBroadcastInfoRequest(BroadcastInfoRequest request) {
synchronized (mLock) {
if (DEBUG) {
Slogf.d(TAG, "onBroadcastInfoRequest (requestId="
+ request.getRequestId() + ")");
}
if (mSessionState.mSession == null || mSessionState.mClient == null) {
return;
}
try {
mSessionState.mClient.onBroadcastInfoRequest(request, mSessionState.mSeq);
} catch (RemoteException e) {
Slogf.e(TAG, "error in onBroadcastInfoRequest", e);
}
}
}
@GuardedBy("mLock")
private boolean addSessionTokenToClientStateLocked(ITvIAppSession session) {
try {