PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autofill compat - Settings

Browse Source 
Test: manully can change autofill serivces

Update settings due to API signature change.

Change-Id: Idaf00fdbe7cb07cb174f3bbd8edcfa95ac734764
This commit is contained in:
Svetoslav Ganov
2018-02-04 21:22:00 -08:00
parent d1afc3e42e
commit c21cfe9ea2
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
View File

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

2
src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
View File

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

5
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
View File

@@ -104,10 +104,5 @@ public class DefaultAutofillPreferenceControllerTest {
final DefaultAppInfo info = mController.getDefaultAppInfo(); final DefaultAppInfo info = mController.getDefaultAppInfo();
assertThat(info).isNotNull(); assertThat(info).isNotNull();
mController.getSettingIntent(info);
verify(mPackageManager.getPackageManager()).queryIntentServices(
DefaultAutofillPicker.AUTOFILL_PROBE, PackageManager.GET_META_DATA);
} }
} }