Merge "Fixed autofill forged package check to only compare the package name." into pi-dev

This commit is contained in:
TreeHugger Robot
2018-04-19 03:10:35 +00:00
committed by Android (Google) Code Review

View File

@@ -271,7 +271,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
// Sanitize structure before it's sent to service.
final ComponentName componentNameFromApp = structure.getActivityComponent();
if (!mComponentName.equals(componentNameFromApp)) {
if (componentNameFromApp == null || !mComponentName.getPackageName()
.equals(componentNameFromApp.getPackageName())) {
Slog.w(TAG, "Activity " + mComponentName + " forged different component on "
+ "AssistStructure: " + componentNameFromApp);
structure.setActivityComponent(mComponentName);