diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-11-07 17:43:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-07 17:43:22 +0000 |
| commit | 08457a37c2c2557a84cddb33f98a2c401be428ea (patch) | |
| tree | 7d95d7ba8ad13496f1eb5174f87ab143ba93e3fc /src | |
| parent | a59b22950d87138125f172e9d6bd9a23f182e6cf (diff) | |
| parent | 38b87543b0fb252ecddb7ea87688ac2aaeb15319 (diff) | |
| download | android_packages_apps_PackageInstaller-08457a37c2c2557a84cddb33f98a2c401be428ea.tar.gz android_packages_apps_PackageInstaller-08457a37c2c2557a84cddb33f98a2c401be428ea.tar.bz2 android_packages_apps_PackageInstaller-08457a37c2c2557a84cddb33f98a2c401be428ea.zip | |
resolve merge conflicts of e8c6801367 to cw-e-dev. am: 012a557f59 am: 6f8e0b2bdc
am: 38b87543b0
* commit '38b87543b0fb252ecddb7ea87688ac2aaeb15319':
resolve merge conflicts of e8c6801367 to cw-e-dev.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/wear/WearPackageInstallerService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/wear/WearPackageInstallerService.java b/src/com/android/packageinstaller/wear/WearPackageInstallerService.java index ba83ea28..d57236e1 100644 --- a/src/com/android/packageinstaller/wear/WearPackageInstallerService.java +++ b/src/com/android/packageinstaller/wear/WearPackageInstallerService.java @@ -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]); } } |