Merge "Fix memory leak on Accessibility screen" into main (1c78d484) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/AccessibilitySettings.java

+5 −10

Original line number	Diff line number	Diff line
		@@ -148,9 +148,7 @@ public class AccessibilitySettings extends DashboardFragment implements

		private final Map<String, PreferenceCategory> mCategoryToPrefCategoryMap =
		new ArrayMap<>();
		@VisibleForTesting
		final Map<Preference, PreferenceCategory> mServicePreferenceToPreferenceCategoryMap =
		new ArrayMap<>();
		private final List<Preference> mServicePreferences = new ArrayList<>();
		private final Map<ComponentName, PreferenceCategory> mPreBundledServiceComponentToCategoryMap =
		new ArrayMap<>();

		@@ -372,13 +370,10 @@ public class AccessibilitySettings extends DashboardFragment implements
		// Since services category is auto generated we have to do a pass
		// to generate it since services can come and go and then based on
		// the global accessibility state to decided whether it is enabled.
		final ArrayList<Preference> servicePreferences =
		new ArrayList<>(mServicePreferenceToPreferenceCategoryMap.keySet());
		for (int i = 0; i < servicePreferences.size(); i++) {
		Preference service = servicePreferences.get(i);
		PreferenceCategory category = mServicePreferenceToPreferenceCategoryMap.get(service);
		category.removePreference(service);
		for (Preference service : mServicePreferences) {
		service.getParent().removePreference(service);
		}
		mServicePreferences.clear();

		initializePreBundledServicesMapFromArray(CATEGORY_SCREEN_READER,
		R.array.config_preinstalled_screen_reader_services);
		@@ -423,7 +418,7 @@ public class AccessibilitySettings extends DashboardFragment implements
		prefCategory = mPreBundledServiceComponentToCategoryMap.get(componentName);
		}
		prefCategory.addPreference(preference);
		mServicePreferenceToPreferenceCategoryMap.put(preference, prefCategory);
		mServicePreferences.add(preference);
		}

		// Update the order of all the category according to the order defined in xml file.

tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -503,9 +503,8 @@ public class AccessibilitySettingsTest {
		}

		private String getPreferenceCategory(ComponentName componentName) {
		return mFragment.mServicePreferenceToPreferenceCategoryMap.get(
		mFragment.getPreferenceScreen().findPreference(
		componentName.flattenToString())).getKey();
		return mFragment.getPreferenceScreen().findPreference(
		componentName.flattenToString()).getParent().getKey();
		}

		private AccessibilityServiceInfo getMockAccessibilityServiceInfo(ComponentName componentName) {