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

Commit 757dbc37 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Freeze the networkstack-aidl-interfaces interface 

This freezes the interface as of the latest beta build, not the tip of
tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in
particular.

Generated with:
m networkstack-aidl-interfaces-freeze-api \
    ipmemorystore-aidl-interfaces-freeze-api

Test: flashed, booted, WiFi and captive portal working
Bug: 128803828
Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424
Merged-In: Ideabe73fc93bbefca2d624ee9ca190cf31419424
(cherry picked from commit 9b89cdaaf401a6b77e160807039c06e537fa600a)
parent 696396fb

src/android/net/dhcp/DhcpServer.java

+5 −0
Original line number Diff line number Diff line
@@ -647,4 +647,9 @@ public class DhcpServer extends IDhcpServer.Stub { 
            }

        }

    }



    @Override

    public int getInterfaceVersion() {

        return this.VERSION;

    }

}

src/android/net/ip/IpClient.java

+5 −0
Original line number Diff line number Diff line
@@ -557,6 +557,11 @@ public class IpClient extends StateMachine { 
            checkNetworkStackCallingPermission();

            IpClient.this.removeKeepalivePacketFilter(slot);

        }



        @Override

        public int getInterfaceVersion() {

            return this.VERSION;

        }

    }



    public String getInterfaceName() {

src/com/android/server/NetworkStackService.java

+10 −0
Original line number Diff line number Diff line
@@ -251,6 +251,11 @@ public class NetworkStackService extends Service { 
                }

            }

        }



        @Override

        public int getInterfaceVersion() {

            return this.VERSION;

        }

    }



    private static class NetworkMonitorImpl extends INetworkMonitor.Stub {
@@ -325,5 +330,10 @@ public class NetworkStackService extends Service { 
            checkNetworkStackCallingPermission();

            mNm.notifyNetworkCapabilitiesChanged(nc);

        }



        @Override

        public int getInterfaceVersion() {

            return this.VERSION;

        }

    }

}

src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java

+5 −0
Original line number Diff line number Diff line
@@ -494,4 +494,9 @@ public class IpMemoryStoreService extends IIpMemoryStore.Stub { 
        listener.onComplete(makeStatus(ERROR_INTERNAL_INTERRUPTED));

        return true;

    }



    @Override

    public int getInterfaceVersion() {

        return this.VERSION;

    }

}

src/com/android/server/connectivity/ipmemorystore/RegularMaintenanceJobService.java

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,11 @@ public final class RegularMaintenanceJobService extends JobService { 
                jobFinished(params, !result.isSuccess());

            }



            @Override

            public int getInterfaceVersion() {

                return this.VERSION;

            }



            @Override

            public IBinder asBinder() {

                return null;