diff options
| -rw-r--r-- | api/current.txt | 18 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/CallIdentification.java | 17 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 21 |
4 files changed, 27 insertions, 33 deletions
diff --git a/api/current.txt b/api/current.txt index 6474cb8f439e..9974de41c9f8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -43355,14 +43355,14 @@ package android.telecom { field @NonNull public static final android.os.Parcelable.Creator<android.telecom.CallIdentification> CREATOR; } - public static final class CallIdentification.Builder { + public static class CallIdentification.Builder { ctor public CallIdentification.Builder(); - method @NonNull public android.telecom.CallIdentification build(); - method @NonNull public android.telecom.CallIdentification.Builder setDescription(@Nullable CharSequence); - method @NonNull public android.telecom.CallIdentification.Builder setDetails(@Nullable CharSequence); - method @NonNull public android.telecom.CallIdentification.Builder setName(@Nullable CharSequence); - method @NonNull public android.telecom.CallIdentification.Builder setNuisanceConfidence(int); - method @NonNull public android.telecom.CallIdentification.Builder setPhoto(@Nullable android.graphics.drawable.Icon); + method public android.telecom.CallIdentification build(); + method public android.telecom.CallIdentification.Builder setDescription(@Nullable CharSequence); + method public android.telecom.CallIdentification.Builder setDetails(@Nullable CharSequence); + method public android.telecom.CallIdentification.Builder setName(@Nullable CharSequence); + method public android.telecom.CallIdentification.Builder setNuisanceConfidence(int); + method public android.telecom.CallIdentification.Builder setPhoto(@Nullable android.graphics.drawable.Icon); } public abstract class CallRedirectionService extends android.app.Service { @@ -43983,8 +43983,8 @@ package android.telecom { method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts(); method public android.telecom.PhoneAccountHandle getSimCallManager(); - method @Nullable public String getSystemDialerPackage(); - method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @Nullable public android.telecom.PhoneAccountHandle getUserSelectedOutgoingPhoneAccount(); + method public String getSystemDialerPackage(); + method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telecom.PhoneAccountHandle getUserSelectedOutgoingPhoneAccount(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber(android.telecom.PhoneAccountHandle); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handleMmi(String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean handleMmi(String, android.telecom.PhoneAccountHandle); diff --git a/api/system-current.txt b/api/system-current.txt index bcedee08f305..8b2109f009c6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7070,8 +7070,8 @@ package android.telecom { method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall(); method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging(); - method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) public boolean setDefaultDialer(@Nullable String); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle); + method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) public boolean setDefaultDialer(String); + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(android.telecom.PhoneAccountHandle); field public static final String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT"; field public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT"; field public static final String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE"; diff --git a/telecomm/java/android/telecom/CallIdentification.java b/telecomm/java/android/telecom/CallIdentification.java index 745affd6b17d..d15e024ecca2 100644 --- a/telecomm/java/android/telecom/CallIdentification.java +++ b/telecomm/java/android/telecom/CallIdentification.java @@ -44,7 +44,7 @@ public final class CallIdentification implements Parcelable { * A {@link CallScreeningService} uses this class to create new instances of * {@link CallIdentification} for a screened call. */ - public final static class Builder { + public static class Builder { private CharSequence mName; private CharSequence mDescription; private CharSequence mDetails; @@ -67,7 +67,7 @@ public final class CallIdentification implements Parcelable { * @param callIdAppName The app name. * @hide */ - public Builder(@NonNull String callIdPackageName, @NonNull CharSequence callIdAppName) { + public Builder(String callIdPackageName, CharSequence callIdAppName) { mPackageName = callIdPackageName; mAppName = callIdAppName; } @@ -80,7 +80,7 @@ public final class CallIdentification implements Parcelable { * @param name The name associated with the call, or {@code null} if none is provided. * @return Builder instance. */ - public @NonNull Builder setName(@Nullable CharSequence name) { + public Builder setName(@Nullable CharSequence name) { mName = name; return this; } @@ -97,7 +97,7 @@ public final class CallIdentification implements Parcelable { * @param description The call description, or {@code null} if none is provided. * @return Builder instance. */ - public @NonNull Builder setDescription(@Nullable CharSequence description) { + public Builder setDescription(@Nullable CharSequence description) { mDescription = description; return this; } @@ -114,8 +114,7 @@ public final class CallIdentification implements Parcelable { * @param details The call details, or {@code null} if none is provided. * @return Builder instance. */ - - public @NonNull Builder setDetails(@Nullable CharSequence details) { + public Builder setDetails(@Nullable CharSequence details) { mDetails = details; return this; } @@ -128,7 +127,7 @@ public final class CallIdentification implements Parcelable { * @param photo The photo associated with the call, or {@code null} if none was provided. * @return Builder instance. */ - public @NonNull Builder setPhoto(@Nullable Icon photo) { + public Builder setPhoto(@Nullable Icon photo) { mPhoto = photo; return this; } @@ -142,7 +141,7 @@ public final class CallIdentification implements Parcelable { * @param nuisanceConfidence The nuisance confidence. * @return The builder. */ - public @NonNull Builder setNuisanceConfidence(@NuisanceConfidence int nuisanceConfidence) { + public Builder setNuisanceConfidence(@NuisanceConfidence int nuisanceConfidence) { mNuisanceConfidence = nuisanceConfidence; return this; } @@ -153,7 +152,7 @@ public final class CallIdentification implements Parcelable { * * @return {@link CallIdentification} instance. */ - public @NonNull CallIdentification build() { + public CallIdentification build() { return new CallIdentification(mName, mDescription, mDetails, mPhoto, mNuisanceConfidence, mPackageName, mAppName); } diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 7688ac6857af..d5091680285b 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -17,7 +17,6 @@ package android.telecom; import android.Manifest; import android.annotation.IntDef; import android.annotation.NonNull; -import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SuppressAutoDoc; import android.annotation.SuppressLint; @@ -815,11 +814,10 @@ public class TelecomManager { * <p> * The default dialer has access to use this method. * - * @return The user outgoing phone account selected by the user, or {@code null} if there is no - * user selected outgoing {@link PhoneAccountHandle}. + * @return The user outgoing phone account selected by the user. */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) - public @Nullable PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() { + public PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() { try { if (isServiceConnected()) { return getTelecomService().getUserSelectedOutgoingPhoneAccount( @@ -835,14 +833,13 @@ public class TelecomManager { * Sets the user-chosen default {@link PhoneAccountHandle} for making outgoing phone calls. * * @param accountHandle The {@link PhoneAccountHandle} which will be used by default for making - * outgoing voice calls, or {@code null} if no default is specified (the - * user will be asked each time a call is placed in this case). + * outgoing voice calls. * @hide */ @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @TestApi @SystemApi - public void setUserSelectedOutgoingPhoneAccount(@Nullable PhoneAccountHandle accountHandle) { + public void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle accountHandle) { try { if (isServiceConnected()) { getTelecomService().setUserSelectedOutgoingPhoneAccount(accountHandle); @@ -1209,8 +1206,7 @@ public class TelecomManager { /** * Used to set the default dialer package. * - * @param packageName to set the default dialer to, or {@code null} if the system provided - * dialer should be used instead. + * @param packageName to set the default dialer to. * * @result {@code true} if the default dialer was successfully changed, {@code false} if * the specified package does not correspond to an installed dialer, or is already @@ -1229,7 +1225,7 @@ public class TelecomManager { @RequiresPermission(allOf = { android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) - public boolean setDefaultDialer(@Nullable String packageName) { + public boolean setDefaultDialer(String packageName) { try { if (isServiceConnected()) { return getTelecomService().setDefaultDialer(packageName); @@ -1243,10 +1239,9 @@ public class TelecomManager { /** * Determines the package name of the system-provided default phone app. * - * @return package name for the system dialer package or {@code null} if no system dialer is - * preloaded. + * @return package name for the system dialer package or null if no system dialer is preloaded. */ - public @Nullable String getSystemDialerPackage() { + public String getSystemDialerPackage() { try { if (isServiceConnected()) { return getTelecomService().getSystemDialerPackage(); |