From 8ab8c7517905915808491506f634b808618fb706 Mon Sep 17 00:00:00 2001
From: PODISHETTY KUMAR <podishettyk@google.com>
Date: Tue, 30 Jan 2024 11:09:34 +0000
Subject: Revert^2 "Revert "Fix vulnerability in AttributionSource due to
 in..."

This reverts commit 3de05f8dbdd11b1970ea67e4da4808e4aaf01aea.

Reason for revert: <Reason for revert: Potential culprit for b/322943955  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: I8aab36d54502da7bab5fbec49f2ea93b4c7c7a00
---
 core/java/android/content/AttributionSource.java | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/core/java/android/content/AttributionSource.java b/core/java/android/content/AttributionSource.java
index 16b18c85e790..3f2fa2188d24 100644
--- a/core/java/android/content/AttributionSource.java
+++ b/core/java/android/content/AttributionSource.java
@@ -31,7 +31,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;
 
@@ -88,8 +87,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);
@@ -157,20 +154,9 @@ public final class AttributionSource implements Parcelable {
     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 */
-- 
cgit v1.2.3-59-g8ed1b