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

Commit 65f4f4f6 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes Ic84936e0,Ia3845819 am: af9b52bd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2374894



Change-Id: I2be49c1de09641e7d9e4a31fa8483eed12eab561
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8239e26d af9b52bd

core/java/android/nfc/NfcActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public final class NfcActivityManager extends IAppCallback.Stub 
        Binder token;



        public NfcActivityState(Activity activity) {

            if (activity.getWindow().isDestroyed()) {

            if (activity.isDestroyed()) {

                throw new IllegalStateException("activity is already destroyed");

            }

            // Check if activity is resumed right now, as we will not

core/java/android/nfc/TechListParcel.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class TechListParcel implements Parcelable { 
            int count = source.readInt();

            String[][] techLists = new String[count][];

            for (int i = 0; i < count; i++) {

                techLists[i] = source.readStringArray();

                techLists[i] = source.createStringArray();

            }

            return new TechListParcel(techLists);

        }

core/tests/nfctests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ android_test { 
        "androidx.test.ext.junit",

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "truth-prebuilt",

    ],

    libs: [

        "android.test.runner",

core/tests/nfctests/src/android/nfc/TechListParcelTest.java

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.nfc;



import static com.google.common.truth.Truth.assertThat;



import android.os.Parcel;



import androidx.test.ext.junit.runners.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.Arrays;



@RunWith(AndroidJUnit4.class)

public class TechListParcelTest {



    private static final String[] TECH_LIST_1 = new String[] { "tech1.1", "tech1.2" };

    private static final String[] TECH_LIST_2 = new String[] { "tech2.1" };

    private static final String[] TECH_LIST_EMPTY = new String[] {};



    @Test

    public void testWriteParcel() {

        TechListParcel techListParcel = new TechListParcel(TECH_LIST_1, TECH_LIST_2);



        Parcel parcel = Parcel.obtain();

        techListParcel.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        TechListParcel actualTechList =

                TechListParcel.CREATOR.createFromParcel(parcel);

        parcel.recycle();



        assertThat(actualTechList.getTechLists().length).isEqualTo(2);

        assertThat(Arrays.equals(actualTechList.getTechLists()[0], TECH_LIST_1)).isTrue();

        assertThat(Arrays.equals(actualTechList.getTechLists()[1], TECH_LIST_2)).isTrue();

    }



    @Test

    public void testWriteParcelArrayEmpty() {

        TechListParcel techListParcel = new TechListParcel();



        Parcel parcel = Parcel.obtain();

        techListParcel.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        TechListParcel actualTechList =

                TechListParcel.CREATOR.createFromParcel(parcel);

        parcel.recycle();



        assertThat(actualTechList.getTechLists().length).isEqualTo(0);

    }



    @Test

    public void testWriteParcelElementEmpty() {

        TechListParcel techListParcel = new TechListParcel(TECH_LIST_EMPTY);



        Parcel parcel = Parcel.obtain();

        techListParcel.writeToParcel(parcel, 0);

        parcel.setDataPosition(0);

        TechListParcel actualTechList =

                TechListParcel.CREATOR.createFromParcel(parcel);

        parcel.recycle();



        assertThat(actualTechList.getTechLists().length).isEqualTo(1);

        assertThat(Arrays.equals(actualTechList.getTechLists()[0], TECH_LIST_EMPTY)).isTrue();

    }



}