Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88a7d70b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Annotate ContextWrapper with @Nullable"

parents dc4b1364 34bd00d5

core/api/current.txt

+23 −23
Original line number Diff line number Diff line
@@ -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);

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -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 {

































core/java/android/content/ContextWrapper.java



+72
−71


























File changed.
Preview size limit exceeded, changes collapsed.