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

Commit 6f8e0b2b authored by Vinod Krishnan's avatar Vinod Krishnan Committed by android-build-merger
Browse files

resolve merge conflicts of e8c6801367 to cw-e-dev. 

am: 012a557f

* commit '012a557f':
  resolve merge conflicts of e8c6801367 to cw-e-dev.
parents 09ae425c 012a557f

src/com/android/packageinstaller/wear/WearPackageInstallerService.java

+5 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class WearPackageInstallerService extends Service { 
            PackageInfo existingPkgInfo = null;

            try {

                existingPkgInfo = pm.getPackageInfo(packageName,

                        PackageManager.GET_UNINSTALLED_PACKAGES);

                        PackageManager.GET_UNINSTALLED_PACKAGES | PackageManager.GET_PERMISSIONS);

                if(existingPkgInfo != null) {

                    installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;

                }
@@ -298,6 +298,10 @@ public class WearPackageInstallerService extends Service { 
                        // If the permission is granted, then we will not ask to request it again.

                        if ((existingPkgInfo.requestedPermissionsFlags[i] &

                                PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {

                            if (Log.isLoggable(TAG, Log.DEBUG)) {

                                Log.d(TAG, existingPkgInfo.requestedPermissions[i] +

                                        " is already granted for " + packageName);

                            }

                            wearablePerms.remove(existingPkgInfo.requestedPermissions[i]);

                        }

                    }