Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Freeze netd AIDL interface (framework)" am: eb8d81ca14

Browse Source 
am: e427c17917

Change-Id: Ib852b0555f0e20b858f9dd0b16dbd98dbbd22b55
This commit is contained in:
Remi NGUYEN VAN
2019-04-11 10:29:59 -07:00
committed by android-build-merger
parent 42b9b27245 e427c17917
commit bff270bec1
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java
View File

@@ -181,4 +181,9 @@ public class NetworkObserverRegistry extends INetdUnsolicitedEventListener.Stub
@Override @Override
public void onStrictCleartextDetected(int uid, String hex) {} public void onStrictCleartextDetected(int uid, String hex) {}
@Override
public int getInterfaceVersion() {
return INetdUnsolicitedEventListener.VERSION;
}
} }

5
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -730,6 +730,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
ActivityManager.getService().notifyCleartextNetwork(uid, ActivityManager.getService().notifyCleartextNetwork(uid,
HexDump.hexStringToByteArray(hex)); HexDump.hexStringToByteArray(hex));
} }
@Override
public int getInterfaceVersion() {
return INetdUnsolicitedEventListener.VERSION;
}
} }
// //