From a9fbfc6537f22001dee49247ec04449ea2c11fbb Mon Sep 17 00:00:00 2001
From: deeppandya <deeppandya91@gmail.com>
Date: Mon, 29 Jul 2024 22:27:38 +0530
Subject: [PATCH] Resolve billing client issues

Resolve presubmit error
---
 android/java/AndroidManifest.xml                          | 7 -------
 .../java/org/chromium/chrome/browser/billing/sources.gni  | 1 +
 android/java/res/values/brave_styles.xml                  | 8 --------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/android/java/AndroidManifest.xml b/android/java/AndroidManifest.xml
index 67e9939e5d1..ab8523a7b9a 100644
--- a/android/java/AndroidManifest.xml
+++ b/android/java/AndroidManifest.xml
@@ -155,13 +155,6 @@
     android:noHistory="true"
     android:launchMode="singleTask"/>
 
-<activity android:name="com.android.billingclient.api.ProxyBillingActivity"
-    android:theme="@style/BraveProxyBillingActivityTheme"
-    android:exported="false"
-    android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity,DiscouragedApi"
-    tools:node="replace" />
-
 <!-- Upgrade related -->
 <receiver android:name="org.chromium.chrome.browser.upgrade.BravePackageReplacedBroadcastReceiver"
     android:exported="false">
diff --git a/android/java/org/chromium/chrome/browser/billing/sources.gni b/android/java/org/chromium/chrome/browser/billing/sources.gni
index 8a812a2604d..75b1f6cbc6b 100644
--- a/android/java/org/chromium/chrome/browser/billing/sources.gni
+++ b/android/java/org/chromium/chrome/browser/billing/sources.gni
@@ -13,6 +13,7 @@ brave_app_billing_deps =
     [ "//brave/third_party/android_deps:com_android_billingclient_java" ]
 
 brave_java_base_module_billing_deps = [
+  "//brave/third_party/android_deps:com_android_billingclient_java",
   "//brave/third_party/android_deps:com_google_android_datatransport_transport_backend_cct_java",
   "//brave/third_party/android_deps:com_google_android_datatransport_transport_runtime_java",
 ]
diff --git a/android/java/res/values/brave_styles.xml b/android/java/res/values/brave_styles.xml
index 0404e8ca1db..523213cc00d 100644
--- a/android/java/res/values/brave_styles.xml
+++ b/android/java/res/values/brave_styles.xml
@@ -294,14 +294,6 @@
         <item name="android:textColorPrimary">@android:color/white</item>
     </style>
 
-    <style name="BraveProxyBillingActivityTheme">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-    </style>
-
     <!-- Wallet DApps -->
     
     <style name="BraveWalletTextViewWhite">