Merge "Note with featureId from ContentProvider" (57344c24) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9467,6 +9467,7 @@ package android.content {
		method @NonNull public final android.content.ContentProvider.CallingIdentity clearCallingIdentity();
		method public abstract int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]);
		method public void dump(java.io.FileDescriptor, java.io.PrintWriter, String[]);
		method @Nullable public final String getCallingFeatureId();
		method @Nullable public final String getCallingPackage();
		method @Nullable public final android.content.Context getContext();
		method @Nullable public final android.content.pm.PathPermission[] getPathPermissions();

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ public class Content {

		@Override
		public void onExecute(IContentProvider provider) throws Exception {
		provider.insert(resolveCallingPackage(), mUri, mContentValues);
		provider.insert(resolveCallingPackage(), null, mUri, mContentValues);
		}
		}

		@@ -522,7 +522,7 @@ public class Content {

		@Override
		public void onExecute(IContentProvider provider) throws Exception {
		provider.delete(resolveCallingPackage(), mUri, mWhere, null);
		provider.delete(resolveCallingPackage(), null, mUri, mWhere, null);
		}
		}

		@@ -557,7 +557,7 @@ public class Content {

		@Override
		public void onExecute(IContentProvider provider) throws Exception {
		Bundle result = provider.call(null, mUri.getAuthority(), mMethod, mArg, mExtras);
		Bundle result = provider.call(null, null, mUri.getAuthority(), mMethod, mArg, mExtras);
		if (result != null) {
		result.size(); // unpack
		}
		@@ -584,7 +584,7 @@ public class Content {

		@Override
		public void onExecute(IContentProvider provider) throws Exception {
		try (ParcelFileDescriptor fd = provider.openFile(null, mUri, "r", null, null)) {
		try (ParcelFileDescriptor fd = provider.openFile(null, null, mUri, "r", null, null)) {
		FileUtils.copy(fd.getFileDescriptor(), FileDescriptor.out);
		}
		}
		@@ -597,7 +597,7 @@ public class Content {

		@Override
		public void onExecute(IContentProvider provider) throws Exception {
		try (ParcelFileDescriptor fd = provider.openFile(null, mUri, "w", null, null)) {
		try (ParcelFileDescriptor fd = provider.openFile(null, null, mUri, "w", null, null)) {
		FileUtils.copy(FileDescriptor.in, fd.getFileDescriptor());
		}
		}
		@@ -616,7 +616,7 @@ public class Content {

		@Override
		public void onExecute(IContentProvider provider) throws Exception {
		Cursor cursor = provider.query(resolveCallingPackage(), mUri, mProjection,
		Cursor cursor = provider.query(resolveCallingPackage(), null, mUri, mProjection,
		ContentResolver.createSqlQueryBundle(mWhere, null, mSortOrder), null);
		if (cursor == null) {
		System.out.println("No result found.");
		@@ -679,7 +679,7 @@ public class Content {

		@Override
		public void onExecute(IContentProvider provider) throws Exception {
		provider.update(resolveCallingPackage(), mUri, mContentValues, mWhere, null);
		provider.update(resolveCallingPackage(), null, mUri, mContentValues, mWhere, null);
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ public class ShellUiAutomatorBridge extends UiAutomatorBridge {
		throw new IllegalStateException("Could not find provider: " + providerName);
		}
		provider = holder.provider;
		cursor = provider.query(null, Settings.Secure.CONTENT_URI,
		cursor = provider.query(null, null, Settings.Secure.CONTENT_URI,
		new String[] {
		Settings.Secure.VALUE
		},