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

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

Merge "Replace ContentProvider SQL args w/ Bundle & Constants."

parents c09d69e8 ea93fe75

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -7978,6 +7978,7 @@ package android.content { 
    method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);

    method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal);

    method protected final void setPathPermissions(android.content.pm.PathPermission[]);

    method protected final void setReadPermission(java.lang.String);
@@ -8010,6 +8011,7 @@ package android.content { 
    method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) throws android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;

    method public deprecated boolean release();

    method public final android.net.Uri uncanonicalize(android.net.Uri) throws android.os.RemoteException;

    method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
@@ -8112,6 +8114,7 @@ package android.content { 
    method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);

    method public final boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal);

    method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver);

    method public void releasePersistableUriPermission(android.net.Uri, int);
@@ -8134,6 +8137,9 @@ package android.content { 
    field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";

    field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2

    field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

    field public static final java.lang.String QUERY_ARG_SELECTION = "android:query-selection";

    field public static final java.lang.String QUERY_ARG_SELECTION_ARGS = "android:query-selection-args";

    field public static final java.lang.String QUERY_ARG_SORT_ORDER = "android:query-sort-order";

    field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";

    field public static final java.lang.String SCHEME_CONTENT = "content";

    field public static final java.lang.String SCHEME_FILE = "file";

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -8313,6 +8313,7 @@ package android.content { 
    method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);

    method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal);

    method protected final void setPathPermissions(android.content.pm.PathPermission[]);

    method protected final void setReadPermission(java.lang.String);
@@ -8345,6 +8346,7 @@ package android.content { 
    method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) throws android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;

    method public deprecated boolean release();

    method public final android.net.Uri uncanonicalize(android.net.Uri) throws android.os.RemoteException;

    method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
@@ -8447,6 +8449,7 @@ package android.content { 
    method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);

    method public final boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal);

    method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver);

    method public void releasePersistableUriPermission(android.net.Uri, int);
@@ -8469,6 +8472,9 @@ package android.content { 
    field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";

    field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2

    field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

    field public static final java.lang.String QUERY_ARG_SELECTION = "android:query-selection";

    field public static final java.lang.String QUERY_ARG_SELECTION_ARGS = "android:query-selection-args";

    field public static final java.lang.String QUERY_ARG_SORT_ORDER = "android:query-sort-order";

    field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";

    field public static final java.lang.String SCHEME_CONTENT = "content";

    field public static final java.lang.String SCHEME_FILE = "file";

api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -8000,6 +8000,7 @@ package android.content { 
    method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public abstract android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);

    method public boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal);

    method protected final void setPathPermissions(android.content.pm.PathPermission[]);

    method protected final void setReadPermission(java.lang.String);
@@ -8032,6 +8033,7 @@ package android.content { 
    method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) throws android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal) throws android.os.RemoteException;

    method public android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal) throws android.os.RemoteException;

    method public deprecated boolean release();

    method public final android.net.Uri uncanonicalize(android.net.Uri) throws android.os.RemoteException;

    method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) throws android.os.RemoteException;
@@ -8135,6 +8137,7 @@ package android.content { 
    method public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(android.net.Uri, java.lang.String, android.os.Bundle, android.os.CancellationSignal) throws java.io.FileNotFoundException;

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String, android.os.CancellationSignal);

    method public final android.database.Cursor query(android.net.Uri, java.lang.String[], android.os.Bundle, android.os.CancellationSignal);

    method public final boolean refresh(android.net.Uri, android.os.Bundle, android.os.CancellationSignal);

    method public final void registerContentObserver(android.net.Uri, boolean, android.database.ContentObserver);

    method public void releasePersistableUriPermission(android.net.Uri, int);
@@ -8157,6 +8160,9 @@ package android.content { 
    field public static final java.lang.String EXTRA_SIZE = "android.content.extra.SIZE";

    field public static final int NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS = 2; // 0x2

    field public static final int NOTIFY_SYNC_TO_NETWORK = 1; // 0x1

    field public static final java.lang.String QUERY_ARG_SELECTION = "android:query-selection";

    field public static final java.lang.String QUERY_ARG_SELECTION_ARGS = "android:query-selection-args";

    field public static final java.lang.String QUERY_ARG_SORT_ORDER = "android:query-sort-order";

    field public static final java.lang.String SCHEME_ANDROID_RESOURCE = "android.resource";

    field public static final java.lang.String SCHEME_CONTENT = "content";

    field public static final java.lang.String SCHEME_FILE = "file";

cmds/content/src/com/android/commands/content/Content.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.commands.content; 
import android.app.ActivityManager;

import android.app.ContentProviderHolder;

import android.app.IActivityManager;

import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.IContentProvider;

import android.database.Cursor;
@@ -589,8 +590,8 @@ public class Content { 


        @Override

        public void onExecute(IContentProvider provider) throws Exception {

            Cursor cursor = provider.query(resolveCallingPackage(), mUri, mProjection, mWhere,

                    null, mSortOrder, null);

            Cursor cursor = provider.query(resolveCallingPackage(), mUri, mProjection,

                    ContentResolver.createSqlQueryBundle(mWhere, null, mSortOrder), null);

            if (cursor == null) {

                System.out.println("No result found.");

                return;

cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/ShellUiAutomatorBridge.java

+7 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ActivityManager; 
import android.app.ContentProviderHolder;

import android.app.IActivityManager;

import android.app.UiAutomation;

import android.content.ContentResolver;

import android.content.Context;

import android.content.IContentProvider;

import android.database.Cursor;
@@ -69,10 +70,12 @@ public class ShellUiAutomatorBridge extends UiAutomatorBridge { 
                cursor = provider.query(null, Settings.Secure.CONTENT_URI,

                        new String[] {

                            Settings.Secure.VALUE

                        }, "name=?",

                        new String[] {

                            Settings.Secure.LONG_PRESS_TIMEOUT

                        }, null, null);

                        },

                        ContentResolver.createSqlQueryBundle(

                                "name=?",

                                new String[] { Settings.Secure.LONG_PRESS_TIMEOUT },

                                null),

                        null);

                if (cursor.moveToFirst()) {

                    longPressTimeout = cursor.getInt(0);

                }