Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev (c05c8617) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deletionhelper/AppDeletionPreference.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.text.format.Formatter;
		import android.view.View;
		import android.widget.Switch;
		import android.widget.TextView;
		import com.android.settings.deletionhelper.AppStateUsageStatsBridge.UsageStatsState;
		import com.android.settings.R;

		import com.android.settingslib.applications.ApplicationsState;
		@@ -72,18 +73,18 @@ public class AppDeletionPreference extends SwitchPreference {
		return;
		}

		long daysSinceLastUse = (long) mEntry.extraInfo;
		UsageStatsState extraData = (UsageStatsState) mEntry.extraInfo;
		String fileSize = Formatter.formatFileSize(mContext, mEntry.size);
		if (daysSinceLastUse == AppStateUsageStatsBridge.NEVER_USED) {
		if (extraData.daysSinceLastUse == AppStateUsageStatsBridge.NEVER_USED) {
		summary.setText(mContext.getString(R.string.deletion_helper_app_summary_never_used,
		fileSize));
		} else if (daysSinceLastUse == AppStateUsageStatsBridge.UNKNOWN_LAST_USE) {
		} else if (extraData.daysSinceLastUse == AppStateUsageStatsBridge.UNKNOWN_LAST_USE) {
		summary.setText(mContext.getString(R.string.deletion_helper_app_summary_unknown_used,
		fileSize));
		} else {
		summary.setText(mContext.getString(R.string.deletion_helper_app_summary,
		fileSize,
		daysSinceLastUse));
		extraData.daysSinceLastUse));
		}
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,10 @@ public class AppStateUsageStatsBridge extends AppStateBaseBridge {
		}
		};

		private class UsageStatsState {
		/**
		* UsageStatsState contains the days since the last use and first install of a given app.
		*/
		public static class UsageStatsState {
		public long daysSinceLastUse;
		public long daysSinceFirstInstall;