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

Commit 470d4fdf authored by chenlei7's avatar chenlei7 Committed by android-build-merger
Browse files

Merge "Fix NPE when receives null action." 

am: 2b8e19a7

Change-Id: I9822b1204b12d2dfca3a0e0fee5d9b9200c668aa
parents 9ef0f490 2b8e19a7

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()) {