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

Commit 0e37a546 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev 

am: 6d98837e

Change-Id: I86b8cf8745dfb8566c8e39c5f022e829eb90faf7
parents b5b5e3f2 6d98837e

wifi/java/android/net/wifi/aware/PublishConfig.java

+3 −2
Original line number Diff line number Diff line
@@ -172,8 +172,9 @@ public final class PublishConfig implements Parcelable { 


    @Override

    public int hashCode() {

        return Objects.hash(mServiceName, mServiceSpecificInfo, mMatchFilter, mPublishType, mTtlSec,

                mEnableTerminateNotification, mEnableRanging);

        return Objects.hash(Arrays.hashCode(mServiceName), Arrays.hashCode(mServiceSpecificInfo),

                Arrays.hashCode(mMatchFilter), mPublishType, mTtlSec, mEnableTerminateNotification,

                mEnableRanging);

    }



    /**

wifi/java/android/net/wifi/aware/SubscribeConfig.java

+4 −2
Original line number Diff line number Diff line
@@ -205,8 +205,10 @@ public final class SubscribeConfig implements Parcelable { 


    @Override

    public int hashCode() {

        int result = Objects.hash(mServiceName, mServiceSpecificInfo, mMatchFilter, mSubscribeType,

                mTtlSec, mEnableTerminateNotification, mMinDistanceMmSet, mMaxDistanceMmSet);

        int result = Objects.hash(Arrays.hashCode(mServiceName),

                Arrays.hashCode(mServiceSpecificInfo), Arrays.hashCode(mMatchFilter),

                mSubscribeType, mTtlSec, mEnableTerminateNotification, mMinDistanceMmSet,

                mMaxDistanceMmSet);



        if (mMinDistanceMmSet) {

            result = Objects.hash(result, mMinDistanceMm);

wifi/java/android/net/wifi/aware/WifiAwareManager.java

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ public class WifiAwareManager { 


        if (!WifiAwareUtils.isLegacyVersion(mContext, Build.VERSION_CODES.Q)) {

            throw new UnsupportedOperationException(

                    "API not deprecated - use WifiAwareNetworkSpecifier.Builder");

                    "API deprecated - use WifiAwareNetworkSpecifier.Builder");

        }



        if (role != WIFI_AWARE_DATA_PATH_ROLE_INITIATOR

wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -709,6 +709,7 @@ public class WifiAwareManagerTest { 
        ConfigRequest rereadConfigRequest = ConfigRequest.CREATOR.createFromParcel(parcelR);



        assertEquals(configRequest, rereadConfigRequest);

        assertEquals(configRequest.hashCode(), rereadConfigRequest.hashCode());

    }



    /*
@@ -801,6 +802,7 @@ public class WifiAwareManagerTest { 
        SubscribeConfig rereadSubscribeConfig = SubscribeConfig.CREATOR.createFromParcel(parcelR);



        assertEquals(subscribeConfig, rereadSubscribeConfig);

        assertEquals(subscribeConfig.hashCode(), rereadSubscribeConfig.hashCode());

    }



    @Test(expected = IllegalArgumentException.class)
@@ -892,6 +894,7 @@ public class WifiAwareManagerTest { 
        PublishConfig rereadPublishConfig = PublishConfig.CREATOR.createFromParcel(parcelR);



        assertEquals(publishConfig, rereadPublishConfig);

        assertEquals(publishConfig.hashCode(), rereadPublishConfig.hashCode());

    }



    @Test(expected = IllegalArgumentException.class)