Merge "Refactoring of auto fill - lifecycle, auth, improvements - Settings"

This commit is contained in:
TreeHugger Robot
2017-02-06 05:47:40 +00:00
committed by Android (Google) Code Review

View File

@@ -17,14 +17,12 @@
package com.android.settings.applications; package com.android.settings.applications;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.ActivityManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; 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.Parcelable;
import android.provider.Settings; import android.provider.Settings;
import android.service.autofill.AutoFillService; import android.service.autofill.AutoFillService;
import android.service.autofill.AutoFillServiceInfo; import android.service.autofill.AutoFillServiceInfo;
@@ -130,11 +128,7 @@ public class DefaultAutoFillPreference extends AppListPreferenceWithSettings {
for (ResolveInfo resolveInfo : resolveInfos) { for (ResolveInfo resolveInfo : resolveInfos) {
ServiceInfo serviceInfo = resolveInfo.serviceInfo; ServiceInfo serviceInfo = resolveInfo.serviceInfo;
AutoFillServiceInfo info = new AutoFillServiceInfo(pm, serviceInfo); AutoFillServiceInfo info = new AutoFillServiceInfo(pm, serviceInfo);
if (info.getParseError() == null) { infos.add(info);
infos.add(info);
} else {
Log.i(TAG, "Invalid AutoFillService " + serviceInfo + ": " + info.getParseError());
}
} }
return infos; return infos;
} }