commit b12f69ff2335a3809a5ff120eeca163f44598524
author Nate Myren <ntmyren@google.com> Tue Aug 26 13:09:34 2025 -0700
committer Nate Myren <ntmyren@google.com> Tue Aug 26 13:09:34 2025 -0700
tree dd55ca1064c72bc4e3e903484b27a03cc77eaafe
parent ac59a715cfdd4a285b3c7185be56ea99d1247c82

Add setResultAndFinish to RequestAccessActivity

Bug: 433273739
Test: coming in future CL
Flag: android.permission.flags.app_function_access_api_enabled
Relnote: N/A
Change-Id: I5d7c1c6751752d7ddf5b3080ce021a3ef61b6741

PermissionController/src/com/android/permissioncontroller/appfunctions/ui/RequestAccessActivity.kt

diff --git a/PermissionController/src/com/android/permissioncontroller/appfunctions/ui/RequestAccessActivity.kt b/PermissionController/src/com/android/permissioncontroller/appfunctions/ui/RequestAccessActivity.kt
index 9535dda..55a8b82 100644
--- a/PermissionController/src/com/android/permissioncontroller/appfunctions/ui/RequestAccessActivity.kt
+++ b/PermissionController/src/com/android/permissioncontroller/appfunctions/ui/RequestAccessActivity.kt
@@ -25,10 +25,6 @@
 class RequestAccessActivity : FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        // RESULT_CANCELED means that an access request was denied. Will be changed to RESULT_OK
-        // if the user clicks the grant button in the dialog. Setting CANCELED here in case the
-        // activity finishes before showing a dialog.
-        setResult(RESULT_CANCELED)
 
         if (!AppFunctionsUtil.isAppFunctionUiEnabled(this)) {
             Log.w(
@@ -36,7 +32,7 @@
                 "App Function isn't enabled: Either the platform is not supported " +
                     "or the UI flag FLAG_APP_FUNCTION_ACCESS_UI_ENABLED isn't enabled.",
             )
-            finish()
+            setResultAndFinish(RESULT_CANCELED)
             return
         }
 
@@ -53,7 +49,7 @@
                 "Unknown/Invalid agent/target package. " +
                     "Target package: $targetPackageName. Agent package: $agentPackageName.",
             )
-            finish()
+            setResultAndFinish(RESULT_CANCELED)
             return
         }
 
@@ -64,6 +60,11 @@
         supportFragmentManager.beginTransaction().add(fragment, null).commit()
     }
 
+    private fun setResultAndFinish(resultCode: Int) {
+        setResult(resultCode)
+        finish()
+    }
+
     companion object {
         private val LOG_TAG = RequestAccessActivity::class.java.simpleName
     }