Merge "add NonNull and Nullable annotation to APIs" am: c931e9b0c0 am: 715c2d87cc

am: 3bc4573765

Change-Id: I35e81dcc8e091e91cf335587849c596134781a7c

diff --cc api/current.txt
index 79e11a4,5cba153..a888b08
mode 100644,100755..100644
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt

diff --cc api/system-current.txt
index 56df6c5,d56cdec..8325cbc
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -7876,9 -6295,8 +7876,9 @@@ package android.telephony 
      method public void requestEmbeddedSubscriptionInfoListRefresh(int);
      method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultDataSubId(int);
      method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDefaultSmsSubId(int);
 +    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPreferredDataSubscriptionId(int, boolean, @NonNull java.util.concurrent.Executor, java.util.function.Consumer<java.lang.Integer>);
      method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setSubscriptionEnabled(int, boolean);
-     field public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;
+     field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;
      field public static final int PROFILE_CLASS_DEFAULT = -1; // 0xffffffff
      field public static final int PROFILE_CLASS_OPERATIONAL = 2; // 0x2
      field public static final int PROFILE_CLASS_PROVISIONING = 1; // 0x1

diff --cc services/core/java/com/android/server/TelephonyRegistry.java
Simple merge

diff --cc telephony/java/android/provider/Telephony.java
Simple merge

diff --cc telephony/java/android/telephony/PhoneStateListener.java
Simple merge

diff --cc telephony/java/android/telephony/SubscriptionManager.java
Simple merge