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

Settings crash if android:settingsActivity AccessibilityServiceInfo XML is incorrect.

Browse Source 
1. The code was not checking whether the settings activity exists
   before passing in to the SettingCheckboxClass.

bug:5038386

Change-Id: Iba4f5e2e5f6f3ed9c0fed5a5103d2e9a34399d97
This commit is contained in:
Svetoslav Ganov
2011-07-17 10:08:34 -07:00
parent e686c4dec6
commit abc95ee822
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,7 @@ import java.util.Map;
*/
public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
Preference.OnPreferenceChangeListener {
private static final String DEFAULT_SCREENREADER_MARKET_LINK =
"market://search?q=pname:com.google.android.marvin.talkback";
@@ -362,7 +363,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
private void persistEnabledAccessibilityServices() {
StringBuilder builder = new StringBuilder(256);
int firstEnabled = -1;
for (String key : mAccessibilityServices.keySet()) {
CheckBoxPreference preference = (CheckBoxPreference) findPreference(key);
if (preference.isChecked()) {
@@ -399,16 +399,18 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
String key = accessibilityServiceInfo.getId();
if (mAccessibilityServices.put(key, accessibilityServiceInfo) == null) {
String settingsActivityName = accessibilityServiceInfo.getSettingsActivityName();
SettingsCheckBoxPreference preference = null;
Intent settingsIntent = null;
String settingsActivityName = accessibilityServiceInfo.getSettingsActivityName();
if (!TextUtils.isEmpty(settingsActivityName)) {
String packageName = accessibilityServiceInfo.getResolveInfo()
.serviceInfo.packageName;
settingsIntent = new Intent(Intent.ACTION_MAIN);
settingsIntent.setClassName(packageName, settingsActivityName);
settingsIntent.setClassName(
accessibilityServiceInfo.getResolveInfo().serviceInfo.packageName,
settingsActivityName);
}
SettingsCheckBoxPreference preference = new SettingsCheckBoxPreference(
getActivity(), settingsIntent);
preference = new SettingsCheckBoxPreference(getActivity(), settingsIntent);
preference.setKey(key);
preference.setOrder(i);
ServiceInfo serviceInfo = accessibilityServiceInfo.getResolveInfo().serviceInfo;