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

Commit c85043e2 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android (Google) Code Review
Browse files

Merge "Remove missing object to avoid NPE" into lmp-mr1-dev

parents 5ba69b7a 47b96a7e

android/app/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java

+1 −3
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ public class BluetoothOppIncomingFileConfirmActivity extends AlertActivity imple 


    private ContentValues mUpdateValues;



    private TextView mContentView;



    private boolean mTimeout = false;



    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -200,7 +198,7 @@ public class BluetoothOppIncomingFileConfirmActivity extends AlertActivity imple 


    private void onTimeout() {

        mTimeout = true;

        mContentView.setText(getString(R.string.incoming_file_confirm_timeout_content,

        mAlert.setTitle(getString(R.string.incoming_file_confirm_timeout_content,

                mTransInfo.mDeviceName));

        mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setVisibility(View.GONE);

        mAlert.getButton(DialogInterface.BUTTON_POSITIVE).setText(