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

Merge "Remove obsolete methods from DumpstateListener implementations"

Browse Source
This commit is contained in:
Nandana Dutt
2019-08-07 13:45:36 +00:00
committed by Gerrit Code Review
parent 0473b08b6b 47c5ecc50a
commit cbdb10f982
3 changed files with 7 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/os/BugreportManager.java
View File

@@ -233,22 +233,5 @@ public final class BugreportManager {
Binder.restoreCallingIdentity(identity);
}
}
// Old methods; should go away
@Override
public void onProgressUpdated(int progress) throws RemoteException {
// TODO(b/111441001): remove from interface
}
@Override
public void onMaxProgressUpdated(int maxProgress) throws RemoteException {
// TODO(b/111441001): remove from interface
}
@Override
public void onSectionComplete(String title, int status, int size, int durationMs)
throws RemoteException {
// TODO(b/111441001): remove from interface
}
}
}

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

@@ -175,9 +175,9 @@ public class BugreportProgressService extends Service {
// Passed to Message.obtain() when msg.arg2 is not used.
private static final int UNUSED_ARG2 = -2;
// Maximum progress displayed (like 99.00%).
private static final int CAPPED_PROGRESS = 9900;
private static final int CAPPED_MAX = 10000;
// Maximum progress displayed in %.
private static final int CAPPED_PROGRESS = 99;
private static final int CAPPED_MAX = 100;
/** Show the progress log every this percent. */
private static final int LOG_PROGRESS_STEP = 10;
@@ -1954,7 +1954,10 @@ public class BugreportProgressService extends Service {
@Override
public void onProgress(int progress) throws RemoteException {
updateProgressInfo(progress, 100 /* progress is already a percentage; so max = 100 */);
if (progress > CAPPED_PROGRESS) {
progress = CAPPED_PROGRESS;
}
updateProgressInfo(progress, CAPPED_MAX);
}
@Override
@@ -1967,46 +1970,6 @@ public class BugreportProgressService extends Service {
// TODO(b/111441001): implement
}
@Override
public void onProgressUpdated(int progress) throws RemoteException {
/*
* Checks whether the progress changed in a way that should be displayed to the user:
* - info.progress / info.max represents the displayed progress
* - info.realProgress / info.realMax represents the real progress
* - since the real progress can decrease, the displayed progress is only updated if it
* increases
* - the displayed progress is capped at a maximum (like 99%)
*/
info.realProgress = progress;
final int oldPercentage = (CAPPED_MAX * info.progress) / info.max;
int newPercentage = (CAPPED_MAX * info.realProgress) / info.realMax;
int max = info.realMax;
if (newPercentage > CAPPED_PROGRESS) {
progress = newPercentage = CAPPED_PROGRESS;
max = CAPPED_MAX;
}
if (newPercentage > oldPercentage) {
updateProgressInfo(progress, max);
}
}
@Override
public void onMaxProgressUpdated(int maxProgress) throws RemoteException {
Log.d(TAG, "onMaxProgressUpdated: " + maxProgress);
info.realMax = maxProgress;
}
@Override
public void onSectionComplete(String title, int status, int size, int durationMs)
throws RemoteException {
if (DEBUG) {
Log.v(TAG, "Title: " + title + " Status: " + status + " Size: " + size
+ " Duration: " + durationMs + "ms");
}
}
public void dump(String prefix, PrintWriter pw) {
pw.print(prefix); pw.print("token: "); pw.println(token);
}

14
services/core/java/com/android/server/os/BugreportManagerServiceImpl.java
View File

@@ -297,19 +297,5 @@ class BugreportManagerServiceImpl extends IDumpstate.Stub {
}
mDs.asBinder().unlinkToDeath(this, 0);
}
// Old methods; unused in the API flow.
@Override
public void onProgressUpdated(int progress) throws RemoteException {
}
@Override
public void onMaxProgressUpdated(int maxProgress) throws RemoteException {
}
@Override
public void onSectionComplete(String title, int status, int size, int durationMs)
throws RemoteException {
}
}
}