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

Fix inline extservices implementation for multiuser.

Browse Source 
Fixes: 148428064
Test: atest android.inputmethodservice.cts.hostside.MultiuserTest
Change-Id: I0c4966329189b0c1f141a14755033d795b560885
This commit is contained in:
Adam He
2020-01-29 15:03:09 -08:00
parent 02677c9760
commit 3b56a9bb77
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java
View File

@@ -216,7 +216,7 @@ final class AutofillManagerServiceImpl
updateRemoteAugmentedAutofillService();
final ComponentName componentName = RemoteInlineSuggestionRenderService
.getServiceComponentName(getContext());
.getServiceComponentName(getContext(), mUserId);
if (componentName != null) {
mRemoteInlineSuggestionRenderService = new RemoteInlineSuggestionRenderService(
getContext(), componentName, InlineSuggestionRenderService.SERVICE_INTERFACE,

11
services/autofill/java/com/android/server/autofill/RemoteInlineSuggestionRenderService.java
View File

@@ -20,6 +20,7 @@ import static com.android.server.autofill.Helper.sVerbose;
import android.Manifest;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -86,7 +87,7 @@ final class RemoteInlineSuggestionRenderService extends
}
@Nullable
private static ServiceInfo getServiceInfo(Context context) {
private static ServiceInfo getServiceInfo(Context context, int userId) {
final String packageName =
context.getPackageManager().getServicesSystemSharedLibraryPackageName();
if (packageName == null) {
@@ -96,8 +97,8 @@ final class RemoteInlineSuggestionRenderService extends
final Intent intent = new Intent(InlineSuggestionRenderService.SERVICE_INTERFACE);
intent.setPackage(packageName);
final ResolveInfo resolveInfo = context.getPackageManager().resolveService(intent,
PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
final ResolveInfo resolveInfo = context.getPackageManager().resolveServiceAsUser(intent,
PackageManager.GET_SERVICES | PackageManager.GET_META_DATA, userId);
final ServiceInfo serviceInfo = resolveInfo == null ? null : resolveInfo.serviceInfo;
if (resolveInfo == null || serviceInfo == null) {
Slog.w(TAG, "No valid components found.");
@@ -115,8 +116,8 @@ final class RemoteInlineSuggestionRenderService extends
}
@Nullable
public static ComponentName getServiceComponentName(Context context) {
final ServiceInfo serviceInfo = getServiceInfo(context);
public static ComponentName getServiceComponentName(Context context, @UserIdInt int userId) {
final ServiceInfo serviceInfo = getServiceInfo(context, userId);
if (serviceInfo == null) return null;
final ComponentName componentName = new ComponentName(serviceInfo.packageName,