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

Merge "Report normalized package name as default key" into oc-dev

Browse Source 
am: 0560127e9d

Change-Id: Id09f3e8efd951de0a96a604cab336cef0bdcd265
This commit is contained in:
Svetoslav Ganov
2017-05-08 19:07:55 +00:00
committed by android-build-merger
parent 293a0f003a 0560127e9d
commit bf3ad99a38
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,14 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
} }
public static String getDefaultKey(Context context) { 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 @Override

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

@@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.app.Activity; import android.app.Activity;
import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
@@ -41,12 +42,12 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers; import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DefaultAutofillPickerTest { 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) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Activity mActivity; private Activity mActivity;
@@ -81,6 +82,4 @@ public class DefaultAutofillPickerTest {
when(info.loadLabel()).thenReturn("test_app_name"); when(info.loadLabel()).thenReturn("test_app_name");
assertThat(mPicker.getConfirmationMessage(info)).isNotNull(); assertThat(mPicker.getConfirmationMessage(info)).isNotNull();
} }
} }