Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56659ae2 authored by Nandana Dutt's avatar Nandana Dutt
Browse files

Remove obsolete methods from DumpstateListener implementations 

Note that with the new Bugreporting API, SystemServer is the only
expected DumpstateListener implementation. Once we fully migrate Shell
app, we can remove the implementation in BugreportService as well.

BUG: 128980174
Test: bugreport from power menu, observe progress bar

Change-Id: I40d654a70bd9ceb3a29f8a0113b85616100f4ee9
parent 9f3eb4a1

core/java/android/os/BugreportManager.java

+0 −17
Original line number Diff line number Diff line
@@ -235,22 +235,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

        }

    }

}

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

+7 −45
Original line number Diff line number Diff line
@@ -199,9 +199,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;
@@ -2164,8 +2164,7 @@ public class BugreportProgressService extends Service { 


        @Override

        public void onProgress(int progress) throws RemoteException {

            updateProgressInfo(info, progress, 100 /* progress is already a percentage;

                    so max = 100 */);

            checkProgressUpdated(info, progress);

        }



        @Override
@@ -2178,26 +2177,6 @@ public class BugreportProgressService extends Service { 
            // TODO(b/111441001): implement

        }



        @Override

        public void onProgressUpdated(int progress) throws RemoteException {

            checkProgressUpdated(info, progress);

        }



        @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);

        }
@@ -2205,27 +2184,10 @@ public class BugreportProgressService extends Service { 
    }



    private void checkProgressUpdated(BugreportInfo info, int progress) {

        /*

         * 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 (progress == 0 || newPercentage > oldPercentage) {

            updateProgressInfo(info, progress, max);

        if (progress > CAPPED_PROGRESS) {

            progress = CAPPED_PROGRESS;

        }

        updateProgressInfo(info, progress, CAPPED_MAX);

    }



    private void updateProgressInfo(BugreportInfo info, int progress, int max) {

services/core/java/com/android/server/os/BugreportManagerServiceImpl.java

+0 −14
Original line number Diff line number Diff line
@@ -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 {

        }

    }

}