Merge "Merge "Cache resolved details about remote callers." into qt-dev am:... (fa5d3c41) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentProvider.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -820,6 +820,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		private String setCallingPackage(String callingPackage) {
		final String original = mCallingPackage.get();
		mCallingPackage.set(callingPackage);
		onCallingPackageChanged();
		return original;
		}

		@@ -845,6 +846,15 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		return pkg;
		}

		/** {@hide} */
		public final @Nullable String getCallingPackageUnchecked() {
		return mCallingPackage.get();
		}

		/** {@hide} */
		public void onCallingPackageChanged() {
		}

		/**
		* Opaque token representing the identity of an incoming IPC.
		*/