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

Merge "Send battery reports using ApplicationErrorReport.BatteryInfo."

Browse Source
This commit is contained in:
Jacek Surazski
2010-02-27 04:00:59 -08:00
committed by Android (Google) Code Review
parent 4037c7f27c 456dc95fee
commit 23c28c2108
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -34,14 +34,12 @@ import android.os.Bundle;
import android.os.Process; import android.os.Process;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.android.settings.InstalledAppDetails; import com.android.settings.InstalledAppDetails;
import com.android.settings.ManageApplications; import com.android.settings.ManageApplications;
import com.android.settings.R; import com.android.settings.R;
@@ -415,10 +413,6 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
private void reportBatteryUse() { private void reportBatteryUse() {
if (mPackages == null) return; if (mPackages == null) return;
final Intent intent = getIntent();
final int percentage = intent.getIntExtra(EXTRA_PERCENT, 1);
final long duration = intent.getLongExtra(EXTRA_USAGE_DURATION, 0);
ApplicationErrorReport report = new ApplicationErrorReport(); ApplicationErrorReport report = new ApplicationErrorReport();
report.type = ApplicationErrorReport.TYPE_BATTERY; report.type = ApplicationErrorReport.TYPE_BATTERY;
report.packageName = mPackages[0]; report.packageName = mPackages[0];
@@ -427,17 +421,14 @@ public class PowerUsageDetail extends Activity implements Button.OnClickListener
report.time = System.currentTimeMillis(); report.time = System.currentTimeMillis();
report.systemApp = (mApp.flags & ApplicationInfo.FLAG_SYSTEM) != 0; report.systemApp = (mApp.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
StringBuilder builder = new StringBuilder(); final Intent intent = getIntent();
builder.append("Application used " + percentage + "% of battery over " ApplicationErrorReport.BatteryInfo batteryInfo = new ApplicationErrorReport.BatteryInfo();
+ Utils.formatElapsedTime(this, duration / 1000)); batteryInfo.usagePercent = intent.getIntExtra(EXTRA_PERCENT, 1);
builder.append('\n'); batteryInfo.durationMicros = intent.getLongExtra(EXTRA_USAGE_DURATION, 0);
builder.append(intent.getStringExtra(EXTRA_REPORT_DETAILS)); batteryInfo.usageDetails = intent.getStringExtra(EXTRA_REPORT_DETAILS);
builder.append('\n'); batteryInfo.checkinDetails = intent.getStringExtra(EXTRA_REPORT_CHECKIN_DETAILS);
builder.append("----------------------------------------------"); report.batteryInfo = batteryInfo;
builder.append('\n');
builder.append(intent.getStringExtra(EXTRA_REPORT_CHECKIN_DETAILS));
builder.append('\n');
report.batteryText = builder.toString();
Intent result = new Intent(Intent.ACTION_APP_ERROR); Intent result = new Intent(Intent.ACTION_APP_ERROR);
result.setComponent(mInstaller); result.setComponent(mInstaller);
result.putExtra(Intent.EXTRA_BUG_REPORT, report); result.putExtra(Intent.EXTRA_BUG_REPORT, report);