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

Commit 00f2ce07 authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Partial screen sharing: show error notif when screen recording fails"... 

Merge "Partial screen sharing: show error notif when screen recording fails" into udc-dev am: 7655ab93

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23480731



Change-Id: I3e667a3a7a619d02c8e202ff2a008142b825e04b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7ce01ec 7655ab93

packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ public class RecordingService extends Service implements ScreenMediaRecorderList 
                Log.e(TAG, "stopRecording called, but there was an error when ending"

                        + "recording");

                exception.printStackTrace();

                createErrorNotification();

            } catch (Throwable throwable) {

                // Something unexpected happen, SystemUI will crash but let's delete

                // the temporary files anyway

packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingServiceTest.java

+11 −0
Original line number Diff line number Diff line
@@ -203,6 +203,17 @@ public class RecordingServiceTest extends SysuiTestCase { 
        verify(mScreenMediaRecorder).release();

    }



    @Test

    public void testOnSystemRequestedStop_recorderEndThrowsRuntimeException_showsErrorNotification()

            throws IOException {

        doReturn(true).when(mController).isRecording();

        doThrow(new RuntimeException()).when(mScreenMediaRecorder).end();



        mRecordingService.onStopped();



        verify(mRecordingService).createErrorNotification();

    }



    @Test

    public void testOnSystemRequestedStop_recorderEndThrowsOOMError_releasesRecording()

            throws IOException {