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

Merge "Cancel notifications when user tap on Details or Take Screenshot after service died." into nyc-dev

Browse Source 
am: 6cb955826b

* commit '6cb955826b752189002727cb1db62cfac64bc58a':
  Cancel notifications when user tap on Details or Take Screenshot after service died.
This commit is contained in:
Felipe Leme
2016-02-17 16:16:10 +00:00
committed by android-build-merger
parent ae535993e7 6cb955826b
commit d8ab544929
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,7 +158,7 @@ public class BugreportProgressService extends Service {
static final long POLLING_FREQUENCY = 2 * DateUtils.SECOND_IN_MILLIS;
/** How long (in ms) a dumpstate process will be monitored if it didn't show progress. */
private static final long INACTIVITY_TIMEOUT = 3 * DateUtils.MINUTE_IN_MILLIS;
private static final long INACTIVITY_TIMEOUT = 10 * DateUtils.MINUTE_IN_MILLIS;
/** System properties used for monitoring progress. */
private static final String DUMPSTATE_PREFIX = "dumpstate.";
@@ -586,6 +586,12 @@ public class BugreportProgressService extends Service {
final String name, title, description;
final BugreportInfo info = getInfo(id);
if (info == null) {
// Most likely am killed Shell before user tapped the notification. Since system might
// be too busy anwyays, it's better to ignore the notification and switch back to the
// non-interactive mode (where the bugerport will be shared upon completion).
Log.d(TAG, "launchBugreportInfoDialog(" + id + "): cancel notification");
// TODO: add test case to make sure notification is canceled.
NotificationManager.from(mContext).cancel(TAG, id);
return;
}
@@ -604,6 +610,15 @@ public class BugreportProgressService extends Service {
* upon receiving a {@link #INTENT_BUGREPORT_STARTED}.
*/
private void takeScreenshot(int id, boolean delayed) {
if (getInfo(id) == null) {
// Most likely am killed Shell before user tapped the notification. Since system might
// be too busy anwyays, it's better to ignore the notification and switch back to the
// non-interactive mode (where the bugerport will be shared upon completion).
Log.d(TAG, "takeScreenshot(" + id + ", " + delayed + "): cancel notification");
// TODO: add test case to make sure notification is canceled.
NotificationManager.from(mContext).cancel(TAG, id);
return;
}
setTakingScreenshot(true);
if (delayed) {
collapseNotificationBar();
@@ -1126,7 +1141,7 @@ public class BugreportProgressService extends Service {
}
info.title = title;
info.description = description;
if (name != null && !info.name.equals(name)) {
if (name != null && !name.equals(info.name)) {
info.name = name;
updateProgress(info);
}