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

Commit 2a9abe9e authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 0f67b255: am 5b7d1481: Merge "grantPermissionsLPw: get rid of a level of... 

am 0f67b255: am 5b7d1481: Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev

* commit '0f67b255':
  grantPermissionsLPw: get rid of a level of curly braces
parents cfa35cbc 0f67b255

services/java/com/android/server/pm/PackageManagerService.java

+76 −74
Original line number Diff line number Diff line
@@ -5144,7 +5144,13 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    Log.i(TAG, "Package " + pkg.packageName + " checking " + name + ": " + bp);

                }

            }

            if (bp != null && bp.packageSetting != null) {



            if (bp == null || bp.packageSetting == null) {

                Slog.w(TAG, "Unknown permission " + name

                        + " in package " + pkg.packageName);

                continue;

            }



            final String perm = bp.name;

            boolean allowed;

            boolean allowedSig = false;
@@ -5224,10 +5230,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
                            + ")");

                }

            }

            } else {

                Slog.w(TAG, "Unknown permission " + name

                        + " in package " + pkg.packageName);

            }

        }



        if ((changedPermission || replace) && !ps.permissionsFixed &&