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

Commit 22b669ba authored by chenlei7's avatar chenlei7 Committed by android-build-merger
Browse files

Merge "Fix NPE when receives null action." am: 2b8e19a7 

am: 470d4fdf

Change-Id: I439c26d883b743014d92199d3a32d8b5c9a18a72
parents 04c65735 470d4fdf

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

+6 −0
Original line number Diff line number Diff line
@@ -81,6 +81,12 @@ public class BluetoothOppLauncherActivity extends Activity { 
            return;

        }



        if (action == null) {

            Log.w(TAG, "action is null");

            finish();

            return;

        }



        if (action.equals(Intent.ACTION_SEND) || action.equals(Intent.ACTION_SEND_MULTIPLE)) {

            //Check if Bluetooth is available in the beginning instead of at the end

            if (!isBluetoothAllowed()) {