Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77 (ab80b6ee) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/StorageSettings.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -93,6 +93,8 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
		private StorageSummaryPreference mInternalSummary;
		private static long sTotalInternalStorage;

		private boolean mHasLaunchedPrivateVolumeSettings = false;

		@Override
		public int getMetricsCategory() {
		return MetricsEvent.DEVICEINFO_STORAGE;
		@@ -110,7 +112,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
		final Context context = getActivity();

		mStorageManager = context.getSystemService(StorageManager.class);
		mStorageManager.registerListener(mStorageListener);

		if (sTotalInternalStorage <= 0) {
		sTotalInternalStorage = mStorageManager.getPrimaryStorageSize();
		@@ -231,6 +232,8 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
		if (mInternalCategory.getPreferenceCount() == 2
		&& mExternalCategory.getPreferenceCount() == 0) {
		// Only showing primary internal storage, so just shortcut
		if (!mHasLaunchedPrivateVolumeSettings) {
		mHasLaunchedPrivateVolumeSettings = true;
		final Bundle args = new Bundle();
		args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
		Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),
		@@ -241,6 +244,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
		finish();
		}
		}
		}

		@Override
		public void onResume() {