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

Commit 558ade41 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 

Change-Id: Iec05d0f229eec3db3cae10a95cd59f03057e4a9a
parents 05b1aad2 92a8632e

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

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




package com.android.networkstack.apishim.api29;

package com.android.networkstack.apishim.api29;





import android.net.IpPrefix;

import android.net.LinkProperties;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.Uri;

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

        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

    @Nullable

    @Override

    @Override

    public String getSsid(@Nullable NetworkCapabilities nc) {

    public String getSsid(@Nullable NetworkCapabilities nc) {

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

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




package com.android.networkstack.apishim;

package com.android.networkstack.apishim;





import android.net.IpPrefix;

import android.net.LinkProperties;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.Uri;

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

        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

    @Nullable

    @Override

    @Override

    public String getSsid(@Nullable NetworkCapabilities nc) {

    public String getSsid(@Nullable NetworkCapabilities nc) {

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

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




package com.android.networkstack.apishim;

package com.android.networkstack.apishim;





import android.net.IpPrefix;

import android.net.LinkProperties;

import android.net.LinkProperties;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.Uri;

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

    @Nullable

    CaptivePortalDataShim getCaptivePortalData(@Nullable LinkProperties lp);

    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()

     * @see NetworkCapabilities#getSSID()

     */

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

    /**

     * @see LinkProperties#setDhcpServerAddress()

     * @see LinkProperties#setDhcpServerAddress()

     */

     */

    @NonNull

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

    void setDhcpServerAddress(@NonNull LinkProperties lp,

            @NonNull Inet4Address serverAddress);





}
 
}