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

Commit a30e5c38 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Jeff Sharkey
Browse files

To be @Nullable or @NonNull, that is the question. 

Bug: 126699288, 126699496, 126700389
Bug: 126700085, 126701638, 126702005, 126700497
Test: manual
Change-Id: Idcbc2722ddcf014a9e5cef14321b4e2ce30adf9c
parent 416d4623

api/current.txt

+51 −51
Original line number Diff line number Diff line
@@ -13072,19 +13072,19 @@ package android.database.sqlite { 
    method public String buildUnionSubQuery(String, String[], java.util.Set<java.lang.String>, int, String, String, String, String);

    method @Deprecated public String buildUnionSubQuery(String, String[], java.util.Set<java.lang.String>, int, String, String, String[], String, String);

    method public int delete(@NonNull android.database.sqlite.SQLiteDatabase, @Nullable String, @Nullable String[]);

    method public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();

    method @Nullable public android.database.sqlite.SQLiteDatabase.CursorFactory getCursorFactory();

    method public boolean getDistinct();

    method public java.util.Map<java.lang.String,java.lang.String> getProjectionMap();

    method @Nullable public java.util.Map<java.lang.String,java.lang.String> getProjectionMap();

    method public boolean getStrict();

    method public String getTables();

    method @Nullable public String getTables();

    method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String);

    method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String, String);

    method public android.database.Cursor query(android.database.sqlite.SQLiteDatabase, String[], String, String[], String, String, String, String, android.os.CancellationSignal);

    method public void setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory);

    method public void setCursorFactory(@Nullable android.database.sqlite.SQLiteDatabase.CursorFactory);

    method public void setDistinct(boolean);

    method public void setProjectionMap(java.util.Map<java.lang.String,java.lang.String>);

    method public void setProjectionMap(@Nullable java.util.Map<java.lang.String,java.lang.String>);

    method public void setStrict(boolean);

    method public void setTables(String);

    method public void setTables(@Nullable String);

    method public int update(@NonNull android.database.sqlite.SQLiteDatabase, @NonNull android.content.ContentValues, @Nullable String, @Nullable String[]);

  }










