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

am 6b8c7e7c: am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev

Browse Source 
* commit '6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5':
  Settings crashing if there are no installed accessibility services.
This commit is contained in:
Svetoslav
2013-05-08 15:05:28 -07:00
committed by Android Git Automerger
parent 3c573d3af5 6b8c7e7c33
commit 17c2e0e605
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/AccessibilitySettings.java
View File

@@ -579,11 +579,16 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
} }
private void loadInstalledServices() { private void loadInstalledServices() {
Set<ComponentName> installedServices = sInstalledServices;
installedServices.clear();
List<AccessibilityServiceInfo> installedServiceInfos = List<AccessibilityServiceInfo> installedServiceInfos =
AccessibilityManager.getInstance(getActivity()) AccessibilityManager.getInstance(getActivity())
.getInstalledAccessibilityServiceList(); .getInstalledAccessibilityServiceList();
Set<ComponentName> installedServices = sInstalledServices; if (installedServiceInfos == null) {
installedServices.clear(); return;
}
final int installedServiceInfoCount = installedServiceInfos.size(); final int installedServiceInfoCount = installedServiceInfos.size();
for (int i = 0; i < installedServiceInfoCount; i++) { for (int i = 0; i < installedServiceInfoCount; i++) {
ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo(); ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();