Merge "Only show progress log every 10%" into oc-dev (b4e05340) · Commits · e / os / android_frameworks_base

packages/Shell/src/com/android/shell/BugreportProgressService.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -172,6 +172,9 @@ public class BugreportProgressService extends Service {
		private static final int CAPPED_PROGRESS = 9900;
		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.
		* <p>
		@@ -226,6 +229,8 @@ public class BugreportProgressService extends Service {

		private boolean mIsWatch;

		private int mLastProgressPercent;

		@Override
		public void onCreate() {
		mContext = getApplicationContext();
		@@ -512,8 +517,15 @@ public class BugreportProgressService extends Service {
		builder.setContentIntent(infoPendingIntent)
		.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());
		}