From 4418cb13d543d8cb1b7bdebfc1188ad75fa1934a Mon Sep 17 00:00:00 2001
From: qingxun <qingxun@google.com>
Date: Mon, 29 Aug 2022 16:28:51 -0700
Subject: Deny epg permissions for untrusted apps

Test: Cuttlefish
Bug: 240268320
Change-Id: Ia0028d04b0cb58d45fbe75d13975c7db4edf3909
---
 src/com/android/tv/SetupPassthroughActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/tv/SetupPassthroughActivity.java b/src/com/android/tv/SetupPassthroughActivity.java
index e7f89108..2a4a556f 100644
--- a/src/com/android/tv/SetupPassthroughActivity.java
+++ b/src/com/android/tv/SetupPassthroughActivity.java
@@ -109,7 +109,6 @@ public class SetupPassthroughActivity extends Activity {
                 finish();
                 return;
             }
-            SetupUtils.grantEpgPermission(this, mTvInputInfo.getServiceInfo().packageName);
             if (DEBUG) Log.d(TAG, "Activity after completion " + mActivityAfterCompletion);
             // If EXTRA_SETUP_INTENT is not removed, an infinite recursion happens during
             // setupIntent.putExtras(intent.getExtras()).
@@ -127,6 +126,7 @@ public class SetupPassthroughActivity extends Activity {
                     finish();
                     return;
                 }
+                SetupUtils.grantEpgPermission(this, mTvInputInfo.getServiceInfo().packageName);
                 startActivityForResult(setupIntent, REQUEST_START_SETUP_ACTIVITY);
             } catch (ActivityNotFoundException e) {
                 Log.e(TAG, "Can't find activity: " + setupIntent.getComponent());
-- 
cgit v1.2.3