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

Commit 03f95459 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add shims to get and set the NAT64 prefix in LinkProperties." am: 92a8632e am: 558ade41 

Change-Id: I70318d202eaf958cd144c3572f293bb4917fe05f
parents 7e1cb477 558ade41

apishim/29/com/android/networkstack/apishim/api29/NetworkInformationShimImpl.java

+13 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.networkstack.apishim.api29;



import android.net.IpPrefix;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.Uri;
@@ -74,6 +75,18 @@ public class NetworkInformationShimImpl implements NetworkInformationShim { 
        return null;

    }



    @Nullable

    @Override

    public IpPrefix getNat64Prefix(@NonNull LinkProperties lp) {

        // Not supported on this API level

        return null;

    }



    @Override

    public void setNat64Prefix(@NonNull LinkProperties lp, @Nullable IpPrefix prefix) {

        // Not supported on this API level: no-op

    }



    @Nullable

    @Override

    public String getSsid(@Nullable NetworkCapabilities nc) {

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

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.networkstack.apishim;



import android.net.IpPrefix;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.Uri;
@@ -71,6 +72,17 @@ public class NetworkInformationShimImpl extends 
        return new CaptivePortalDataShimImpl(lp.getCaptivePortalData());

    }



    @Nullable

    @Override

    public IpPrefix getNat64Prefix(@NonNull LinkProperties lp) {

        return lp.getNat64Prefix();

    }



    @Override

    public void setNat64Prefix(@NonNull LinkProperties lp, @Nullable IpPrefix prefix) {

        lp.setNat64Prefix(prefix);

    }



    @Nullable

    @Override

    public String getSsid(@Nullable NetworkCapabilities nc) {

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

+13 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.networkstack.apishim;



import android.net.IpPrefix;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.Uri;
@@ -47,6 +48,17 @@ public interface NetworkInformationShim { 
    @Nullable

    CaptivePortalDataShim getCaptivePortalData(@Nullable LinkProperties lp);



    /**

     * @see LinkProperties#getNat64Prefix()

     */

    @Nullable

    IpPrefix getNat64Prefix(@NonNull LinkProperties lp);



    /**

     * @see LinkProperties#setNat64Prefix()

     */

    void setNat64Prefix(@NonNull LinkProperties lp, @Nullable IpPrefix prefix);



    /**

     * @see NetworkCapabilities#getSSID()

     */
@@ -62,8 +74,6 @@ public interface NetworkInformationShim { 
    /**

     * @see LinkProperties#setDhcpServerAddress()

     */

    @NonNull

    void setDhcpServerAddress(@NonNull LinkProperties lp,

            @NonNull Inet4Address serverAddress);

    void setDhcpServerAddress(@NonNull LinkProperties lp, @NonNull Inet4Address serverAddress);



}