@@ -34585,7 +34585,7 @@ package android.os {













    method public static java.io.File getExternalStoragePublicDirectory(String);















    method public static String getExternalStorageState();















    method public static String getExternalStorageState(java.io.File);













    method public static java.io.File getRootDirectory();













    method @NonNull public static java.io.File getRootDirectory();















    method @Deprecated public static String getStorageState(java.io.File);















    method public static boolean isExternalStorageEmulated();















    method public static boolean isExternalStorageEmulated(java.io.File);










@@ -35311,27 +35311,27 @@ package android.os {













    ctor public StrictMode.ThreadPolicy.Builder();















    ctor public StrictMode.ThreadPolicy.Builder(android.os.StrictMode.ThreadPolicy);















    method public android.os.StrictMode.ThreadPolicy build();













    method public android.os.StrictMode.ThreadPolicy.Builder detectAll();













    method public android.os.StrictMode.ThreadPolicy.Builder detectCustomSlowCalls();













    method public android.os.StrictMode.ThreadPolicy.Builder detectDiskReads();













    method public android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites();













    method public android.os.StrictMode.ThreadPolicy.Builder detectNetwork();













    method public android.os.StrictMode.ThreadPolicy.Builder detectResourceMismatches();













    method public android.os.StrictMode.ThreadPolicy.Builder detectUnbufferedIo();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeath();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.StrictMode.OnThreadViolationListener);













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyLog();













    method public android.os.StrictMode.ThreadPolicy.Builder permitAll();













    method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();













    method public android.os.StrictMode.ThreadPolicy.Builder permitDiskReads();













    method public android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites();













    method public android.os.StrictMode.ThreadPolicy.Builder permitNetwork();













    method public android.os.StrictMode.ThreadPolicy.Builder permitResourceMismatches();













    method public android.os.StrictMode.ThreadPolicy.Builder permitUnbufferedIo();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectAll();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectCustomSlowCalls();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectDiskReads();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectDiskWrites();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectNetwork();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectResourceMismatches();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectUnbufferedIo();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyDeath();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyDeathOnNetwork();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.StrictMode.OnThreadViolationListener);













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyLog();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder permitAll();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder permitDiskReads();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder permitDiskWrites();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder permitNetwork();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder permitResourceMismatches();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder permitUnbufferedIo();















  }





























  public static final class StrictMode.VmPolicy {









@@ -35342,26 +35342,26 @@ package android.os {













    ctor public StrictMode.VmPolicy.Builder();















    ctor public StrictMode.VmPolicy.Builder(android.os.StrictMode.VmPolicy);















    method public android.os.StrictMode.VmPolicy build();













    method public android.os.StrictMode.VmPolicy.Builder detectActivityLeaks();













    method public android.os.StrictMode.VmPolicy.Builder detectAll();













    method public android.os.StrictMode.VmPolicy.Builder detectCleartextNetwork();













    method public android.os.StrictMode.VmPolicy.Builder detectContentUriWithoutPermission();













    method public android.os.StrictMode.VmPolicy.Builder detectCredentialProtectedWhileLocked();













    method public android.os.StrictMode.VmPolicy.Builder detectFileUriExposure();













    method public android.os.StrictMode.VmPolicy.Builder detectImplicitDirectBoot();













    method public android.os.StrictMode.VmPolicy.Builder detectLeakedClosableObjects();













    method public android.os.StrictMode.VmPolicy.Builder detectLeakedRegistrationObjects();













    method public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();













    method public android.os.StrictMode.VmPolicy.Builder detectNonSdkApiUsage();













    method public android.os.StrictMode.VmPolicy.Builder detectUntaggedSockets();













    method public android.os.StrictMode.VmPolicy.Builder penaltyDeath();













    method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();













    method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();













    method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();













    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.StrictMode.OnVmViolationListener);













    method public android.os.StrictMode.VmPolicy.Builder penaltyLog();













    method public android.os.StrictMode.VmPolicy.Builder permitNonSdkApiUsage();













    method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(Class, int);













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectActivityLeaks();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectAll();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectCleartextNetwork();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectContentUriWithoutPermission();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectCredentialProtectedWhileLocked();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectFileUriExposure();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectImplicitDirectBoot();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectLeakedClosableObjects();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectLeakedRegistrationObjects();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectLeakedSqlLiteObjects();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectNonSdkApiUsage();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder detectUntaggedSockets();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyDeath();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyListener(@NonNull java.util.concurrent.Executor, @NonNull android.os.StrictMode.OnVmViolationListener);













    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyLog();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder permitNonSdkApiUsage();













    method @NonNull public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(Class, int);















  }





























  public final class SystemClock {










@@ -38407,10 +38407,10 @@ package android.provider {



























  public final class MediaStore {















    ctor public MediaStore();













    method @NonNull public static java.util.Set<java.lang.String> getAllVolumeNames(android.content.Context);













    method public static android.net.Uri getDocumentUri(android.content.Context, android.net.Uri);













    method @NonNull public static java.util.Set<java.lang.String> getAllVolumeNames(@NonNull android.content.Context);













    method @Nullable public static android.net.Uri getDocumentUri(@NonNull android.content.Context, @NonNull android.net.Uri);















    method public static android.net.Uri getMediaScannerUri();













    method public static android.net.Uri getMediaUri(android.content.Context, android.net.Uri);













    method @Nullable public static android.net.Uri getMediaUri(@NonNull android.content.Context, @NonNull android.net.Uri);















    method public static String getVersion(android.content.Context);















    method @NonNull public static String getVolumeName(@NonNull android.net.Uri);















    method @NonNull public static android.net.Uri setIncludePending(@NonNull android.net.Uri);

























api/removed.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -352,11 +352,11 @@ package android.os {













  }































  public static final class StrictMode.ThreadPolicy.Builder {













    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(@NonNull android.os.StrictMode.OnThreadViolationListener, @NonNull java.util.concurrent.Executor);













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(@NonNull android.os.StrictMode.OnThreadViolationListener, @NonNull java.util.concurrent.Executor);















  }































  public static final class StrictMode.VmPolicy.Builder {













    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(@NonNull android.os.StrictMode.OnVmViolationListener, @NonNull java.util.concurrent.Executor);













    method @NonNull public android.os.StrictMode.VmPolicy.Builder penaltyListener(@NonNull android.os.StrictMode.OnVmViolationListener, @NonNull java.util.concurrent.Executor);















  }































  public final class SystemClock {

































api/system-current.txt



+5
−5




























Original line number
Diff line number
Diff line








@@ -5210,11 +5210,11 @@ package android.os {













  }





























  public class Environment {













    method public static java.io.File getOdmDirectory();













    method public static java.io.File getOemDirectory();













    method public static java.io.File getProductDirectory();













    method public static java.io.File getProductServicesDirectory();













    method public static java.io.File getVendorDirectory();













    method @NonNull public static java.io.File getOdmDirectory();













    method @NonNull public static java.io.File getOemDirectory();













    method @NonNull public static java.io.File getProductDirectory();













    method @NonNull public static java.io.File getProductServicesDirectory();













    method @NonNull public static java.io.File getVendorDirectory();















  }





























  public class HidlSupport {

































api/test-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -1416,8 +1416,8 @@ package android.os {





























  public class Environment {















    method public static java.io.File buildPath(java.io.File, java.lang.String...);













    method public static java.io.File getProductDirectory();













    method public static java.io.File getStorageDirectory();













    method @NonNull public static java.io.File getProductDirectory();













    method @NonNull public static java.io.File getStorageDirectory();















  }































  public final class FileUtils {










@@ -1666,7 +1666,7 @@ package android.os {













  }































  public static final class StrictMode.ThreadPolicy.Builder {













    method public android.os.StrictMode.ThreadPolicy.Builder detectExplicitGc();













    method @NonNull public android.os.StrictMode.ThreadPolicy.Builder detectExplicitGc();















  }































  public static final class StrictMode.ViolationInfo implements android.os.Parcelable {

































core/java/android/database/sqlite/SQLiteQueryBuilder.java



+8
−8




























Original line number
Diff line number
Diff line








@@ -89,7 +89,7 @@ public class SQLiteQueryBuilder {













     *















     * @return the list of tables being queried















     */













    public String getTables() {













    public @Nullable String getTables() {















        return mTables;















    }

























@@ -101,7 +101,7 @@ public class SQLiteQueryBuilder {













     *















     * @param inTables the list of tables to query on















     */













    public void setTables(String inTables) {













    public void setTables(@Nullable String inTables) {















        mTables = inTables;















    }


























@@ -170,7 +170,7 @@ public class SQLiteQueryBuilder {













     *















     * @param columnMap maps from the user column names to the database column names















     */













    public void setProjectionMap(Map<String, String> columnMap) {













    public void setProjectionMap(@Nullable Map<String, String> columnMap) {















        mProjectionMap = columnMap;















    }

























@@ -178,7 +178,7 @@ public class SQLiteQueryBuilder {













     * Gets the projection map for the query, as last configured by















     * {@link #setProjectionMap(Map)}.















     */













    public Map<String, String> getProjectionMap() {













    public @Nullable Map<String, String> getProjectionMap() {















        return mProjectionMap;















    }

























@@ -189,7 +189,7 @@ public class SQLiteQueryBuilder {













     *















     * @hide















     */













    public void setProjectionGreylist(List<Pattern> projectionGreylist) {













    public void setProjectionGreylist(@Nullable List<Pattern> projectionGreylist) {















        mProjectionGreylist = projectionGreylist;















    }

























@@ -199,7 +199,7 @@ public class SQLiteQueryBuilder {













     *















     * @hide















     */













    public List<Pattern> getProjectionGreylist() {













    public @Nullable List<Pattern> getProjectionGreylist() {















        return mProjectionGreylist;















    }

























@@ -210,7 +210,7 @@ public class SQLiteQueryBuilder {













     *















     * @param factory the factory to use.















     */













    public void setCursorFactory(SQLiteDatabase.CursorFactory factory) {













    public void setCursorFactory(@Nullable SQLiteDatabase.CursorFactory factory) {















        mFactory = factory;















    }

























@@ -218,7 +218,7 @@ public class SQLiteQueryBuilder {













     * Sets the cursor factory to be used for the query, as last configured by















     * {@link #setCursorFactory(android.database.sqlite.SQLiteDatabase.CursorFactory)}.















     */













    public SQLiteDatabase.CursorFactory getCursorFactory() {













    public @Nullable SQLiteDatabase.CursorFactory getCursorFactory() {















        return mFactory;















    }