Merge "Autofill compat - Settings"

This commit is contained in:
TreeHugger Robot
2018-02-05 09:55:29 +00:00
committed by Android (Google) Code Review
3 changed files with 6 additions and 11 deletions

View File

@@ -251,16 +251,16 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
static final class AutofillSettingIntentProvider implements SettingIntentProvider {
private final String mSelectedKey;
private final PackageManager mPackageManager;
private final Context mContext;
public AutofillSettingIntentProvider(PackageManager packageManager, String key) {
public AutofillSettingIntentProvider(Context context, String key) {
mSelectedKey = key;
mPackageManager = packageManager;
mContext = context;
}
@Override
public Intent getIntent() {
final List<ResolveInfo> resolveInfos = mPackageManager.queryIntentServices(
final List<ResolveInfo> resolveInfos = mContext.getPackageManager().queryIntentServices(
AUTOFILL_PROBE, PackageManager.GET_META_DATA);
for (ResolveInfo resolveInfo : resolveInfos) {
@@ -270,7 +270,7 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
if (TextUtils.equals(mSelectedKey, flattenKey)) {
final String settingsActivity;
try {
settingsActivity = new AutofillServiceInfo(mPackageManager, serviceInfo)
settingsActivity = new AutofillServiceInfo(mContext, serviceInfo)
.getSettingsActivity();
} catch (SecurityException e) {
// Service does not declare the proper permission, ignore it.

View File

@@ -53,7 +53,7 @@ public class DefaultAutofillPreferenceController extends DefaultAppPreferenceCon
}
final DefaultAutofillPicker.AutofillSettingIntentProvider intentProvider =
new DefaultAutofillPicker.AutofillSettingIntentProvider(
mPackageManager.getPackageManager(), info.getKey());
mContext, info.getKey());
return intentProvider.getIntent();
}