1 files changed, 8 insertions, 13 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 558d8d495d5c..6b53b39b5706 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;
@@ -810,11 +809,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(
@@ -830,14 +828,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);
@@ -1204,8 +1201,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
@@ -1222,7 +1218,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);
@@ -1236,10 +1232,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();