summaryrefslogtreecommitdiffstats
path: root/telecomm/java
diff options
context:
space:
mode:
Diffstat (limited to 'telecomm/java')
-rw-r--r--telecomm/java/android/telecom/Call.java15
-rw-r--r--telecomm/java/android/telecom/CallAudioState.java8
-rw-r--r--telecomm/java/android/telecom/Connection.java27
-rw-r--r--telecomm/java/android/telecom/ConnectionService.java2
-rw-r--r--telecomm/java/android/telecom/ParcelableCall.java11
-rw-r--r--telecomm/java/android/telecom/ParcelableConnection.java10
-rw-r--r--telecomm/java/android/telecom/PhoneAccount.java42
7 files changed, 12 insertions, 103 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index eab13af..6511705 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -253,7 +253,6 @@ public final class Call {
private final PhoneAccountHandle mAccountHandle;
private final int mCallCapabilities;
private final int mCallProperties;
- private final int mSupportedAudioRoutes;
private final DisconnectCause mDisconnectCause;
private final long mConnectTimeMillis;
private final GatewayInfo mGatewayInfo;
@@ -449,15 +448,6 @@ public final class Call {
}
/**
- * @return a bitmask of the audio routes available for the call.
- *
- * @hide
- */
- public int getSupportedAudioRoutes() {
- return mSupportedAudioRoutes;
- }
-
- /**
* @return For a {@link #STATE_DISCONNECTED} {@code Call}, the disconnect cause expressed
* by {@link android.telecom.DisconnectCause}.
*/
@@ -523,7 +513,6 @@ public final class Call {
Objects.equals(mAccountHandle, d.mAccountHandle) &&
Objects.equals(mCallCapabilities, d.mCallCapabilities) &&
Objects.equals(mCallProperties, d.mCallProperties) &&
- Objects.equals(mSupportedAudioRoutes, d.mSupportedAudioRoutes) &&
Objects.equals(mDisconnectCause, d.mDisconnectCause) &&
Objects.equals(mConnectTimeMillis, d.mConnectTimeMillis) &&
Objects.equals(mGatewayInfo, d.mGatewayInfo) &&
@@ -545,7 +534,6 @@ public final class Call {
Objects.hashCode(mAccountHandle) +
Objects.hashCode(mCallCapabilities) +
Objects.hashCode(mCallProperties) +
- Objects.hashCode(mSupportedAudioRoutes) +
Objects.hashCode(mDisconnectCause) +
Objects.hashCode(mConnectTimeMillis) +
Objects.hashCode(mGatewayInfo) +
@@ -564,7 +552,6 @@ public final class Call {
PhoneAccountHandle accountHandle,
int capabilities,
int properties,
- int audioRoutes,
DisconnectCause disconnectCause,
long connectTimeMillis,
GatewayInfo gatewayInfo,
@@ -579,7 +566,6 @@ public final class Call {
mAccountHandle = accountHandle;
mCallCapabilities = capabilities;
mCallProperties = properties;
- mSupportedAudioRoutes = audioRoutes;
mDisconnectCause = disconnectCause;
mConnectTimeMillis = connectTimeMillis;
mGatewayInfo = gatewayInfo;
@@ -1022,7 +1008,6 @@ public final class Call {
parcelableCall.getAccountHandle(),
parcelableCall.getCapabilities(),
parcelableCall.getProperties(),
- parcelableCall.getSupportedAudioRoutes(),
parcelableCall.getDisconnectCause(),
parcelableCall.getConnectTimeMillis(),
parcelableCall.getGatewayInfo(),
diff --git a/telecomm/java/android/telecom/CallAudioState.java b/telecomm/java/android/telecom/CallAudioState.java
index f601d8b..2b16722 100644
--- a/telecomm/java/android/telecom/CallAudioState.java
+++ b/telecomm/java/android/telecom/CallAudioState.java
@@ -44,12 +44,8 @@ public final class CallAudioState implements Parcelable {
*/
public static final int ROUTE_WIRED_OR_EARPIECE = ROUTE_EARPIECE | ROUTE_WIRED_HEADSET;
- /**
- * Bit mask of all possible audio routes.
- *
- * @hide
- **/
- public static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |
+ /** Bit mask of all possible audio routes. */
+ private static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |
ROUTE_SPEAKER;
private final boolean isMuted;
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index a9c1bf5..520a1d7 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -416,7 +416,6 @@ public abstract class Connection extends Conferenceable {
public void onRingbackRequested(Connection c, boolean ringback) {}
public void onDestroyed(Connection c) {}
public void onConnectionCapabilitiesChanged(Connection c, int capabilities) {}
- public void onSupportedAudioRoutesChanged(Connection c, int supportedAudioRoutes) {}
public void onVideoProviderChanged(
Connection c, VideoProvider videoProvider) {}
public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
@@ -1083,7 +1082,6 @@ public abstract class Connection extends Conferenceable {
private int mCallerDisplayNamePresentation;
private boolean mRingbackRequested = false;
private int mConnectionCapabilities;
- private int mSupportedAudioRoutes = CallAudioState.ROUTE_ALL;
private VideoProvider mVideoProvider;
private boolean mAudioModeIsVoip;
private long mConnectTimeMillis = Conference.CONNECT_TIME_NOT_SPECIFIED;
@@ -1308,15 +1306,6 @@ public abstract class Connection extends Conferenceable {
}
/**
- * Returns the connection's supported audio routes.
- *
- * @hide
- */
- public final int getSupportedAudioRoutes() {
- return mSupportedAudioRoutes;
- }
-
- /**
* Sets the value of the {@link #getAddress()} property.
*
* @param address The new address.
@@ -1513,22 +1502,6 @@ public abstract class Connection extends Conferenceable {
}
/**
- * Sets the supported audio routes.
- *
- * @param supportedAudioRoutes the supported audio routes as a bitmask.
- * See {@link CallAudioState}
- * @hide
- */
- public final void setSupportedAudioRoutes(int supportedAudioRoutes) {
- if (mSupportedAudioRoutes != supportedAudioRoutes) {
- mSupportedAudioRoutes = supportedAudioRoutes;
- for (Listener l : mListeners) {
- l.onSupportedAudioRoutesChanged(this, mSupportedAudioRoutes);
- }
- }
- }
-
- /**
* Tears down the Connection object.
*/
public final void destroy() {
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index 9738a26..ceaa1bf 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -669,7 +669,6 @@ public abstract class ConnectionService extends Service {
request.getAccountHandle(),
connection.getState(),
connection.getConnectionCapabilities(),
- connection.getSupportedAudioRoutes(),
connection.getAddress(),
connection.getAddressPresentation(),
connection.getCallerDisplayName(),
@@ -1012,7 +1011,6 @@ public abstract class ConnectionService extends Service {
phoneAccountHandle,
connection.getState(),
connection.getConnectionCapabilities(),
- connection.getSupportedAudioRoutes(),
connection.getAddress(),
connection.getAddressPresentation(),
connection.getCallerDisplayName(),
diff --git a/telecomm/java/android/telecom/ParcelableCall.java b/telecomm/java/android/telecom/ParcelableCall.java
index 599c210..8cf4aeb 100644
--- a/telecomm/java/android/telecom/ParcelableCall.java
+++ b/telecomm/java/android/telecom/ParcelableCall.java
@@ -39,7 +39,6 @@ public final class ParcelableCall implements Parcelable {
private final List<String> mCannedSmsResponses;
private final int mCapabilities;
private final int mProperties;
- private final int mSupportedAudioRoutes;
private final long mConnectTimeMillis;
private final Uri mHandle;
private final int mHandlePresentation;
@@ -65,7 +64,6 @@ public final class ParcelableCall implements Parcelable {
List<String> cannedSmsResponses,
int capabilities,
int properties,
- int supportedAudioRoutes,
long connectTimeMillis,
Uri handle,
int handlePresentation,
@@ -88,7 +86,6 @@ public final class ParcelableCall implements Parcelable {
mCannedSmsResponses = cannedSmsResponses;
mCapabilities = capabilities;
mProperties = properties;
- mSupportedAudioRoutes = supportedAudioRoutes;
mConnectTimeMillis = connectTimeMillis;
mHandle = handle;
mHandlePresentation = handlePresentation;
@@ -140,11 +137,6 @@ public final class ParcelableCall implements Parcelable {
/** Bitmask of properties of the call. */
public int getProperties() { return mProperties; }
- /** Bitmask of supported routes of the call */
- public int getSupportedAudioRoutes() {
- return mSupportedAudioRoutes;
- }
-
/** The time that the call switched to the active state. */
public long getConnectTimeMillis() {
return mConnectTimeMillis;
@@ -299,7 +291,6 @@ public final class ParcelableCall implements Parcelable {
source.readList(conferenceableCallIds, classLoader);
Bundle intentExtras = source.readBundle(classLoader);
Bundle extras = source.readBundle(classLoader);
- int supportedAudioRoutes = source.readInt();
return new ParcelableCall(
id,
state,
@@ -307,7 +298,6 @@ public final class ParcelableCall implements Parcelable {
cannedSmsResponses,
capabilities,
properties,
- supportedAudioRoutes,
connectTimeMillis,
handle,
handlePresentation,
@@ -364,7 +354,6 @@ public final class ParcelableCall implements Parcelable {
destination.writeList(mConferenceableCallIds);
destination.writeBundle(mIntentExtras);
destination.writeBundle(mExtras);
- destination.writeInt(mSupportedAudioRoutes);
}
@Override
diff --git a/telecomm/java/android/telecom/ParcelableConnection.java b/telecomm/java/android/telecom/ParcelableConnection.java
index 3ce9176..fe0a4d8 100644
--- a/telecomm/java/android/telecom/ParcelableConnection.java
+++ b/telecomm/java/android/telecom/ParcelableConnection.java
@@ -36,7 +36,6 @@ public final class ParcelableConnection implements Parcelable {
private final PhoneAccountHandle mPhoneAccount;
private final int mState;
private final int mConnectionCapabilities;
- private final int mSupportedAudioRoutes;
private final Uri mAddress;
private final int mAddressPresentation;
private final String mCallerDisplayName;
@@ -56,7 +55,6 @@ public final class ParcelableConnection implements Parcelable {
PhoneAccountHandle phoneAccount,
int state,
int capabilities,
- int supportedAudioRoutes,
Uri address,
int addressPresentation,
String callerDisplayName,
@@ -73,7 +71,6 @@ public final class ParcelableConnection implements Parcelable {
mPhoneAccount = phoneAccount;
mState = state;
mConnectionCapabilities = capabilities;
- mSupportedAudioRoutes = supportedAudioRoutes;
mAddress = address;
mAddressPresentation = addressPresentation;
mCallerDisplayName = callerDisplayName;
@@ -102,10 +99,6 @@ public final class ParcelableConnection implements Parcelable {
return mConnectionCapabilities;
}
- public int getSupportedAudioRoutes() {
- return mSupportedAudioRoutes;
- }
-
public Uri getHandle() {
return mAddress;
}
@@ -196,13 +189,11 @@ public final class ParcelableConnection implements Parcelable {
List<String> conferenceableConnectionIds = new ArrayList<>();
source.readStringList(conferenceableConnectionIds);
Bundle extras = source.readBundle(classLoader);
- int supportedAudioRoutes = source.readInt();
return new ParcelableConnection(
phoneAccount,
state,
capabilities,
- supportedAudioRoutes,
address,
addressPresentation,
callerDisplayName,
@@ -250,6 +241,5 @@ public final class ParcelableConnection implements Parcelable {
destination.writeParcelable(mDisconnectCause, 0);
destination.writeStringList(mConferenceableConnectionIds);
destination.writeBundle(mExtras);
- destination.writeInt(mSupportedAudioRoutes);
}
}
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
index e7f5e3c..b64043c 100644
--- a/telecomm/java/android/telecom/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -17,6 +17,15 @@
package android.telecom;
import android.annotation.SystemApi;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources.NotFoundException;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.os.Parcel;
@@ -27,6 +36,7 @@ import java.lang.String;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.MissingResourceException;
/**
* Represents a distinct method to place or receive a phone call. Apps which can place calls and
@@ -157,7 +167,6 @@ public final class PhoneAccount implements Parcelable {
private final CharSequence mLabel;
private final CharSequence mShortDescription;
private final List<String> mSupportedUriSchemes;
- private final int mSupportedAudioRoutes;
private final Icon mIcon;
private boolean mIsEnabled;
@@ -165,12 +174,10 @@ public final class PhoneAccount implements Parcelable {
* Helper class for creating a {@link PhoneAccount}.
*/
public static class Builder {
-
private PhoneAccountHandle mAccountHandle;
private Uri mAddress;
private Uri mSubscriptionAddress;
private int mCapabilities;
- private int mSupportedAudioRoutes = CallAudioState.ROUTE_ALL;
private int mHighlightColor = NO_HIGHLIGHT_COLOR;
private CharSequence mLabel;
private CharSequence mShortDescription;
@@ -203,7 +210,6 @@ public final class PhoneAccount implements Parcelable {
mSupportedUriSchemes.addAll(phoneAccount.getSupportedUriSchemes());
mIcon = phoneAccount.getIcon();
mIsEnabled = phoneAccount.isEnabled();
- mSupportedAudioRoutes = phoneAccount.getSupportedAudioRoutes();
}
/**
@@ -314,18 +320,6 @@ public final class PhoneAccount implements Parcelable {
}
/**
- * Sets the audio routes supported by this {@link PhoneAccount}.
- *
- * @param routes bit mask of available routes.
- * @return The builder.
- * @hide
- */
- public Builder setSupportedAudioRoutes(int routes) {
- mSupportedAudioRoutes = routes;
- return this;
- }
-
- /**
* Creates an instance of a {@link PhoneAccount} based on the current builder settings.
*
* @return The {@link PhoneAccount}.
@@ -346,7 +340,6 @@ public final class PhoneAccount implements Parcelable {
mLabel,
mShortDescription,
mSupportedUriSchemes,
- mSupportedAudioRoutes,
mIsEnabled);
}
}
@@ -361,7 +354,6 @@ public final class PhoneAccount implements Parcelable {
CharSequence label,
CharSequence shortDescription,
List<String> supportedUriSchemes,
- int supportedAudioRoutes,
boolean isEnabled) {
mAccountHandle = account;
mAddress = address;
@@ -372,7 +364,6 @@ public final class PhoneAccount implements Parcelable {
mLabel = label;
mShortDescription = shortDescription;
mSupportedUriSchemes = Collections.unmodifiableList(supportedUriSchemes);
- mSupportedAudioRoutes = supportedAudioRoutes;
mIsEnabled = isEnabled;
}
@@ -472,15 +463,6 @@ public final class PhoneAccount implements Parcelable {
}
/**
- * The audio routes supported by this {@code PhoneAccount}.
- *
- * @hide
- */
- public int getSupportedAudioRoutes() {
- return mSupportedAudioRoutes;
- }
-
- /**
* The icon to represent this {@code PhoneAccount}.
*
* @return The icon.
@@ -579,7 +561,6 @@ public final class PhoneAccount implements Parcelable {
mIcon.writeToParcel(out, flags);
}
out.writeByte((byte) (mIsEnabled ? 1 : 0));
- out.writeInt(mSupportedAudioRoutes);
}
public static final Creator<PhoneAccount> CREATOR
@@ -622,7 +603,6 @@ public final class PhoneAccount implements Parcelable {
mIcon = null;
}
mIsEnabled = in.readByte() == 1;
- mSupportedAudioRoutes = in.readInt();
}
@Override
@@ -633,8 +613,6 @@ public final class PhoneAccount implements Parcelable {
.append(mAccountHandle)
.append(" Capabilities: ")
.append(mCapabilities)
- .append(" Audio Routes: ")
- .append(mSupportedAudioRoutes)
.append(" Schemes: ");
for (String scheme : mSupportedUriSchemes) {
sb.append(scheme)
generated by cgit v1.1 at 2025-08-16 09:41:17 +0000