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

Commit b32952b8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Move common apishim classes to apishim.common pkg am: 473501ff am: ea5b554c 

Change-Id: Iafd89ce79c00042b01a8b97223dd966e655def05
parents eed63912 ea5b554c

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;