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

Commit 439b4499 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "Address API council review comment about TetheringRequest" am: 0d8b1cfa am: 5deb1946 

Change-Id: I2cc4334a2e59e07a83f4ca23cbc1e240c7a9cbdc
parents 4aee9cfa 5deb1946

api/module-lib-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -120,16 +120,16 @@ package android.net { 
  }



  public static class TetheringManager.TetheringRequest {

  }



  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 public boolean getShouldShowEntitlementUi();

    method public int getTetheringType();

    method public boolean isExemptFromEntitlementCheck();

  }



  public static class TetheringManager.TetheringRequest.Builder {

    ctor public TetheringManager.TetheringRequest.Builder(int);

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

    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 setShouldShowEntitlementUi(boolean);

    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

+5 −5
Original line number Diff line number Diff line
@@ -4853,16 +4853,16 @@ package android.net { 
  }















  public static class TetheringManager.TetheringRequest {













  }

























  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 public boolean getShouldShowEntitlementUi();















    method public int getTetheringType();















    method public boolean isExemptFromEntitlementCheck();













  }

























  public static class TetheringManager.TetheringRequest.Builder {













    ctor public TetheringManager.TetheringRequest.Builder(int);













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















    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 setShouldShowEntitlementUi(boolean);















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

































api/test-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -1651,16 +1651,16 @@ package android.net {













  }































  public static class TetheringManager.TetheringRequest {













  }



























  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 public boolean getShouldShowEntitlementUi();















    method public int getTetheringType();















    method public boolean isExemptFromEntitlementCheck();













  }



























  public static class TetheringManager.TetheringRequest.Builder {













    ctor public TetheringManager.TetheringRequest.Builder(int);













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















    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 setShouldShowEntitlementUi(boolean);















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

































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



+5
−5




























Original line number
Diff line number
Diff line








@@ -110,16 +110,16 @@ package android.net {













  }































  public static class TetheringManager.TetheringRequest {













  }



























  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 public boolean getShouldShowEntitlementUi();















    method public int getTetheringType();















    method public boolean isExemptFromEntitlementCheck();













  }



























  public static class TetheringManager.TetheringRequest.Builder {













    ctor public TetheringManager.TetheringRequest.Builder(int);













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















    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 setShouldShowEntitlementUi(boolean);















    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



+5
−5




























Original line number
Diff line number
Diff line








@@ -81,16 +81,16 @@ package android.net {













  }































  public static class TetheringManager.TetheringRequest {













  }



























  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 public boolean getShouldShowEntitlementUi();















    method public int getTetheringType();















    method public boolean isExemptFromEntitlementCheck();













  }



























  public static class TetheringManager.TetheringRequest.Builder {













    ctor public TetheringManager.TetheringRequest.Builder(int);













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















    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 setShouldShowEntitlementUi(boolean);















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