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

Commit bcde31cd authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add shims for NetCapability#getCapabilityCarrierName" am: 01e4fa96 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1683351

Change-Id: I8300ac3842d9a49b0919a5fba9cd1e4cd150abfc
parents a441244c 01e4fa96

apishim/30/com/android/networkstack/apishim/api30/ConstantsShim.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,5 +44,6 @@ public class ConstantsShim extends com.android.networkstack.apishim.api29.Consta 




    // Constants defined in android.net.NetworkCapabilities.

    // Constants defined in android.net.NetworkCapabilities.

    public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28;

    public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28;

    public static final int NET_CAPABILITY_ENTERPRISE = 29;

    public static final int TRANSPORT_TEST = 7;

    public static final int TRANSPORT_TEST = 7;

}
 
}

apishim/31/com/android/networkstack/apishim/NetworkInformationShimImpl.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -17,9 +17,11 @@ 
package com.android.networkstack.apishim;

package com.android.networkstack.apishim;





import android.net.LinkProperties;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.os.Build;

import android.os.Build;





import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.RequiresApi;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;





import com.android.networkstack.apishim.common.CaptivePortalDataShim;

import com.android.networkstack.apishim.common.CaptivePortalDataShim;
@@ -57,4 +59,11 @@ public class NetworkInformationShimImpl 
        if (lp == null || lp.getCaptivePortalData() == null) return null;

        if (lp == null || lp.getCaptivePortalData() == null) return null;

        return new CaptivePortalDataShimImpl(lp.getCaptivePortalData());

        return new CaptivePortalDataShimImpl(lp.getCaptivePortalData());

    }

    }



    @RequiresApi(Build.VERSION_CODES.S)

    @Nullable

    @Override

    public String getCapabilityCarrierName(int capability) {

        return NetworkCapabilities.getCapabilityCarrierName(capability);

    }

}
 
}

apishim/common/com/android/networkstack/apishim/common/NetworkInformationShim.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -83,4 +83,17 @@ public interface NetworkInformationShim { 
     */

     */

    void setCaptivePortalData(@NonNull LinkProperties lp,

    void setCaptivePortalData(@NonNull LinkProperties lp,

            @Nullable CaptivePortalDataShim captivePortalData);

            @Nullable CaptivePortalDataShim captivePortalData);



    /**

     * Get the name of the given capability that carriers use.

     * If the capability does not have a carrier-name, returns null.

     *

     * @param capability The capability to get the carrier-name of.

     * @return The carrier-name of the capability, or null if it doesn't exist.

     * @hide

     */

    @Nullable

    default String getCapabilityCarrierName(int capability) {

        return null;

    }

}
 
}