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

Merge "fix bug 184901520." into sc-dev

Browse Source
This commit is contained in:
Yanchao Su
2021-04-21 01:44:08 +00:00
committed by Android (Google) Code Review
parent b0ea152982 d952496f94
commit 2e2e479ef1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/translation/TranslationManager.java
View File

@@ -24,6 +24,7 @@ import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Parcelable;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SynchronousResultReceiver; import android.os.SynchronousResultReceiver;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -200,8 +201,14 @@ public final class TranslationManager {
if (result.resultCode != STATUS_SYNC_CALL_SUCCESS) { if (result.resultCode != STATUS_SYNC_CALL_SUCCESS) {
return Collections.emptySet(); return Collections.emptySet();
} }
return new ArraySet<>( Parcelable[] parcelables = result.bundle.getParcelableArray(EXTRA_CAPABILITIES);
(TranslationCapability[]) result.bundle.getParcelableArray(EXTRA_CAPABILITIES)); ArraySet<TranslationCapability> capabilities = new ArraySet();
for (Parcelable obj : parcelables) {
if (obj instanceof TranslationCapability) {
capabilities.add((TranslationCapability) obj);
}
}
return capabilities;
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} catch (TimeoutException e) { } catch (TimeoutException e) {