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

Commit 34510eb2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't opt-out of warning dialog by default on user builds." into nyc-dev

parents 69582262 af096719

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

+10 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.shell.BugreportPrefs.setWarningState; 
import android.app.AlertDialog;

import android.content.DialogInterface;

import android.content.Intent;

import android.os.Build;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.widget.CheckBox;
@@ -59,7 +60,15 @@ public class BugreportWarningActivity extends AlertActivity 
        ap.mNegativeButtonListener = this;



        mConfirmRepeat = (CheckBox) ap.mView.findViewById(android.R.id.checkbox);

        mConfirmRepeat.setChecked(getWarningState(this, STATE_UNKNOWN) != STATE_SHOW);



        final int state = getWarningState(this, STATE_UNKNOWN);

        final boolean checked;

        if (Build.TYPE.equals("user")) {

            checked = state == STATE_HIDE; // Only checks if specifically set to.

        } else {

            checked = state != STATE_SHOW; // Checks by default.

        }

        mConfirmRepeat.setChecked(checked);



        setupAlert();

    }

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

+9 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.app.NotificationManager; 
import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.SystemProperties;

import android.service.notification.StatusBarNotification;
@@ -517,7 +518,14 @@ public class BugreportReceiverTest extends InstrumentationTestCase { 
                mUiBot.getVisibleObject(mContext.getString(R.string.bugreport_confirm_dont_repeat));

        final boolean firstTime = propertyState == null || propertyState == STATE_UNKNOWN;

        if (firstTime) {

            assertTrue("Checkbox should be checked by default", dontShowAgain.isChecked());

            if (Build.TYPE.equals("user")) {

                assertFalse("Checkbox should NOT be checked by default on user builds",

                        dontShowAgain.isChecked());

                mUiBot.click(dontShowAgain, "dont-show-again");

            } else {

                assertTrue("Checkbox should be checked by default on build type " + Build.TYPE,

                        dontShowAgain.isChecked());

            }

        } else {

            assertFalse("Checkbox should not be checked", dontShowAgain.isChecked());

            mUiBot.click(dontShowAgain, "dont-show-again");