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

Merge "Fix the translation doesn't work" into udc-dev am: 83b5bfc0eb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22085791

Change-Id: I12f94dbb80acc7986e808475844275bcc3ef542c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joanne Chung
2023-03-16 03:02:15 +00:00
committed by Automerger Merge Worker
parent ef889a1c6a 83b5bfc0eb
commit c7d320e62e
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java
View File

@@ -37,6 +37,7 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.IRemoteCallback; import android.os.IRemoteCallback;
@@ -160,11 +161,20 @@ final class TranslationManagerServiceImpl extends
return null; return null;
} }
final ComponentName serviceComponent = ComponentName.unflattenFromString(serviceName); final ComponentName serviceComponent = ComponentName.unflattenFromString(serviceName);
if (!isServiceAvailableForUser(serviceComponent)) { boolean isServiceAvailableForUser;
final long identity = Binder.clearCallingIdentity();
try {
isServiceAvailableForUser = isServiceAvailableForUser(serviceComponent);
if (mMaster.verbose) { if (mMaster.verbose) {
Slog.v(TAG, "ensureRemoteServiceLocked(): " + serviceComponent Slog.v(TAG, "ensureRemoteServiceLocked(): isServiceAvailableForUser="
+ " is not available,"); + isServiceAvailableForUser);
} }
} finally {
Binder.restoreCallingIdentity(identity);
}
if (!isServiceAvailableForUser) {
Slog.w(TAG, "ensureRemoteServiceLocked(): " + serviceComponent
+ " is not available,");
return null; return null;
} }
mRemoteTranslationService = new RemoteTranslationService(getContext(), serviceComponent, mRemoteTranslationService = new RemoteTranslationService(getContext(), serviceComponent,