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

Commit 046bfa7f authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Move common apishim classes to apishim.common pkg 

This provides a better separation of the classes based on their role (an
actual shim, or an interface or utility common to all shims), and forces
the apishim package to import the common classes, which makes it easier
at SDK bump time since the imports do not need to be added at that
point.

Bug: 143586229
Test: atest NetworkStackTests
Change-Id: Ie77c17a96a67016f35890afa065bea0a07b09504
parent 5adebbff

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

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.networkstack.apishim.api29; 
import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;



import com.android.networkstack.apishim.CaptivePortalDataShim;

import com.android.networkstack.apishim.UnsupportedApiLevelException;

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

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



import org.json.JSONException;

import org.json.JSONObject;

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

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

import androidx.annotation.VisibleForTesting;



import com.android.networkstack.apishim.CaptivePortalDataShim;

import com.android.networkstack.apishim.NetworkInformationShim;

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

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



import java.net.Inet4Address;

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

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import android.net.Network; 


import androidx.annotation.NonNull;



import com.android.networkstack.apishim.NetworkShim;

import com.android.networkstack.apishim.UnsupportedApiLevelException;

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

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

/**

 * Implementation of NetworkShim for API 29.

 */

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.net.util.SocketUtils; 


import androidx.annotation.NonNull;



import com.android.networkstack.apishim.SocketUtilsShim;

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



import java.net.SocketAddress;

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

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ import android.os.RemoteException; 


import androidx.annotation.NonNull;



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

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

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



import org.json.JSONException;

import org.json.JSONObject;