Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Annotate ContextWrapper with @Nullable"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-02 20:12:25 +00:00
committed by Android (Google) Code Review
parent dc4b136412 34bd00d5d2
commit 88a7d70b2b
3 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/api/current.txt
View File

@@ -10328,7 +10328,7 @@ package android.content {
method public int checkPermission(String, int, int);
method public int checkSelfPermission(String);
method public int checkUriPermission(android.net.Uri, int, int, int);
method public int checkUriPermission(android.net.Uri, String, String, int, int, int);
method public int checkUriPermission(@Nullable android.net.Uri, @Nullable String, @Nullable String, int, int, int);
method @Deprecated public void clearWallpaper() throws java.io.IOException;
method public android.content.Context createConfigurationContext(android.content.res.Configuration);
method public android.content.Context createContextForSplit(String) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -10339,13 +10339,13 @@ package android.content {
method public boolean deleteDatabase(String);
method public boolean deleteFile(String);
method public boolean deleteSharedPreferences(String);
method public void enforceCallingOrSelfPermission(String, String);
method public void enforceCallingOrSelfPermission(String, @Nullable String);
method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, String);
method public void enforceCallingPermission(String, String);
method public void enforceCallingPermission(String, @Nullable String);
method public void enforceCallingUriPermission(android.net.Uri, int, String);
method public void enforcePermission(String, int, int, String);
method public void enforcePermission(String, int, int, @Nullable String);
method public void enforceUriPermission(android.net.Uri, int, int, int, String);
method public void enforceUriPermission(android.net.Uri, String, String, int, int, int, String);
method public void enforceUriPermission(@Nullable android.net.Uri, @Nullable String, @Nullable String, int, int, int, @Nullable String);
method public String[] fileList();
method public android.content.Context getApplicationContext();
method public android.content.pm.ApplicationInfo getApplicationInfo();
@@ -10358,9 +10358,9 @@ package android.content {
method public java.io.File getDataDir();
method public java.io.File getDatabasePath(String);
method public java.io.File getDir(String, int);
method public java.io.File getExternalCacheDir();
method @Nullable public java.io.File getExternalCacheDir();
method public java.io.File[] getExternalCacheDirs();
method public java.io.File getExternalFilesDir(String);
method @Nullable public java.io.File getExternalFilesDir(@Nullable String);
method public java.io.File[] getExternalFilesDirs(String);
method public java.io.File[] getExternalMediaDirs();
method public java.io.File getFileStreamPath(String);
@@ -10388,40 +10388,40 @@ package android.content {
method public java.io.FileInputStream openFileInput(String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, @Nullable android.database.DatabaseErrorHandler);
method @Deprecated public android.graphics.drawable.Drawable peekWallpaper();
method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);
method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, int);
method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, String, android.os.Handler);
method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, String, android.os.Handler, int);
method public android.content.Intent registerReceiver(@Nullable android.content.BroadcastReceiver, android.content.IntentFilter);
method public android.content.Intent registerReceiver(@Nullable android.content.BroadcastReceiver, android.content.IntentFilter, int);
method public android.content.Intent registerReceiver(@Nullable android.content.BroadcastReceiver, android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler);
method public android.content.Intent registerReceiver(@Nullable android.content.BroadcastReceiver, android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int);
method @Deprecated public void removeStickyBroadcast(android.content.Intent);
method @Deprecated public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
method public void revokeUriPermission(android.net.Uri, int);
method public void revokeUriPermission(String, android.net.Uri, int);
method public void sendBroadcast(android.content.Intent);
method public void sendBroadcast(android.content.Intent, String);
method public void sendBroadcast(android.content.Intent, @Nullable String);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, String);
method public void sendOrderedBroadcast(android.content.Intent, String);
method public void sendOrderedBroadcast(android.content.Intent, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
method public void sendOrderedBroadcast(android.content.Intent, @Nullable String);
method public void sendOrderedBroadcast(android.content.Intent, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method public void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, int, @Nullable String, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, @Nullable String, @Nullable android.os.Bundle, @Nullable android.os.Bundle);
method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, String, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method @Deprecated public void sendStickyBroadcast(android.content.Intent);
method @Deprecated public void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
method @Deprecated public void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
method @Deprecated public void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
method @Deprecated public void sendStickyOrderedBroadcast(android.content.Intent, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method @Deprecated public void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method public void setTheme(int);
method @Deprecated public void setWallpaper(android.graphics.Bitmap) throws java.io.IOException;
method @Deprecated public void setWallpaper(java.io.InputStream) throws java.io.IOException;
method public void startActivities(android.content.Intent[]);
method public void startActivities(android.content.Intent[], android.os.Bundle);
method public void startActivities(android.content.Intent[], @Nullable android.os.Bundle);
method public void startActivity(android.content.Intent);
method public void startActivity(android.content.Intent, android.os.Bundle);
method public android.content.ComponentName startForegroundService(android.content.Intent);
method public boolean startInstrumentation(android.content.ComponentName, String, android.os.Bundle);
method public void startActivity(android.content.Intent, @Nullable android.os.Bundle);
method @Nullable public android.content.ComponentName startForegroundService(android.content.Intent);
method public boolean startInstrumentation(android.content.ComponentName, @Nullable String, @Nullable android.os.Bundle);
method public void startIntentSender(android.content.IntentSender, @Nullable android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
method public void startIntentSender(android.content.IntentSender, @Nullable android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException;
method public android.content.ComponentName startService(android.content.Intent);
method @Nullable public android.content.ComponentName startService(android.content.Intent);
method public boolean stopService(android.content.Intent);
method public void unbindService(android.content.ServiceConnection);
method public void unregisterReceiver(android.content.BroadcastReceiver);

8
core/api/system-current.txt
View File

@@ -1795,11 +1795,11 @@ package android.content {
public class ContextWrapper extends android.content.Context {
method public android.content.Context createCredentialProtectedStorageContext();
method public java.io.File getPreloadsFileCache();
method @Nullable public java.io.File getPreloadsFileCache();
method public boolean isCredentialProtectedStorage();
method public void sendBroadcast(android.content.Intent, String, android.os.Bundle);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, String, android.os.Bundle);
method public void sendOrderedBroadcast(android.content.Intent, String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
method public void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);
method public void sendOrderedBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
}
public class Intent implements java.lang.Cloneable android.os.Parcelable {

143
core/java/android/content/ContextWrapper.java
View File

@@ -270,7 +270,7 @@ public class ContextWrapper extends Context {
}
@Override
public File getExternalFilesDir(String type) {
public @Nullable File getExternalFilesDir(@Nullable String type) {
return mBase.getExternalFilesDir(type);
}
@@ -300,7 +300,7 @@ public class ContextWrapper extends Context {
}
@Override
public File getExternalCacheDir() {
public @Nullable File getExternalCacheDir() {
return mBase.getExternalCacheDir();
}
@@ -322,7 +322,7 @@ public class ContextWrapper extends Context {
/** @hide **/
@Override
public File getPreloadsFileCache() {
public @Nullable File getPreloadsFileCache() {
return mBase.getPreloadsFileCache();
}
@@ -333,7 +333,7 @@ public class ContextWrapper extends Context {
@Override
public SQLiteDatabase openOrCreateDatabase(String name, int mode, CursorFactory factory,
DatabaseErrorHandler errorHandler) {
@Nullable DatabaseErrorHandler errorHandler) {
return mBase.openOrCreateDatabase(name, mode, factory, errorHandler);
}
@@ -412,7 +412,7 @@ public class ContextWrapper extends Context {
/** @hide **/
public void startActivityForResult(
String who, Intent intent, int requestCode, Bundle options) {
String who, Intent intent, int requestCode, @Nullable Bundle options) {
mBase.startActivityForResult(who, intent, requestCode, options);
}
@@ -422,13 +422,13 @@ public class ContextWrapper extends Context {
}
@Override
public void startActivity(Intent intent, Bundle options) {
public void startActivity(Intent intent, @Nullable Bundle options) {
mBase.startActivity(intent, options);
}
/** @hide */
@Override
public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) {
public void startActivityAsUser(Intent intent, @Nullable Bundle options, UserHandle user) {
mBase.startActivityAsUser(intent, options, user);
}
@@ -438,13 +438,14 @@ public class ContextWrapper extends Context {
}
@Override
public void startActivities(Intent[] intents, Bundle options) {
public void startActivities(Intent[] intents, @Nullable Bundle options) {
mBase.startActivities(intents, options);
}
/** @hide */
@Override
public int startActivitiesAsUser(Intent[] intents, Bundle options, UserHandle userHandle) {
public int startActivitiesAsUser(Intent[] intents, @Nullable Bundle options,
UserHandle userHandle) {
return mBase.startActivitiesAsUser(intents, options, userHandle);
}
@@ -472,7 +473,7 @@ public class ContextWrapper extends Context {
}
@Override
public void sendBroadcast(Intent intent, String receiverPermission) {
public void sendBroadcast(Intent intent, @Nullable String receiverPermission) {
mBase.sendBroadcast(intent, receiverPermission);
}
@@ -493,27 +494,28 @@ public class ContextWrapper extends Context {
/** @hide */
@SystemApi
@Override
public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
public void sendBroadcast(Intent intent, @Nullable String receiverPermission,
@Nullable Bundle options) {
mBase.sendBroadcast(intent, receiverPermission, options);
}
/** @hide */
@Override
public void sendBroadcast(Intent intent, String receiverPermission, int appOp) {
public void sendBroadcast(Intent intent, @Nullable String receiverPermission, int appOp) {
mBase.sendBroadcast(intent, receiverPermission, appOp);
}
@Override
public void sendOrderedBroadcast(Intent intent,
String receiverPermission) {
@Nullable String receiverPermission) {
mBase.sendOrderedBroadcast(intent, receiverPermission);
}
@Override
public void sendOrderedBroadcast(
Intent intent, String receiverPermission, BroadcastReceiver resultReceiver,
Handler scheduler, int initialCode, String initialData,
Bundle initialExtras) {
Intent intent, @Nullable String receiverPermission,
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
mBase.sendOrderedBroadcast(intent, receiverPermission,
resultReceiver, scheduler, initialCode,
initialData, initialExtras);
@@ -523,10 +525,9 @@ public class ContextWrapper extends Context {
@SystemApi
@Override
public void sendOrderedBroadcast(
Intent intent, String receiverPermission, Bundle options,
BroadcastReceiver resultReceiver,
Handler scheduler, int initialCode, String initialData,
Bundle initialExtras) {
Intent intent, @Nullable String receiverPermission, @Nullable Bundle options,
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
mBase.sendOrderedBroadcast(intent, receiverPermission,
options, resultReceiver, scheduler, initialCode,
initialData, initialExtras);
@@ -535,9 +536,9 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
public void sendOrderedBroadcast(
Intent intent, String receiverPermission, int appOp, BroadcastReceiver resultReceiver,
Handler scheduler, int initialCode, String initialData,
Bundle initialExtras) {
Intent intent, @Nullable String receiverPermission, int appOp,
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
mBase.sendOrderedBroadcast(intent, receiverPermission, appOp,
resultReceiver, scheduler, initialCode,
initialData, initialExtras);
@@ -557,21 +558,22 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
public void sendBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, Bundle options) {
@Nullable String receiverPermission, @Nullable Bundle options) {
mBase.sendBroadcastAsUser(intent, user, receiverPermission, options);
}
/** @hide */
@Override
public void sendBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, int appOp) {
@Nullable String receiverPermission, int appOp) {
mBase.sendBroadcastAsUser(intent, user, receiverPermission, appOp);
}
@Override
public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, BroadcastReceiver resultReceiver, Handler scheduler,
int initialCode, String initialData, Bundle initialExtras) {
@Nullable String receiverPermission, @Nullable BroadcastReceiver resultReceiver,
@Nullable Handler scheduler, int initialCode, @Nullable String initialData,
@Nullable Bundle initialExtras) {
mBase.sendOrderedBroadcastAsUser(intent, user, receiverPermission, resultReceiver,
scheduler, initialCode, initialData, initialExtras);
}
@@ -579,8 +581,9 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, int appOp, BroadcastReceiver resultReceiver,
Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
@Nullable String receiverPermission, int appOp,
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
mBase.sendOrderedBroadcastAsUser(intent, user, receiverPermission, appOp, resultReceiver,
scheduler, initialCode, initialData, initialExtras);
}
@@ -588,8 +591,9 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,
String receiverPermission, int appOp, Bundle options, BroadcastReceiver resultReceiver,
Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
@Nullable String receiverPermission, int appOp, @Nullable Bundle options,
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
mBase.sendOrderedBroadcastAsUser(intent, user, receiverPermission, appOp, options,
resultReceiver, scheduler, initialCode, initialData, initialExtras);
}
@@ -621,10 +625,9 @@ public class ContextWrapper extends Context {
@Override
@Deprecated
public void sendStickyOrderedBroadcast(
Intent intent, BroadcastReceiver resultReceiver,
Handler scheduler, int initialCode, String initialData,
Bundle initialExtras) {
public void sendStickyOrderedBroadcast(Intent intent,
@Nullable BroadcastReceiver resultReceiver, @Nullable Handler scheduler,
int initialCode, @Nullable String initialData, @Nullable Bundle initialExtras) {
mBase.sendStickyOrderedBroadcast(intent,
resultReceiver, scheduler, initialCode,
initialData, initialExtras);
@@ -645,16 +648,17 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
@Deprecated
public void sendStickyBroadcastAsUser(Intent intent, UserHandle user, Bundle options) {
public void sendStickyBroadcastAsUser(Intent intent, UserHandle user,
@Nullable Bundle options) {
mBase.sendStickyBroadcastAsUser(intent, user, options);
}
@Override
@Deprecated
public void sendStickyOrderedBroadcastAsUser(Intent intent,
UserHandle user, BroadcastReceiver resultReceiver,
Handler scheduler, int initialCode, String initialData,
Bundle initialExtras) {
UserHandle user, @Nullable BroadcastReceiver resultReceiver,
@Nullable Handler scheduler, int initialCode, @Nullable String initialData,
@Nullable Bundle initialExtras) {
mBase.sendStickyOrderedBroadcastAsUser(intent, user, resultReceiver,
scheduler, initialCode, initialData, initialExtras);
}
@@ -666,29 +670,26 @@ public class ContextWrapper extends Context {
}
@Override
public Intent registerReceiver(
BroadcastReceiver receiver, IntentFilter filter) {
public Intent registerReceiver(@Nullable BroadcastReceiver receiver, IntentFilter filter) {
return mBase.registerReceiver(receiver, filter);
}
@Override
public Intent registerReceiver(
BroadcastReceiver receiver, IntentFilter filter, int flags) {
public Intent registerReceiver(@Nullable BroadcastReceiver receiver, IntentFilter filter,
int flags) {
return mBase.registerReceiver(receiver, filter, flags);
}
@Override
public Intent registerReceiver(
BroadcastReceiver receiver, IntentFilter filter,
String broadcastPermission, Handler scheduler) {
public Intent registerReceiver(@Nullable BroadcastReceiver receiver, IntentFilter filter,
@Nullable String broadcastPermission, @Nullable Handler scheduler) {
return mBase.registerReceiver(receiver, filter, broadcastPermission,
scheduler);
}
@Override
public Intent registerReceiver(
BroadcastReceiver receiver, IntentFilter filter,
String broadcastPermission, Handler scheduler, int flags) {
public Intent registerReceiver(@Nullable BroadcastReceiver receiver, IntentFilter filter,
@Nullable String broadcastPermission, @Nullable Handler scheduler, int flags) {
return mBase.registerReceiver(receiver, filter, broadcastPermission,
scheduler, flags);
}
@@ -706,9 +707,9 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
@UnsupportedAppUsage
public Intent registerReceiverAsUser(
BroadcastReceiver receiver, UserHandle user, IntentFilter filter,
String broadcastPermission, Handler scheduler) {
public Intent registerReceiverAsUser(@Nullable BroadcastReceiver receiver, UserHandle user,
IntentFilter filter, @Nullable String broadcastPermission,
@Nullable Handler scheduler) {
return mBase.registerReceiverAsUser(receiver, user, filter, broadcastPermission,
scheduler);
}
@@ -719,12 +720,12 @@ public class ContextWrapper extends Context {
}
@Override
public ComponentName startService(Intent service) {
public @Nullable ComponentName startService(Intent service) {
return mBase.startService(service);
}
@Override
public ComponentName startForegroundService(Intent service) {
public @Nullable ComponentName startForegroundService(Intent service) {
return mBase.startForegroundService(service);
}
@@ -736,14 +737,14 @@ public class ContextWrapper extends Context {
/** @hide */
@Override
@UnsupportedAppUsage
public ComponentName startServiceAsUser(Intent service, UserHandle user) {
public @Nullable ComponentName startServiceAsUser(Intent service, UserHandle user) {
return mBase.startServiceAsUser(service, user);
}
/** @hide */
@Override
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
public ComponentName startForegroundServiceAsUser(Intent service, UserHandle user) {
public @Nullable ComponentName startForegroundServiceAsUser(Intent service, UserHandle user) {
return mBase.startForegroundServiceAsUser(service, user);
}
@@ -797,12 +798,12 @@ public class ContextWrapper extends Context {
@Override
public boolean startInstrumentation(ComponentName className,
String profileFile, Bundle arguments) {
@Nullable String profileFile, @Nullable Bundle arguments) {
return mBase.startInstrumentation(className, profileFile, arguments);
}
@Override
public Object getSystemService(String name) {
public @Nullable Object getSystemService(String name) {
return mBase.getSystemService(name);
}
@@ -839,18 +840,18 @@ public class ContextWrapper extends Context {
@Override
public void enforcePermission(
String permission, int pid, int uid, String message) {
String permission, int pid, int uid, @Nullable String message) {
mBase.enforcePermission(permission, pid, uid, message);
}
@Override
public void enforceCallingPermission(String permission, String message) {
public void enforceCallingPermission(String permission, @Nullable String message) {
mBase.enforceCallingPermission(permission, message);
}
@Override
public void enforceCallingOrSelfPermission(
String permission, String message) {
String permission, @Nullable String message) {
mBase.enforceCallingOrSelfPermission(permission, message);
}
@@ -891,8 +892,8 @@ public class ContextWrapper extends Context {
}
@Override
public int checkUriPermission(Uri uri, String readPermission,
String writePermission, int pid, int uid, int modeFlags) {
public int checkUriPermission(@Nullable Uri uri, @Nullable String readPermission,
@Nullable String writePermission, int pid, int uid, int modeFlags) {
return mBase.checkUriPermission(uri, readPermission, writePermission,
pid, uid, modeFlags);
}
@@ -917,8 +918,8 @@ public class ContextWrapper extends Context {
@Override
public void enforceUriPermission(
Uri uri, String readPermission, String writePermission,
int pid, int uid, int modeFlags, String message) {
@Nullable Uri uri, @Nullable String readPermission, @Nullable String writePermission,
int pid, int uid, int modeFlags, @Nullable String message) {
mBase.enforceUriPermission(
uri, readPermission, writePermission, pid, uid, modeFlags,
message);
@@ -1063,7 +1064,7 @@ public class ContextWrapper extends Context {
* @hide
*/
@Override
public IBinder getActivityToken() {
public @Nullable IBinder getActivityToken() {
return mBase.getActivityToken();
}
@@ -1071,7 +1072,7 @@ public class ContextWrapper extends Context {
* @hide
*/
@Override
public IBinder getWindowContextToken() {
public @Nullable IBinder getWindowContextToken() {
return mBase != null ? mBase.getWindowContextToken() : null;
}
@@ -1079,8 +1080,8 @@ public class ContextWrapper extends Context {
* @hide
*/
@Override
public IServiceConnection getServiceDispatcher(ServiceConnection conn, Handler handler,
int flags) {
public @Nullable IServiceConnection getServiceDispatcher(ServiceConnection conn,
Handler handler, int flags) {
return mBase.getServiceDispatcher(conn, handler, flags);
}
@@ -1142,7 +1143,7 @@ public class ContextWrapper extends Context {
* @hide
*/
@Override
public ContentCaptureOptions getContentCaptureOptions() {
public @Nullable ContentCaptureOptions getContentCaptureOptions() {
return mBase == null ? null : mBase.getContentCaptureOptions();
}
@@ -1151,7 +1152,7 @@ public class ContextWrapper extends Context {
*/
@TestApi
@Override
public void setContentCaptureOptions(ContentCaptureOptions options) {
public void setContentCaptureOptions(@Nullable ContentCaptureOptions options) {
if (mBase != null) {
mBase.setContentCaptureOptions(options);
}