Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix AppSearchShortcutInfoTest" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-12 02:07:52 +00:00
committed by Android (Google) Code Review
parent da09f19628 8c1026fceb
commit 77ef5a4e45
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/AppSearchShortcutInfo.java
View File

@@ -413,7 +413,10 @@ public class AppSearchShortcutInfo extends GenericDocument {
final int iconResId = (int) getPropertyLong(KEY_ICON_RES_ID);
final String iconResName = getPropertyString(KEY_ICON_RES_NAME);
final String iconUri = getPropertyString(KEY_ICON_URI);
final int disabledReason = Integer.parseInt(getPropertyString(KEY_DISABLED_REASON));
final String disabledReasonString = getPropertyString(KEY_DISABLED_REASON);
final int disabledReason = !TextUtils.isEmpty(disabledReasonString)
? Integer.parseInt(getPropertyString(KEY_DISABLED_REASON))
: ShortcutInfo.DISABLED_REASON_NOT_DISABLED;
final Map<String, Map<String, List<String>>> capabilityBindings =
parseCapabilityBindings(getPropertyStringArray(KEY_CAPABILITY_BINDINGS));
return new ShortcutInfo(

12
core/tests/coretests/src/android/content/pm/AppSearchShortcutInfoTest.java
View File

@@ -24,7 +24,6 @@ import android.content.Intent;
import android.platform.test.annotations.Presubmit;
import android.util.ArraySet;
import org.junit.Ignore;
import org.junit.Test;
import java.util.Set;
@@ -32,7 +31,6 @@ import java.util.Set;
@Presubmit
public class AppSearchShortcutInfoTest {
@Ignore("b/208375334")
@Test
public void testBuildShortcutAndGetValue() {
final String category =
@@ -51,7 +49,7 @@ public class AppSearchShortcutInfoTest {
final Intent shortcutIntent = new Intent(Intent.ACTION_VIEW);
final ShortcutInfo shortcut = new AppSearchShortcutInfo.Builder(/*packageName=*/"", id)
.setActivity(activity)
.setLongLabel(id)
.setShortLabel(id)
.setIconResName(shortcutIconResName)
.setIntent(shortcutIntent)
.setPerson(person)
@@ -64,11 +62,13 @@ public class AppSearchShortcutInfoTest {
assertThat(shortcut.getId()).isEqualTo(id);
assertThat(shortcut.getShortLabel()).isEqualTo(id);
assertThat(shortcut.getIconResName()).isEqualTo(shortcutIconResName);
assertThat(shortcut.getIntent().toString()).isEqualTo(shortcut.toString());
assertThat(shortcut.getIntent().toString()).isEqualTo(shortcutIntent.toString());
assertThat(shortcut.getPersons().length).isEqualTo(1);
assertThat(shortcut.getPersons()[0]).isEqualTo(person);
final Person target = shortcut.getPersons()[0];
assertThat(target.getName()).isEqualTo(person.getName());
assertThat(target.isBot()).isEqualTo(person.isBot());
assertThat(target.isImportant()).isEqualTo(person.isImportant());
assertThat(shortcut.getCategories()).isEqualTo(categorySet);
assertThat(shortcut.getFlags()).isEqualTo(ShortcutInfo.FLAG_LONG_LIVED);
assertThat(shortcut.getActivity()).isEqualTo(activity);
}
}