diff options
author | Austin Borger <borgera@google.com> | 2023-03-29 18:25:42 +0000 |
---|---|---|
committer | Austin Borger <borgera@google.com> | 2023-03-29 20:14:16 +0000 |
commit | 9858b3c345b895673f3d9251b46d92c1e1807d9a (patch) | |
tree | f203a3c4d7a4ae3330f2482289816d1facd9a565 | |
parent | 2fc07deafd257dcc934bb802887ef4297f49548f (diff) | |
download | base-9858b3c345b895673f3d9251b46d92c1e1807d9a.tar.gz |
DO NOT MERGE Revert "Fix vulnerability in AttributionSource due to incorrect ..."
Revert submission 21778792-sc-dev-2-attribution-source
Reason for revert: Not going into TM QPR3. Need to align this such that all versions are fixed at once.
Reverted changes: /q/submissionid:21778792-sc-dev-2-attribution-source
Change-Id: I3c499ba500e951c1863fbfd95d6ccbf8b23aead7
-rw-r--r-- | core/java/android/content/AttributionSource.java | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java index ec56f9a7cf0c..2f61fee88e9f 100644 --- a/core/java/android/content/AttributionSource.java +++ b/core/java/android/content/AttributionSource.java @@ -30,7 +30,6 @@ import android.os.Parcelable; import android.os.Process; import android.permission.PermissionManager; import android.util.ArraySet; -import android.util.Log; import com.android.internal.annotations.Immutable; @@ -87,8 +86,6 @@ import java.util.Set; */ @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); @@ -156,20 +153,9 @@ public final class AttributionSource implements Parcelable { AttributionSource(@NonNull Parcel in) { this(AttributionSourceState.CREATOR.createFromParcel(in)); - if (!Binder.isHandlingTransaction()) { - 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 */ |