Skip to content

Commit f219178

Browse files
Jeff Chenandroid-build-merge-worker-robot
authored andcommitted
Merge "Revert "Change expected result code on install failure with secureFRP"" into android14-tests-dev am: 7a2b6be am: fb51dd4 am: 55b714c
Original change: https://android-review.googlesource.com/c/platform/cts/+/2844682 Change-Id: Ie8f3cb3cf5f5e5e94c0e8ddda28be0d8e5b31667 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents ae994d4 + 55b714c commit f219178

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

  • tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts

tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/IntentTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package android.packageinstaller.install.cts
1717

1818
import android.app.Activity.RESULT_CANCELED
19-
import android.app.Activity.RESULT_FIRST_USER
2019
import android.app.Activity.RESULT_OK
2120
import android.content.Intent
2221
import android.content.pm.InstallSourceInfo
@@ -159,7 +158,7 @@ class IntentTest : PackageInstallerTestBase() {
159158
clickInstallerUIButton(INSTALL_BUTTON_ID)
160159

161160
// Install should not have succeeded
162-
assertEquals(RESULT_FIRST_USER, installation.get(TIMEOUT, TimeUnit.MILLISECONDS))
161+
assertEquals(RESULT_CANCELED, installation.get(TIMEOUT, TimeUnit.MILLISECONDS))
163162
assertNotInstalled()
164163
} finally {
165164
setSecureFrp(false)

0 commit comments

Comments
 (0)