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

Commit 7e8cbfe8 authored by Nathan Harold's avatar Nathan Harold Committed by Automerger Merge Worker
Browse files

Merge "Expose MmTelCapabilities#isCapable() as Public API" am: 784c6a8d am: f3fa23f7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1314566

Change-Id: Ia842bd6f2fd30cdf378b424cf710ba654da06dd4
parents 71a98897 f3fa23f7
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -49108,6 +49108,7 @@ package android.telephony.ims.feature {
  }
  public static class MmTelFeature.MmTelCapabilities {
    method public final boolean isCapable(int);
    field public static final int CAPABILITY_TYPE_SMS = 8; // 0x8
    field public static final int CAPABILITY_TYPE_UT = 4; // 0x4
    field public static final int CAPABILITY_TYPE_VIDEO = 2; // 0x2
+0 −1
Original line number Diff line number Diff line
@@ -12249,7 +12249,6 @@ package android.telephony.ims.feature {
    ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities);
    ctor public MmTelFeature.MmTelCapabilities(int);
    method public final void addCapabilities(int);
    method public final boolean isCapable(int);
    method public final void removeCapabilities(int);
  }
+0 −1
Original line number Diff line number Diff line
@@ -4707,7 +4707,6 @@ package android.telephony.ims.feature {
    ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities);
    ctor public MmTelFeature.MmTelCapabilities(int);
    method public final void addCapabilities(int);
    method public final boolean isCapable(int);
    method public final void removeCapabilities(int);
  }

+1 −0
Original line number Diff line number Diff line
@@ -47276,6 +47276,7 @@ package android.telephony.ims.feature {
  }
  public static class MmTelFeature.MmTelCapabilities {
    method public final boolean isCapable(int);
    field public static final int CAPABILITY_TYPE_SMS = 8; // 0x8
    field public static final int CAPABILITY_TYPE_UT = 4; // 0x4
    field public static final int CAPABILITY_TYPE_VIDEO = 2; // 0x2
+0 −1
Original line number Diff line number Diff line
@@ -11131,7 +11131,6 @@ package android.telephony.ims.feature {
    ctor @Deprecated public MmTelFeature.MmTelCapabilities(android.telephony.ims.feature.ImsFeature.Capabilities);
    ctor public MmTelFeature.MmTelCapabilities(int);
    method public final void addCapabilities(int);
    method public final boolean isCapable(int);
    method public final void removeCapabilities(int);
  }
Loading