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

Commit fe4c6917 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix Unsafe Parcel Usage" into main

parents d5edfef5 9582b99f

core/java/android/app/admin/ProvisioningIntentHelper.java

+3 −4
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import android.nfc.NdefMessage; 
import android.nfc.NdefRecord;

import android.nfc.NfcAdapter;

import android.os.Bundle;

import android.os.Parcelable;

import android.os.PersistableBundle;

import android.util.Log;
@@ -215,14 +214,14 @@ final class ProvisioningIntentHelper { 
     * Returns the first {@link NdefRecord} found with a recognized MIME-type

     */

    private static NdefRecord getFirstNdefRecord(Intent nfcIntent) {

        Parcelable[] ndefMessages = nfcIntent.getParcelableArrayExtra(EXTRA_NDEF_MESSAGES);

        NdefMessage[] ndefMessages = nfcIntent.getParcelableArrayExtra(EXTRA_NDEF_MESSAGES,

                NdefMessage.class);

        if (ndefMessages == null) {

            Log.i(TAG, "No EXTRA_NDEF_MESSAGES from nfcIntent");

            return null;

        }



        for (Parcelable rawMsg : ndefMessages) {

            NdefMessage msg = (NdefMessage) rawMsg;

        for (NdefMessage msg : ndefMessages) {

            for (NdefRecord record : msg.getRecords()) {

                String mimeType = new String(record.getType(), UTF_8);