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

Merge "Make a11y shortcut robust to services w/no summary"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-27 02:19:26 +00:00
committed by Android (Google) Code Review
parent 4f66562c8f 0f9aa4c3a5
commit 0b48b075c8
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
View File

@@ -319,7 +319,7 @@ public class AccessibilityShortcutController {
}
final PackageManager pm = mContext.getPackageManager();
String label = serviceInfo.getResolveInfo().loadLabel(pm).toString();
String summary = serviceInfo.loadSummary(pm).toString();
CharSequence summary = serviceInfo.loadSummary(pm);
if (!includeSummary || TextUtils.isEmpty(summary)) {
return label;
}

11
core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java
View File

@@ -397,6 +397,17 @@ public class AccessibilityShortcutControllerTest {
}
}
@Test
public void testOnAccessibilityShortcut_forServiceWithNoSummary_doesNotCrash()
throws Exception {
configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);
configureValidShortcutService();
when(mServiceInfo.loadSummary(any())).thenReturn(null);
Settings.Secure.putInt(mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 1);
getController().performAccessibilityShortcut();
verify(mAccessibilityManagerService).performAccessibilityShortcut();
}
@Test
public void testOnAccessibilityShortcut_forFrameworkFeature_callsServiceWithNoToast()
throws Exception {