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

Commit 8ba3c84c authored by Rhed Jao's avatar Rhed Jao
Browse files

Fixes an error handling in BugreportProgressService 

Calls onError function when bugreport is finished and file is empty.

Bug: 174314124
Test: atest BugreportReceiverTest
Change-Id: I4542568fd2d2ad1c75c7c3b223accca4995938a3
parent bc1f3bff

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

+5 −4
Original line number Diff line number Diff line
@@ -380,6 +380,11 @@ public class BugreportProgressService extends Service { 
        public void onFinished() {

            mInfo.renameBugreportFile();

            mInfo.renameScreenshots();

            if (mInfo.bugreportFile.length() == 0) {

                Log.e(TAG, "Bugreport file empty. File path = " + mInfo.bugreportFile);

                onError(BUGREPORT_ERROR_RUNTIME);

                return;

            }

            synchronized (mLock) {

                sendBugreportFinishedBroadcastLocked();

                mMainThreadHandler.post(() -> mInfoDialog.onBugreportFinished(mInfo));
@@ -408,10 +413,6 @@ public class BugreportProgressService extends Service { 
        @GuardedBy("mLock")

        private void sendBugreportFinishedBroadcastLocked() {

            final String bugreportFilePath = mInfo.bugreportFile.getAbsolutePath();

            if (mInfo.bugreportFile.length() == 0) {

                Log.e(TAG, "Bugreport file empty. File path = " + bugreportFilePath);

                return;

            }

            if (mInfo.type == BugreportParams.BUGREPORT_MODE_REMOTE) {

                sendRemoteBugreportFinishedBroadcast(mContext, bugreportFilePath,

                        mInfo.bugreportFile);

packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java

+14 −1
Original line number Diff line number Diff line
@@ -512,6 +512,17 @@ public class BugreportReceiverTest { 
        assertEquals("Didn't change state", STATE_HIDE, newState);

    }



    @Test

    public void testBugreportFinished_withEmptyBugreportFile() throws Exception {

        sendBugreportStarted();



        IoUtils.closeQuietly(mBugreportFd);

        mBugreportFd = null;

        sendBugreportFinished();



        assertServiceNotRunning();

    }



    @Test

    public void testShareBugreportAfterServiceDies() throws Exception {

        sendBugreportStarted();
@@ -647,7 +658,9 @@ public class BugreportReceiverTest { 
     * Callbacks to service to finish the bugreport.

     */

    private void sendBugreportFinished() throws Exception {

        if (mBugreportFd != null) {

            writeZipFile(mBugreportFd, BUGREPORT_FILE, BUGREPORT_CONTENT);

        }

        if (mScreenshotFd != null) {

            writeScreenshotFile(mScreenshotFd, SCREENSHOT_CONTENT);

        }