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

Commit 2b734e35 authored by Svet Ganov's avatar Svet Ganov Committed by android-build-merger
Browse files

Merge "Fix a NPE in PackageInstaller" into nyc-dev 

am: 18d40b76

* commit '18d40b76':
  Fix a NPE in PackageInstaller

Change-Id: Ia3aa96f250704723a817aec484c0c1af8f53ce2e
parents 9f3d3a80 18d40b76

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+0 −4
Original line number Diff line number Diff line
@@ -162,10 +162,6 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
            group.addPermission(permission);

        }



        if (group.getPermissions().isEmpty()) {

            return null;

        }



        return group;

    }

src/com/android/packageinstaller/permission/model/PermissionApps.java

+4 −0
Original line number Diff line number Diff line
@@ -190,6 +190,10 @@ public class PermissionApps { 
                    AppPermissionGroup group = AppPermissionGroup.create(mContext,

                            app, groupInfo, groupPermInfos, user);



                    if (group == null) {

                        continue;

                    }



                    String label = mSkipUi ? app.packageName

                            : app.applicationInfo.loadLabel(mPm).toString();

                    PermissionApp permApp = new PermissionApp(app.packageName,