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

Merge "Fix broken SimpleSaveActivityTest#testTapUrlSpanOnCustomDescription_thenTapBack"

Browse Source
This commit is contained in:
Joanne Chung
2020-02-04 02:46:20 +00:00
committed by Android (Google) Code Review
parent 056a5ca9d2 ebfda7f218
commit 74529f0668
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/autofill/java/com/android/server/autofill/ui/SaveUi.java
View File

@@ -27,6 +27,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentSender;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.metrics.LogMaker;
@@ -187,7 +188,10 @@ final class SaveUi {
context = new ContextThemeWrapper(context, mThemeId) {
@Override
public void startActivity(Intent intent) {
if (intent.resolveActivity(getPackageManager()) == null) {
if (resolveActivity(intent) == null) {
if (sDebug) {
Slog.d(TAG, "Can not startActivity for save UI with intent=" + intent);
}
return;
}
intent.putExtra(AutofillManager.EXTRA_RESTORE_CROSS_ACTIVITY, true);
@@ -199,6 +203,16 @@ final class SaveUi {
// Apply restore mechanism
startIntentSenderWithRestore(p, intent);
}
private ComponentName resolveActivity(Intent intent) {
final PackageManager packageManager = getPackageManager();
final ComponentName componentName = intent.resolveActivity(packageManager);
if (componentName != null) {
return componentName;
}
intent.addFlags(Intent.FLAG_ACTIVITY_MATCH_EXTERNAL);
return intent.resolveActivity(packageManager);
}
};
final LayoutInflater inflater = LayoutInflater.from(context);
final View view = inflater.inflate(R.layout.autofill_save, null);