Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e88e8fc8 authored Dec 22, 2016 by Linux Build Service Account

Promotion of android_ui.lnx.2.1.c1-00020.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1062717   Id7b54abf1766ffaf246bca99efdb483abcb99630   Settings: Fix Diagnostics setting crash issue.
1100056   Ie44022e7138d56b93e4c8f3522cdf0771720409f   Settings : Fix settings option list can not show issues

Change-Id: I74d82fa6c84dbaae3ec6503e620f8d4a2be4e4b9
CRs-Fixed: 1100056, 1062717

parents 2e585fb6 8123deb2

src/com/android/settings/PrivacySettings.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -298,6 +298,15 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
		}

		private static boolean collectDiagnosticsEnabled(Context context) {
		return context.getResources().getBoolean(R.bool.config_collect_diagnostics_enabled);
		if (!context.getResources().getBoolean(R.bool.config_collect_diagnostics_enabled)) {
		return false;
		}

		try {
		return context.getPackageManager().getPackageInfo(
		"com.tmobile.pr.mytmobile", 0) != null;
		} catch(PackageManager.NameNotFoundException e) {
		return false;
		}
		}
		}

src/com/android/settings/dashboard/DashboardSummary.java

100644 → 100755

+4 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,10 @@ public class DashboardSummary extends InstrumentedFragment
		return;
		}

		List<DashboardCategory> categories =
		((SettingsActivity) getActivity()).getDashboardCategories();
		mAdapter.setCategories(categories);

		// recheck to see if any suggestions have been changed.
		new SuggestionLoader().execute();
		}