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

Commit e6e2cbea authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6286840 from aa561db2 to rvc-release 

Change-Id: I978c11457f554c48eea32c36bf9eb52c4c0da371
parents 9223abcb aa561db2

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ import androidx.annotation.VisibleForTesting; 
import com.android.networkstack.apishim.CaptivePortalDataShim;

import com.android.networkstack.apishim.CaptivePortalDataShim;

import com.android.networkstack.apishim.NetworkInformationShim;

import com.android.networkstack.apishim.NetworkInformationShim;





import java.net.Inet4Address;



/**

/**

 * Compatibility implementation of {@link NetworkInformationShim}.

 * Compatibility implementation of {@link NetworkInformationShim}.

 *

 *
@@ -84,4 +86,10 @@ public class NetworkInformationShimImpl implements NetworkInformationShim { 
    public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) {

    public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) {

        return new LinkProperties(lp);

        return new LinkProperties(lp);

    }

    }



    @Override

    public void setDhcpServerAddress(@NonNull LinkProperties lp,

            @NonNull Inet4Address serverAddress) {

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

    }

}
 
}

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;





import java.net.Inet4Address;



/**

/**

 * Compatibility implementation of {@link NetworkInformationShim}.

 * Compatibility implementation of {@link NetworkInformationShim}.

 */

 */
@@ -81,4 +83,10 @@ public class NetworkInformationShimImpl extends 
    public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) {

    public LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull final LinkProperties lp) {

        return lp.makeSensitiveFieldsParcelingCopy();

        return lp.makeSensitiveFieldsParcelingCopy();

    }

    }



    @Override

    public void setDhcpServerAddress(@NonNull LinkProperties lp,

            @NonNull Inet4Address serverAddress) {

        lp.setDhcpServerAddress(serverAddress);

    }

}
 
}

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,8 @@ import android.net.Uri; 
import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.Nullable;





import java.net.Inet4Address;



/**

/**

 * Compatibility interface for network info classes such as {@link LinkProperties} and

 * Compatibility interface for network info classes such as {@link LinkProperties} and

 * {@link NetworkCapabilities}.

 * {@link NetworkCapabilities}.
@@ -56,4 +58,12 @@ public interface NetworkInformationShim { 
     */

     */

    @NonNull

    @NonNull

    LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull LinkProperties lp);

    LinkProperties makeSensitiveFieldsParcelingCopy(@NonNull LinkProperties lp);



    /**

     * @see LinkProperties#setDhcpServerAddress()

     */

    @NonNull

    void setDhcpServerAddress(@NonNull LinkProperties lp,

            @NonNull Inet4Address serverAddress);



}
 
}

src/android/net/ip/IpClient.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -1195,6 +1195,10 @@ public class IpClient extends StateMachine { 
                newLp.setMtu(mDhcpResults.mtu);

                newLp.setMtu(mDhcpResults.mtu);

            }

            }





            if (mDhcpResults.serverAddress != null) {

                mShim.setDhcpServerAddress(newLp, mDhcpResults.serverAddress);

            }



            final String capportUrl = mDhcpResults.captivePortalApiUrl;

            final String capportUrl = mDhcpResults.captivePortalApiUrl;

            // Uri.parse does no syntax check; do a simple regex check to eliminate garbage.

            // Uri.parse does no syntax check; do a simple regex check to eliminate garbage.

            // If the URL is still incorrect data fetching will fail later, which is fine.

            // If the URL is still incorrect data fetching will fail later, which is fine.
@@ -1272,6 +1276,7 @@ public class IpClient extends StateMachine { 




        if (DBG) {

        if (DBG) {

            Log.d(mTag, "onNewDhcpResults(" + Objects.toString(dhcpResults) + ")");

            Log.d(mTag, "onNewDhcpResults(" + Objects.toString(dhcpResults) + ")");

            Log.d(mTag, "handleIPv4Success newLp{" + newLp + "}");

        }

        }

        mCallback.onNewDhcpResults(dhcpResults);

        mCallback.onNewDhcpResults(dhcpResults);

        maybeSaveNetworkToIpMemoryStore();

        maybeSaveNetworkToIpMemoryStore();