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

Commit ffba1556 authored by Ivan Chiang's avatar Ivan Chiang
Browse files

Update Nullability of Apis 

Update Nullability of apis in DocumentsContract,
DocumentsProvider.

Test: make
Change-Id: Icc81333707bbeb9fe6d410ee35ade761e2d3b254
Fix: 126700626
Fix: 126702360
Fix: 126700352
parent 62727a76

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -38330,10 +38330,10 @@ package android.provider { 
    method public android.database.Cursor queryChildDocuments(String, @Nullable String[], @Nullable android.os.Bundle) throws java.io.FileNotFoundException;

    method public abstract android.database.Cursor queryDocument(String, String[]) throws java.io.FileNotFoundException;

    method public android.database.Cursor queryRecentDocuments(String, String[]) throws java.io.FileNotFoundException;

    method public android.database.Cursor queryRecentDocuments(String, String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method @Nullable public android.database.Cursor queryRecentDocuments(@NonNull String, @Nullable String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public abstract android.database.Cursor queryRoots(String[]) throws java.io.FileNotFoundException;

    method public android.database.Cursor querySearchDocuments(String, String, String[]) throws java.io.FileNotFoundException;

    method public android.database.Cursor querySearchDocuments(@NonNull String, @Nullable String[], @NonNull android.os.Bundle) throws java.io.FileNotFoundException;

    method @Nullable public android.database.Cursor querySearchDocuments(@NonNull String, @Nullable String[], @NonNull android.os.Bundle) throws java.io.FileNotFoundException;

    method public void removeDocument(String, String) throws java.io.FileNotFoundException;

    method public String renameDocument(String, String) throws java.io.FileNotFoundException;

    method public final void revokeDocumentPermission(String);

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5929,8 +5929,8 @@ package android.provider { 
  }















  public final class DocumentsContract {













    method public static boolean isManageMode(android.net.Uri);













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













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













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















    field public static final String ACTION_DOCUMENT_ROOT_SETTINGS = "android.provider.action.DOCUMENT_ROOT_SETTINGS";















    field public static final String ACTION_MANAGE_DOCUMENT = "android.provider.action.MANAGE_DOCUMENT";















    field public static final String EXTRA_SHOW_ADVANCED = "android.provider.extra.SHOW_ADVANCED";

































core/java/android/provider/DocumentsContract.java



+4
−2




























Original line number
Diff line number
Diff line








@@ -1252,7 +1252,8 @@ public final class DocumentsContract {













     * {@hide}















     */















    @SystemApi













    public static Uri setManageMode(Uri uri) {













    public static @NonNull Uri setManageMode(@NonNull Uri uri) {













        Preconditions.checkNotNull(uri, "uri can not be null");















        return uri.buildUpon().appendQueryParameter(PARAM_MANAGE, "true").build();















    }

























@@ -1262,7 +1263,8 @@ public final class DocumentsContract {













     * {@hide}















     */















    @SystemApi













    public static boolean isManageMode(Uri uri) {













    public static boolean isManageMode(@NonNull Uri uri) {













        Preconditions.checkNotNull(uri, "uri can not be null");















        return uri.getBooleanQueryParameter(PARAM_MANAGE, false);















    }

















































core/java/android/provider/DocumentsProvider.java



+8
−5




























Original line number
Diff line number
Diff line








@@ -487,10 +487,12 @@ public abstract class DocumentsProvider extends ContentProvider {













     * @see DocumentsContract#EXTRA_LOADING















     */















    @SuppressWarnings("unused")













    @Nullable















    public Cursor queryRecentDocuments(













            String rootId, String[] projection, @Nullable Bundle queryArgs,













            @Nullable CancellationSignal signal)













            throws FileNotFoundException {













            @NonNull String rootId, @Nullable String[] projection, @Nullable Bundle queryArgs,













            @Nullable CancellationSignal signal) throws FileNotFoundException {













        Preconditions.checkNotNull(rootId, "rootId can not be null");





























        Cursor c = queryRecentDocuments(rootId, projection);















        Bundle extras = new Bundle();















        c.setExtras(extras);










@@ -697,8 +699,9 @@ public abstract class DocumentsProvider extends ContentProvider {













     * @see DocumentsContract#EXTRA_ERROR















     */















    @SuppressWarnings("unused")













    public Cursor querySearchDocuments(@NonNull String rootId, @Nullable String[] projection,













            @NonNull Bundle queryArgs) throws FileNotFoundException {













    @Nullable













    public Cursor querySearchDocuments(@NonNull String rootId,













            @Nullable String[] projection, @NonNull Bundle queryArgs) throws FileNotFoundException {















        Preconditions.checkNotNull(rootId, "rootId can not be null");















        Preconditions.checkNotNull(queryArgs, "queryArgs can not be null");















        return querySearchDocuments(rootId, DocumentsContract.getSearchDocumentsQuery(queryArgs),