commit bf3ad99a388ba4998bd35800685418e58aff34bb
author Svetoslav Ganov <svetoslavganov@google.com> Mon May 08 19:07:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 08 19:07:55 2017 +0000
tree 2e9b355bef53e43d9e68def49bb412a7784fc4cf
parent 293a0f003a4376ad138b92a76ec73dafbdf396d6
parent 0560127e9d85ebd4fd0de313815414106ec0d5cf

Merge "Report normalized package name as default key" into oc-dev
am: 0560127e9d

Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265

src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java

diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index 718094e..6dcf7b8 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -181,7 +181,14 @@
     }
 
     public static String getDefaultKey(Context context) {
-        return Settings.Secure.getString(context.getContentResolver(), SETTING);
+        String setting = Settings.Secure.getString(context.getContentResolver(), SETTING);
+        if (setting != null) {
+            ComponentName componentName = ComponentName.unflattenFromString(setting);
+            if (componentName != null) {
+                return componentName.flattenToString();
+            }
+        }
+        return null;
     }
 
     @Override

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java

diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index 78d0bda..f564755 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserManager;
 
@@ -41,12 +42,12 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DefaultAutofillPickerTest {
 
-    private static final String TEST_APP_KEY = "123";
+    private static final String TEST_APP_KEY = new ComponentName("foo.bar",
+            "foo.bar.Baz").flattenToString();
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Activity mActivity;
@@ -81,6 +82,4 @@
         when(info.loadLabel()).thenReturn("test_app_name");
         assertThat(mPicker.getConfirmationMessage(info)).isNotNull();
     }
-
-
 }