Mark arg and extras @Nullable in ContentProvider#call()
Change-Id: I431b01323fe76c744520c72661d30f6b9cb6b7f1
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 0cff4c0..393cf8e 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -19,6 +19,7 @@
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.Manifest.permission.INTERACT_ACROSS_USERS;
+import android.annotation.Nullable;
import android.app.AppOpsManager;
import android.content.pm.PathPermission;
import android.content.pm.ProviderInfo;
@@ -364,7 +365,8 @@
}
@Override
- public Bundle call(String callingPkg, String method, String arg, Bundle extras) {
+ public Bundle call(
+ String callingPkg, String method, @Nullable String arg, @Nullable Bundle extras) {
final String original = setCallingPackage(callingPkg);
try {
return ContentProvider.this.call(method, arg, extras);
@@ -1742,7 +1744,7 @@
* @return provider-defined return value. May be {@code null}, which is also
* the default for providers which don't implement any call methods.
*/
- public Bundle call(String method, String arg, Bundle extras) {
+ public Bundle call(String method, @Nullable String arg, @Nullable Bundle extras) {
return null;
}