Merge "Fix a crash when launching app detail for bad package name" am: ada1a39ffb

am: 2e2e1e243d

Change-Id: I3614f70f71c0e0eb064331175cb51fa30ed5a5b7

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

@@ -203,16 +203,22 @@ public class AppInfoDashboardFragment extends DashboardFragment
         mDpm = (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
         mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
         mPm = activity.getPackageManager();
-
         if (!ensurePackageInfoAvailable(activity)) {
             return;
         }
-
         startListeningToPackageRemove();
 
         setHasOptionsMenu(true);
     }
 
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        if (!ensurePackageInfoAvailable(getActivity())) {
+            return;
+        }
+        super.onCreatePreferences(savedInstanceState, rootKey);
+    }
+
     @Override
     public void onDestroy() {
         stopListeningToPackageRemove();