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

Merge "Follow best practices for Atomic variables" into rvc-dev am: abfb1b0eda am: bb1af287a2

Browse Source 
Change-Id: I4ee703c5c21c6c8ffa85137a8aadcb042996fcd6
This commit is contained in:
TreeHugger Robot
2020-04-03 12:05:50 +00:00
committed by Automerger Merge Worker
parent cced9c3722 bb1af287a2
commit 5c1e6f14da
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -754,7 +754,7 @@ public class BugreportProgressService extends Service {
!= (info.lastProgress.intValue() / LOG_PROGRESS_STEP))) {
Log.d(TAG, "Progress #" + info.id + ": " + percentageText);
}
info.lastProgress = new AtomicInteger(progress);
info.lastProgress.set(progress);
sendForegroundabledNotification(info.id, builder.build());
}
@@ -1023,7 +1023,7 @@ public class BugreportProgressService extends Service {
}
Log.d(TAG, "Bugreport finished with title: " + info.getTitle()
+ " and shareDescription: " + info.shareDescription);
info.finished = new AtomicBoolean(true);
info.finished.set(true);
synchronized (mLock) {
// Stop running on foreground, otherwise share notification cannot be dismissed.
@@ -1807,18 +1807,18 @@ public class BugreportProgressService extends Service {
* Current value of progress (in percentage) of the bugreport generation as
* displayed by the UI.
*/
AtomicInteger progress = new AtomicInteger(0);
final AtomicInteger progress = new AtomicInteger(0);
/**
* Last value of progress (in percentage) of the bugreport generation for which
* system notification was updated.
*/
AtomicInteger lastProgress = new AtomicInteger(0);
final AtomicInteger lastProgress = new AtomicInteger(0);
/**
* Time of the last progress update.
*/
AtomicLong lastUpdate = new AtomicLong(System.currentTimeMillis());
final AtomicLong lastUpdate = new AtomicLong(System.currentTimeMillis());
/**
* Time of the last progress update when Parcel was created.
@@ -1838,7 +1838,7 @@ public class BugreportProgressService extends Service {
/**
* Whether dumpstate sent an intent informing it has finished.
*/
AtomicBoolean finished = new AtomicBoolean(false);
final AtomicBoolean finished = new AtomicBoolean(false);
/**
* Whether the details entries have been added to the bugreport yet.
@@ -2073,8 +2073,8 @@ public class BugreportProgressService extends Service {
initialName = in.readString();
title = in.readString();
description = in.readString();
progress = new AtomicInteger(in.readInt());
lastUpdate = new AtomicLong(in.readLong());
progress.set(in.readInt());
lastUpdate.set(in.readLong());
formattedLastUpdate = in.readString();
bugreportFile = readFile(in);
@@ -2083,7 +2083,7 @@ public class BugreportProgressService extends Service {
screenshotFiles.add(readFile(in));
}
finished = new AtomicBoolean(in.readInt() == 1);
finished.set(in.readInt() == 1);
screenshotCounter = in.readInt();
shareDescription = in.readString();
shareTitle = in.readString();
@@ -2155,8 +2155,8 @@ public class BugreportProgressService extends Service {
+ ") from " + info.progress.intValue() + " to " + progress);
}
}
info.progress = new AtomicInteger(progress);
info.lastUpdate = new AtomicLong(System.currentTimeMillis());
info.progress.set(progress);
info.lastUpdate.set(System.currentTimeMillis());
updateProgress(info);
}