Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e926 am: 4b7985bae0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26057828
Change-Id: I564ec905a55649d01750c14073b27e234bdba6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java
index 16b18c85..3f2fa21 100644
--- a/core/java/android/content/AttributionSource.java
+++ b/core/java/android/content/AttributionSource.java
@@ -31,7 +31,6 @@
import android.os.Process;
import android.permission.PermissionManager;
import android.util.ArraySet;
-import android.util.Log;
import com.android.internal.annotations.Immutable;
@@ -88,8 +87,6 @@
*/
@Immutable
public final class AttributionSource implements Parcelable {
- private static final String TAG = "AttributionSource";
-
private static final String DESCRIPTOR = "android.content.AttributionSource";
private static final Binder sDefaultToken = new Binder(DESCRIPTOR);
@@ -157,20 +154,9 @@
AttributionSource(@NonNull Parcel in) {
this(AttributionSourceState.CREATOR.createFromParcel(in));
- if (!Binder.isDirectlyHandlingTransaction()) {
- Log.e(TAG, "Unable to verify calling UID #" + mAttributionSourceState.uid + " PID #"
- + mAttributionSourceState.pid + " when not handling Binder transaction; "
- + "clearing.");
- mAttributionSourceState.pid = -1;
- mAttributionSourceState.uid = -1;
- mAttributionSourceState.packageName = null;
- mAttributionSourceState.attributionTag = null;
- mAttributionSourceState.next = null;
- } else {
- // Since we just unpacked this object as part of it transiting a Binder
- // call, this is the perfect time to enforce that its UID and PID can be trusted
- enforceCallingUidAndPid();
- }
+ // Since we just unpacked this object as part of it transiting a Binder
+ // call, this is the perfect time to enforce that its UID and PID can be trusted
+ enforceCallingUidAndPid();
}
/** @hide */