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

Commit 1c0e2f0a authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android Git Automerger
Browse files

am 95ada143: Merge "Remove missing object to avoid NPE" into lmp-mr1-dev 

* commit '95ada143':
  Remove missing object to avoid NPE
parents 4dd91650 95ada143

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(