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

Commit ed6d1743 authored by Cyril Lee's avatar Cyril Lee Committed by Automerger Merge Worker
Browse files

Merge "Offer the bugreport button in debug mode" into tm-qpr-dev am: 8700cb4b am: 582a5af8 

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



Change-Id: Id439e44b5ad47c66d34ce405780b3cde47c24bb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38779183 582a5af8

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+3 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import android.graphics.Color; 
import android.graphics.drawable.Drawable;

import android.media.AudioManager;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;
@@ -1044,7 +1045,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 


        @Override

        public boolean showBeforeProvisioning() {

            return false;

            return Build.isDebuggable() && mGlobalSettings.getInt(

                    Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0;

        }

    }

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;
@@ -480,4 +481,13 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
        // hide dialog again

        mGlobalActionsDialogLite.showOrHideDialog(true, true, null /* view */);

    }



    @Test

    public void testBugreportAction_whenDebugMode_shouldOfferBugreportButtonBeforeProvisioning() {

        doReturn(1).when(mGlobalSettings).getInt(anyString(), anyInt());



        GlobalActionsDialogLite.BugReportAction bugReportAction =

                mGlobalActionsDialogLite.makeBugReportActionForTesting();

        assertThat(bugReportAction.showBeforeProvisioning()).isTrue();

    }

}