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

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

Merge "Fix RequestPermissionActivity crash"

parents e46e3d1c fe50f43f

res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
        <item name="android:navigationBarColor">#00000000</item>

    </style>



    <style name="Theme.BluetoothPermission" parent="@android:style/Theme.Material.Light.Dialog.Alert">

    <style name="Theme.BluetoothPermission" parent="@style/Theme.AlertDialog">

        <item name="android:windowNoTitle">true</item>

    </style>

src/com/android/settings/bluetooth/RequestPermissionActivity.java

+10 −5
Original line number Diff line number Diff line
@@ -32,17 +32,17 @@ import android.os.Bundle; 
import android.text.TextUtils;

import android.util.Log;



import androidx.appcompat.app.AlertDialog;



import com.android.settings.R;

import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;



import androidx.appcompat.app.AlertDialog;



/**

 * RequestPermissionActivity asks the user whether to enable discovery. This is

 * usually started by an application wanted to start bluetooth and or discovery

 */

public class RequestPermissionActivity extends Activity implements

        DialogInterface.OnClickListener {

        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {

    // Command line to test this

    // adb shell am start -a android.bluetooth.adapter.action.REQUEST_ENABLE

    // adb shell am start -a android.bluetooth.adapter.action.REQUEST_DISCOVERABLE
@@ -188,6 +188,7 @@ public class RequestPermissionActivity extends Activity implements 
            builder.setNegativeButton(getString(R.string.deny), this);

        }



        builder.setOnDismissListener(this);

        mDialog = builder.create();

        mDialog.show();

    }
@@ -238,12 +239,16 @@ public class RequestPermissionActivity extends Activity implements 
                break;



            case DialogInterface.BUTTON_NEGATIVE:

                setResult(RESULT_CANCELED);

                finish();

                cancelAndFinish();

                break;

        }

    }



    @Override

    public void onDismiss(final DialogInterface dialog) {

        cancelAndFinish();

    }



    private void proceedAndFinish() {

        int returnCode;