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

Use AFM.getAutofillServiceComponentName() in Settings's AutofillPickerTrampolineActivity

Browse Source 
Fixes: 80189659
Test: m -j Settings && adb sync && adb shell kill `pid com.android.settings` && adb shell am start com.android.settings

Change-Id: I3dc4ebd1a8ffb26b131905c3fc4ed59567049925
This commit is contained in:
Adam He
2018-09-25 11:34:19 -07:00
parent c08dcbd700
commit a8192e1cb8
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.java
View File

@@ -14,9 +14,9 @@
package com.android.settings.applications.autofill; package com.android.settings.applications.autofill;
import android.app.Activity; import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle;
import android.view.autofill.AutofillManager; import android.view.autofill.AutofillManager;
import com.android.settings.applications.defaultapps.DefaultAutofillPicker; import com.android.settings.applications.defaultapps.DefaultAutofillPicker;
@@ -34,23 +34,23 @@ public class AutofillPickerTrampolineActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// First check if the current user's service already belongs to the app... final AutofillManager afm = getSystemService(AutofillManager.class);
final Intent intent = getIntent();
final String packageName = intent.getData().getSchemeSpecificPart(); // First check if the Autofill is available for the current user...
final String currentService = DefaultAutofillPicker.getDefaultKey( if (afm == null || !afm.hasAutofillFeature() || !afm.isAutofillSupported()) {
this, UserHandle.myUserId()); // ... and fail right away if it is not.
if (currentService != null && currentService.startsWith(packageName)) { setResult(RESULT_CANCELED);
// ...and succeed right away if it does.
setResult(RESULT_OK);
finish(); finish();
return; return;
} }
// Then check if the Autofill is available for the current user... // Then check if the current user's service already belongs to the app...
final AutofillManager afm = getSystemService(AutofillManager.class); final Intent intent = getIntent();
if (afm == null || !afm.hasAutofillFeature() || !afm.isAutofillSupported()) { final String packageName = intent.getData().getSchemeSpecificPart();
// ... and fail right away if it is not. final ComponentName currentService = afm.getAutofillServiceComponentName();
setResult(RESULT_CANCELED); if (currentService != null && currentService.getPackageName().equals(packageName)) {
// ...and succeed right away if it does.
setResult(RESULT_OK);
finish(); finish();
return; return;
} }