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

Commit 29f9ee97 authored by Nick Pelly's avatar Nick Pelly Committed by Android (Google) Code Review
Browse files

Merge "Need to check ndef before writing ndef." into gingerbread

parents 0d1e38ef 01d159aa

core/java/android/nfc/technology/Ndef.java

+17 −11
Original line number Diff line number Diff line
@@ -148,7 +148,9 @@ public final class Ndef extends BasicTagTechnology { 
        checkConnected();



        try {

            int errorCode = mTagService.ndefWrite(mTag.getServiceHandle(), msg);

            int serviceHandle = mTag.getServiceHandle();

            if (mTagService.isNdef(serviceHandle)) {

                int errorCode = mTagService.ndefWrite(serviceHandle, msg);

                switch (errorCode) {

                    case ErrorCodes.SUCCESS:

                        break;
@@ -160,6 +162,10 @@ public final class Ndef extends BasicTagTechnology { 
                        // Should not happen

                        throw new IOException();

                }

            }

            else {

                throw new IOException("Tag is not ndef");

            }

        } catch (RemoteException e) {

            attemptDeadServiceRecovery(e);

        }