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

Commit dc11265a authored by Mark Chien's avatar Mark Chien Committed by Automerger Merge Worker
Browse files

Merge "Support static address configuration" into rvc-dev am: 17c6d8f4 am: 74aff0cf 

Change-Id: I66c03a69eef0e9340c381dfa11f3246a6c11cc4f
parents bbea7457 74aff0cf

api/module-lib-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -127,9 +127,11 @@ package android.net { 
  public static class TetheringManager.TetheringRequest.Builder {

    ctor public TetheringManager.TetheringRequest.Builder(int);

    method @NonNull public android.net.TetheringManager.TetheringRequest build();

    method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();

    method @Nullable public android.net.LinkAddress getLocalIpv4Address();

    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);

    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);

    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder useStaticIpv4Addresses(@NonNull android.net.LinkAddress);

    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);

  }



}

api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -6597,9 +6597,11 @@ package android.net { 
  public static class TetheringManager.TetheringRequest.Builder {

    ctor public TetheringManager.TetheringRequest.Builder(int);

    method @NonNull public android.net.TetheringManager.TetheringRequest build();

    method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();

    method @Nullable public android.net.LinkAddress getLocalIpv4Address();

    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);

    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);

    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder useStaticIpv4Addresses(@NonNull android.net.LinkAddress);

    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);

  }















  public class TrafficStats {

































api/test-current.txt



+3
−1




























Original line number
Diff line number
Diff line








@@ -1976,9 +1976,11 @@ package android.net {













  public static class TetheringManager.TetheringRequest.Builder {















    ctor public TetheringManager.TetheringRequest.Builder(int);















    method @NonNull public android.net.TetheringManager.TetheringRequest build();













    method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();













    method @Nullable public android.net.LinkAddress getLocalIpv4Address();















    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);















    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);













    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder useStaticIpv4Addresses(@NonNull android.net.LinkAddress);













    method @NonNull @RequiresPermission("android.permission.TETHER_PRIVILEGED") public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);















  }































  public class TrafficStats {

































packages/Tethering/common/TetheringLib/api/module-lib-current.txt



+3
−1




























Original line number
Diff line number
Diff line








@@ -117,9 +117,11 @@ package android.net {













  public static class TetheringManager.TetheringRequest.Builder {















    ctor public TetheringManager.TetheringRequest.Builder(int);















    method @NonNull public android.net.TetheringManager.TetheringRequest build();













    method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();













    method @Nullable public android.net.LinkAddress getLocalIpv4Address();















    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);















    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);













    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder useStaticIpv4Addresses(@NonNull android.net.LinkAddress);













    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);















  }































}

































packages/Tethering/common/TetheringLib/api/system-current.txt



+3
−1




























Original line number
Diff line number
Diff line








@@ -95,9 +95,11 @@ package android.net {













  public static class TetheringManager.TetheringRequest.Builder {















    ctor public TetheringManager.TetheringRequest.Builder(int);















    method @NonNull public android.net.TetheringManager.TetheringRequest build();













    method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();













    method @Nullable public android.net.LinkAddress getLocalIpv4Address();















    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);















    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setSilentProvisioning(boolean);













    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder useStaticIpv4Addresses(@NonNull android.net.LinkAddress);













    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);















  }































}