2 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 55a1f814..de685825 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -477,6 +477,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
         final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(getIntent());
         if (!requestFromUnknownSource) {
             initiateInstall();
+            return;
         }
 
         // If the admin prohibits it, or we're running in a managed profile, just show error
diff --git a/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
index ec320701..e6ad66da 100644
--- a/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java
@@ -421,6 +421,18 @@ public final class PermissionAppsFragment extends SettingsWithHeader implements
             bindUi(this, permissionApps);
         }
 
+        @Override
+        public void onResume() {
+            super.onResume();
+            mOuterFragment.mPermissionApps.refresh(true);
+        }
+
+        @Override
+        public void onDestroy() {
+            super.onDestroy();
+            mOuterFragment.setOnPermissionsLoadedListener(null);
+        }
+
 
         private static void bindUi(SettingsWithHeader fragment, PermissionApps permissionApps) {
             final CharSequence label = permissionApps.getLabel();
@@ -428,11 +440,9 @@ public final class PermissionAppsFragment extends SettingsWithHeader implements
                     fragment.getString(R.string.system_apps_decor_title, label));
         }
 
-
         @Override
         public void onPermissionsLoaded(PermissionApps permissionApps) {
             setPreferenceScreen();
-            mOuterFragment.setOnPermissionsLoadedListener(null);
         }
 
         private void setPreferenceScreen() {