Snap for 5591509 from 8f4ffea5e2b35f5c839b8a29c331fd6fe30396f6 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release

Change-Id: Id3e528119ddfaf919503ca317bd5df805961ba9e

2 files changed, 20 insertions, 8 deletions

diff --git a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
index 3896731..36b7d38 100644
--- a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
+++ b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
@@ -113,12 +113,8 @@ public class WizardManagerHelper {
     }
   }
 
-  /**
-   * Checks whether an intent is intended to be used within the setup wizard flow.
-   *
-   * @param intent The intent to be checked, usually from {@link Activity#getIntent()}.
-   * @return true if the intent passed in was intended to be used with setup wizard.
-   */
+  /** @deprecated Use {@link isInitialSetupWizard} instead. */
+  @Deprecated
   public static boolean isSetupWizardIntent(Intent intent) {
     return intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false);
   }
@@ -191,6 +187,16 @@ public class WizardManagerHelper {
   }
 
   /**
+   * Checks whether an intent is is running in the initial setup wizard flow.
+   *
+   * @param intent The intent to be checked, usually from {@link Activity#getIntent()}.
+   * @return true if the intent passed in was intended to be used with setup wizard.
+   */
+  public static boolean isInitialSetupWizard(Intent intent) {
+    return intent.getBooleanExtra(EXTRA_IS_FIRST_RUN, false);
+  }
+
+  /**
    * Returns true if the intent passed in indicates that it is running in any setup wizard flow,
    * including initial setup and deferred setup etc.
    *
@@ -205,7 +211,7 @@ public class WizardManagerHelper {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
       return originalIntent.getBooleanExtra(EXTRA_IS_SETUP_FLOW, false);
     } else {
-      return isSetupWizardIntent(originalIntent)
+      return isInitialSetupWizard(originalIntent)
           || isPreDeferredSetupWizard(originalIntent)
           || isDeferredSetupWizard(originalIntent);
     }
diff --git a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java
index 6dd71b2..eac403f 100644
--- a/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java
+++ b/partnerconfig/java/com/google/android/setupcompat/partnerconfig/PartnerConfigHelper.java
@@ -325,7 +325,13 @@ public class PartnerConfigHelper {
   private Resources getResourcesByPackageName(Context context, String packageName)
       throws PackageManager.NameNotFoundException {
     PackageManager manager = context.getPackageManager();
-    return manager.getResourcesForApplication(packageName);
+    if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
+      return manager.getResourcesForApplication(
+          manager.getApplicationInfo(packageName, PackageManager.MATCH_DISABLED_COMPONENTS));
+    } else {
+      return manager.getResourcesForApplication(
+          manager.getApplicationInfo(packageName, PackageManager.GET_DISABLED_COMPONENTS));
+    }
   }
 
   private ResourceEntry getResourceEntryFromKey(String resourceName) {