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

Merge "transcoding: Do not throw exception in registerClient." into sc-dev

Browse Source
This commit is contained in:
Hangyu Kuang
2021-02-20 05:45:57 +00:00
committed by Android (Google) Code Review
parent 6aca8c36e0 4ee60be4db
commit 8495870326
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apex/media/framework/java/android/media/MediaTranscodeManager.java
View File

@@ -295,8 +295,8 @@ public final class MediaTranscodeManager {
/* ignore */
}
}
throw new UnsupportedOperationException("Failed to connect to MediaTranscoding service");
Log.w(TAG, "Failed to get service");
return null;
}
/*
@@ -463,8 +463,7 @@ public final class MediaTranscodeManager {
}
};
private ITranscodingClient registerClient(IMediaTranscodingService service)
throws UnsupportedOperationException {
private ITranscodingClient registerClient(IMediaTranscodingService service) {
synchronized (mLock) {
try {
// Registers the client with MediaTranscoding service.
@@ -476,13 +475,12 @@ public final class MediaTranscodeManager {
if (mTranscodingClient != null) {
mTranscodingClient.asBinder().linkToDeath(() -> onClientDied(), /* flags */ 0);
}
return mTranscodingClient;
} catch (RemoteException re) {
Log.e(TAG, "Failed to register new client due to exception " + re);
} catch (Exception ex) {
Log.e(TAG, "Failed to register new client due to exception " + ex);
mTranscodingClient = null;
}
}
throw new UnsupportedOperationException("Failed to register new client");
return mTranscodingClient;
}
/**
@@ -495,7 +493,9 @@ public final class MediaTranscodeManager {
mUid = Os.getuid();
mPid = Os.getpid();
IMediaTranscodingService service = getService(false /*retry*/);
mTranscodingClient = registerClient(service);
if (service != null) {
mTranscodingClient = registerClient(service);
}
}
public static final class TranscodingRequest {
@@ -1567,6 +1567,10 @@ public final class MediaTranscodeManager {
if (mTranscodingClient == null) {
// Try to register with the service again.
IMediaTranscodingService service = getService(false /*retry*/);
if (service == null) {
throw new MediaTranscodingException.ServiceNotAvailableException(
"Service rebooting. Try again later");
}
mTranscodingClient = registerClient(service);
// If still fails, throws an exception to tell client to try later.
if (mTranscodingClient == null) {