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

Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev

Browse Source 
am: c05c8617bc

* commit 'c05c8617bc1cb292b67b8c8d40723846914c20fc':
  Fix a crash where the deletion helper crashes when app sizes load.

Change-Id: I0f32008388d8f462df95d1655f43869031be0c20
This commit is contained in:
Daniel Nishi
2016-05-24 15:45:58 +00:00
committed by android-build-merger
parent f1cbf0a3f2 c05c8617bc
commit 11b6563cb6
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/deletionhelper/AppDeletionPreference.java
View File

@@ -22,6 +22,7 @@ import android.text.format.Formatter;
import android.view.View; import android.view.View;
import android.widget.Switch; import android.widget.Switch;
import android.widget.TextView; import android.widget.TextView;
import com.android.settings.deletionhelper.AppStateUsageStatsBridge.UsageStatsState;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
@@ -72,18 +73,18 @@ public class AppDeletionPreference extends SwitchPreference {
return; return;
} }
long daysSinceLastUse = (long) mEntry.extraInfo; UsageStatsState extraData = (UsageStatsState) mEntry.extraInfo;
String fileSize = Formatter.formatFileSize(mContext, mEntry.size); 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, summary.setText(mContext.getString(R.string.deletion_helper_app_summary_never_used,
fileSize)); 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, summary.setText(mContext.getString(R.string.deletion_helper_app_summary_unknown_used,
fileSize)); fileSize));
} else { } else {
summary.setText(mContext.getString(R.string.deletion_helper_app_summary, summary.setText(mContext.getString(R.string.deletion_helper_app_summary,
fileSize, fileSize,
daysSinceLastUse)); extraData.daysSinceLastUse));
} }
} }

5
src/com/android/settings/deletionhelper/AppStateUsageStatsBridge.java
View File

@@ -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 daysSinceLastUse;
public long daysSinceFirstInstall; public long daysSinceFirstInstall;