Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b03da77 authored by Michael W's avatar Michael W Committed by Gerrit Code Review
Browse files

Settings: Fix possible NPE 

Checking applicationInfo on a null object causes a NPE
Check for null first and make the menu entry invisible in that case

Change-Id: I9c6c1156e8d809abf9f13a80eaa908317cba8bdc
Reference: BugDumps 20160909-15 L#39
parent e94c0727

src/com/android/settings/applications/InstalledAppDetails.java

+2 −3
Original line number Diff line number Diff line
@@ -413,9 +413,8 @@ public class InstalledAppDetails extends AppInfoBase 
        mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;

        menu.findItem(UNINSTALL_UPDATES).setVisible(mUpdatedSysApp && !mAppControlRestricted);



        if (mPackageInfo.applicationInfo != null) {

            menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo.applicationInfo.protect);

        }

        menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo != null &&

                mPackageInfo.applicationInfo != null && mPackageInfo.applicationInfo.protect);

    }



    @Override