Merge "Ensure OK/Cancel buttons always shown" into rvc-qpr-dev

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

@@ -343,17 +343,19 @@ public class PackageInstallerActivity extends AlertActivity {
         if (!wasSetUp) {
             return;
         }
-
-        // load dummy layout with OK button disabled until we override this layout in
-        // startInstallConfirm
-        bindUi();
-        checkIfAllowedAndInitiateInstall();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
+        if (mAppSnippet != null) {
+            // load dummy layout with OK button disabled until we override this layout in
+            // startInstallConfirm
+            bindUi();
+            checkIfAllowedAndInitiateInstall();
+        }
+
         if (mOk != null) {
             mOk.setEnabled(mEnableOk);
         }