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

Commit bff270be authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

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

am: e427c179

Change-Id: Ib852b0555f0e20b858f9dd0b16dbd98dbbd22b55
parents 42b9b272 e427c179

packages/NetworkStack/src/com/android/server/NetworkObserverRegistry.java

+5 −0
Original line number Diff line number Diff line
@@ -181,4 +181,9 @@ public class NetworkObserverRegistry extends INetdUnsolicitedEventListener.Stub 


    @Override

    public void onStrictCleartextDetected(int uid, String hex) {}



    @Override

    public int getInterfaceVersion() {

        return INetdUnsolicitedEventListener.VERSION;

    }

}

services/core/java/com/android/server/NetworkManagementService.java

+5 −0
Original line number Diff line number Diff line
@@ -730,6 +730,11 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 
            ActivityManager.getService().notifyCleartextNetwork(uid,

                    HexDump.hexStringToByteArray(hex));

        }



        @Override

        public int getInterfaceVersion() {

            return INetdUnsolicitedEventListener.VERSION;

        }

    }



    //