LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[FUI03] No-op refactoring of VpnInfo" am: f9dbe61693

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547637

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae15ffcf1fbf31ab004a36eb662f39e4439146d0
This commit is contained in:
Treehugger Robot
2021-01-27 13:11:28 +00:00
committed by Automerger Merge Worker
parent 569e241d5c 67c69ad73f
commit 9a9c17579a
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/INetworkStatsService.aidl
View File

@@ -23,11 +23,11 @@ import android.net.NetworkState;
import android.net.NetworkStats; import android.net.NetworkStats;
import android.net.NetworkStatsHistory; import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.net.VpnInfo;
import android.net.netstats.provider.INetworkStatsProvider; import android.net.netstats.provider.INetworkStatsProvider;
import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.os.IBinder; import android.os.IBinder;
import android.os.Messenger; import android.os.Messenger;
import com.android.internal.net.VpnInfo;
/** {@hide} */ /** {@hide} */
interface INetworkStatsService { interface INetworkStatsService {

2
core/java/com/android/internal/net/VpnInfo.aidl → core/java/android/net/VpnInfo.aidl
View File

@@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.internal.net; package android.net;
parcelable VpnInfo; parcelable VpnInfo;

2
services/core/java/com/android/server/net/NetworkStatsFactory.java
View File

@@ -27,6 +27,7 @@ import static com.android.server.NetworkManagementSocketTagger.kernelToTag;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.net.INetd; import android.net.INetd;
import android.net.NetworkStats; import android.net.NetworkStats;
import android.net.VpnInfo;
import android.net.util.NetdService; import android.net.util.NetdService;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.StrictMode; import android.os.StrictMode;
@@ -34,7 +35,6 @@ import android.os.SystemClock;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.net.VpnInfo;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.internal.util.ProcFileReader; import com.android.internal.util.ProcFileReader;

2
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -105,6 +105,7 @@ import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.net.TrafficStats; import android.net.TrafficStats;
import android.net.Uri; import android.net.Uri;
import android.net.VpnInfo;
import android.net.netstats.provider.INetworkStatsProvider; import android.net.netstats.provider.INetworkStatsProvider;
import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.netstats.provider.INetworkStatsProviderCallback;
import android.net.netstats.provider.NetworkStatsProvider; import android.net.netstats.provider.NetworkStatsProvider;
@@ -143,7 +144,6 @@ import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.net.VpnInfo;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.internal.util.DumpUtils; import com.android.internal.util.DumpUtils;
import com.android.internal.util.FileRotator; import com.android.internal.util.FileRotator;