Fix the Instant Apps notification test for non-CN devices. Previously, ag/9021279 introduced two issues, and this commit fixes them:
1) The string for the non-chinese test case had a line of instructions removed. That line of text is now restored.
2) Part of the check for "isNoGooglePlayStore" included checking the system property for "ro.com.google.rmsversion" - however, this check can return null even for devices with Google Play Store, so its usage in "isNoGooglePlayStore" is removed
Test: m -j32 CtsVerifier
m -j32 CtsVerifierInstantApp
adb install -r -g CtsVerifier.apk
adb install -r --instant CtsVerifierInstantApp.apk
Launch CtsVerifier, Instant Apps Notification Test
Bug: 143173196
Bug: 159355574
Change-Id: I216f23a1a0e2865d0388fd80d8b4f1ecbce2dbb4
(cherry picked from commit 435a3aa6906d5bc9e4751277282c271b2e5510a3)
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 17930b8..edbc7a0 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -5552,16 +5552,16 @@
1. Click Start Test. \n\n
2. An alert dialog with install instruction will be shown if the sample Instant App has not been installed, otherwise, the sample Instant App will be opened automatically. \n\n
3. Drag down the notification bar when the sample Instant App is at foreground. \n\n
- 4. Skip this step in china version. \n\n
+ 4. Check if Instant App is shown in notifciation area with the following (Please expand the notification if it is collapsed): \n
+ \u0020\u0020\u0020a. It provides information about Instant Apps not requiring installation and an action that provides more information about the Instant App. \n
+ \u0020\u0020\u0020b. It provides an action allowing the user to launch the associated link with web browser. \n\n
5. Click Pass button if all checks in step 4 passed, otherwise click Fail button.
</string>
<string name="ia_notification_instruction_label_no_app_market_version">\n
1. Click Start Test. \n\n
2. An alert dialog with install instruction will be shown if the sample Instant App has not been installed, otherwise, the sample Instant App will be opened automatically. \n\n
3. Drag down the notification bar when the sample Instant App is at foreground. \n\n
- 4. Check if Instant App is shown in notification area with the following (Please expand the notification if it is collapsed): \n
- \u0020\u0020\u0020a. It provides information about Instant Apps not requiring installation and an action that provides more information about the Instant App. \n
- \u0020\u0020\u0020b. Skip this step in china version.Can not launch the associated link with web browser. \n\n
+ 4. Check if Instant App is shown in notification area with information about Instant Apps not requiring installation and an action that provides more information about the Instant App (Please expand the notification if it is collapsed) \n\n
5. Click Pass button if all checks in step 4 passed, otherwise click Fail button.
</string>
<string name="ia_recents">Instant Apps Recents Test</string>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/instantapps/NotificationTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/instantapps/NotificationTestActivity.java
index 77caeb9..4acdfd2 100755
--- a/apps/CtsVerifier/src/com/android/cts/verifier/instantapps/NotificationTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/instantapps/NotificationTestActivity.java
@@ -16,7 +16,6 @@
package com.android.cts.verifier.instantapps;
import android.os.Bundle;
-import android.os.SystemProperties;
import android.content.pm.PackageManager;
import android.widget.TextView;
@@ -36,18 +35,16 @@
setInfoResources(R.string.ia_notification, R.string.ia_notification_info, -1);
TextView extraText = (TextView) findViewById(R.id.instruction_extra_text);
- if (isNoGooglePlayStore()) {
- extraText.setText(R.string.ia_notification_instruction_label_no_app_market_version);
- } else {
+ if (deviceHasPlayStore()) {
extraText.setText(R.string.ia_notification_instruction_label);
+ } else {
+ extraText.setText(R.string.ia_notification_instruction_label_no_app_market_version);
}
}
- private boolean isNoGooglePlayStore() {
- boolean isCnGmsVersion =
+ private boolean deviceHasPlayStore() {
+ boolean hasCnGmsVersion =
getApplicationContext().getPackageManager().hasSystemFeature("cn.google.services");
- boolean isNoGmsVersion =
- (SystemProperties.get("ro.com.google.gmsversion", null) == null);
- return isCnGmsVersion || isNoGmsVersion;
+ return !hasCnGmsVersion;
}
}
