commit d2f8ee8dd17f96e663b6b2592d2cc46825e9fa5e
author Fabian Kozynski <kozynski@google.com> Thu Oct 14 13:48:08 2021 -0400
committer Fabian Kozynski <kozynski@google.com> Mon Oct 18 11:59:20 2021 -0400
tree 6d3ad09433ef70e335d69ec044120f1507487eca
parent 169862cf540a71fdcdf6f24c9ccab9394cd26ba0

CTS tests for request in progress error

Test: atest RequestTileServiceAddTest
Bug: 197534249
Change-Id: I3941fe404c9c3cc7d368f6b43c75c136865c13cf

tests/app/src/android/app/cts/RequestTileServiceAddTest.kt

diff --git a/tests/app/src/android/app/cts/RequestTileServiceAddTest.kt b/tests/app/src/android/app/cts/RequestTileServiceAddTest.kt
index 6db0f11..e7924bc 100644
--- a/tests/app/src/android/app/cts/RequestTileServiceAddTest.kt
+++ b/tests/app/src/android/app/cts/RequestTileServiceAddTest.kt
@@ -16,18 +16,24 @@
 
 package android.app.cts
 
+import android.Manifest.permission.STATUS_BAR
+import android.app.Activity
 import android.app.ActivityManager
 import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+import android.app.Instrumentation
 import android.app.StatusBarManager
+import android.app.stubs.MockActivity
 import android.app.stubs.NotExportedTestTileService
 import android.app.stubs.TestTileService
 import android.content.ComponentName
 import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.drawable.Icon
 import android.service.quicksettings.TileService
 import androidx.test.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.compatibility.common.util.SystemUtil
 import com.google.common.truth.Truth.assertThat
 import com.google.common.util.concurrent.MoreExecutors
 import org.junit.Assume
@@ -55,6 +61,7 @@
     private lateinit var context: Context
     private lateinit var icon: Icon
     private lateinit var consumer: StoreIntConsumer
+    private lateinit var instrumentation: Instrumentation
     private val executor = MoreExecutors.directExecutor()
     private lateinit var latch: CountDownLatch
 
@@ -62,7 +69,8 @@
     fun setUp() {
         Assume.assumeTrue(TileService.isQuickSettingsSupported())
 
-        context = InstrumentationRegistry.getTargetContext()
+        instrumentation = InstrumentationRegistry.getInstrumentation()
+        context = instrumentation.getTargetContext()
         statusBarService = context.getSystemService(StatusBarManager::class.java)!!
 
         icon = Icon.createWithResource(context, R.drawable.ic_android)
@@ -124,6 +132,13 @@
         latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
 
         assertThat(consumer.result).isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_BAD_COMPONENT)
+
+        // Cleanup
+        context.packageManager.setComponentEnabledSetting(
+                componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                PackageManager.SYNCHRONOUS or PackageManager.DONT_KILL_APP
+        )
     }
 
     @Test
@@ -165,6 +180,50 @@
                 .isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_APP_NOT_IN_FOREGROUND)
     }
 
+    @Test
+    fun testTwoSimultaneousRequests() {
+        // We need an activity in the foreground for the first request to not be denied
+        val activity = setUpForActivity()
+        val componentName = TestTileService.getComponentName()
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                {}
+        )
+
+        Thread.sleep(TimeUnit.SECONDS.toMillis(TIME_OUT_SECONDS))
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                consumer
+        )
+
+        latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
+        assertThat(consumer.result)
+                .isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_REQUEST_IN_PROGRESS)
+
+        SystemUtil.callWithShellPermissionIdentity(
+                { statusBarService.cancelRequestAddTile(componentName.packageName) },
+                STATUS_BAR
+        )
+
+        activity.finish()
+    }
+
+    private fun setUpForActivity(): Activity {
+        val intent = Intent(context, MockActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        val activity = instrumentation.startActivitySync(intent)
+        instrumentation.waitForIdleSync()
+        return activity
+    }
+
     private class StoreIntConsumer(private val latch: CountDownLatch) : Consumer<Int> {
         var result: Int? = null