Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only show progress log every 10%" into oc-dev

Browse Source
This commit is contained in:
Makoto Onuki
2017-04-26 23:18:43 +00:00
committed by Android (Google) Code Review
parent a16d465a18 c6cf2b8072
commit b4e05340e4
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -172,6 +172,9 @@ public class BugreportProgressService extends Service {
private static final int CAPPED_PROGRESS = 9900; private static final int CAPPED_PROGRESS = 9900;
private static final int CAPPED_MAX = 10000; private static final int CAPPED_MAX = 10000;
/** Show the progress log every this percent. */
private static final int LOG_PROGRESS_STEP = 10;
/** /**
* Delay before a screenshot is taken. * Delay before a screenshot is taken.
* <p> * <p>
@@ -226,6 +229,8 @@ public class BugreportProgressService extends Service {
private boolean mIsWatch; private boolean mIsWatch;
private int mLastProgressPercent;
@Override @Override
public void onCreate() { public void onCreate() {
mContext = getApplicationContext(); mContext = getApplicationContext();
@@ -512,8 +517,15 @@ public class BugreportProgressService extends Service {
builder.setContentIntent(infoPendingIntent) builder.setContentIntent(infoPendingIntent)
.setActions(infoAction, screenshotAction, cancelAction); .setActions(infoAction, screenshotAction, cancelAction);
} }
// Show a debug log, every LOG_PROGRESS_STEP percent.
final int progress = (info.progress * 100) / info.max;
if ((info.progress == 0) || (info.progress >= 100) ||
((progress / LOG_PROGRESS_STEP) != (mLastProgressPercent / LOG_PROGRESS_STEP))) {
Log.d(TAG, "Progress #" + info.id + ": " + percentageText);
}
mLastProgressPercent = progress;
Log.d(TAG, "Sending 'Progress' notification for id " + info.id + ": " + percentageText);
sendForegroundabledNotification(info.id, builder.build()); sendForegroundabledNotification(info.id, builder.build());
} }