diff options
author | Anthony Hugh <ahugh@google.com> | 2015-12-05 00:53:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-12-05 00:53:50 +0000 |
commit | 59f758a01daf2f0bdd46aa33b2dcf6ae45a457c1 (patch) | |
tree | d30e4731ab3d5ddd54b39d8ab509e3690d20aa9c /src/com/android | |
parent | 127e23ff2088586ace61819034650c0b3317b078 (diff) | |
parent | 546c1ffab682f913845977d17b96e9428f07d993 (diff) | |
download | android_packages_apps_PackageInstaller-59f758a01daf2f0bdd46aa33b2dcf6ae45a457c1.tar.gz android_packages_apps_PackageInstaller-59f758a01daf2f0bdd46aa33b2dcf6ae45a457c1.tar.bz2 android_packages_apps_PackageInstaller-59f758a01daf2f0bdd46aa33b2dcf6ae45a457c1.zip |
Fix wake lock leak am: cfc6b97c7d
am: 546c1ffab6
* commit '546c1ffab682f913845977d17b96e9428f07d993':
Fix wake lock leak
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/packageinstaller/wear/WearPackageInstallerService.java | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/src/com/android/packageinstaller/wear/WearPackageInstallerService.java b/src/com/android/packageinstaller/wear/WearPackageInstallerService.java index 6dc5aa70..229a3df6 100644 --- a/src/com/android/packageinstaller/wear/WearPackageInstallerService.java +++ b/src/com/android/packageinstaller/wear/WearPackageInstallerService.java @@ -586,31 +586,33 @@ public class WearPackageInstallerService extends Service { } public void packageInstalled(String packageName, int returnCode) { - // If installation failed, bail out and remove the ShowPermsStore entry - if (returnCode < 0) { - Log.e(TAG, "Package install failed " + mApplicationPackageName - + ", returnCode " + returnCode); - WearPackageUtil.removeFromPermStore(mContext, mApplicationPackageName); - return; - } + try { + // If installation failed, bail out and remove the ShowPermsStore entry + if (returnCode < 0) { + Log.e(TAG, "Package install failed " + mApplicationPackageName + + ", returnCode " + returnCode); + WearPackageUtil.removeFromPermStore(mContext, mApplicationPackageName); + return; + } - Log.i(TAG, "Package " + packageName + " was installed."); + Log.i(TAG, "Package " + packageName + " was installed."); - // Delete tempFile from the file system. - File tempFile = WearPackageUtil.getTemporaryFile(mContext, packageName); - if (tempFile != null) { - tempFile.delete(); - } + // Delete tempFile from the file system. + File tempFile = WearPackageUtil.getTemporaryFile(mContext, packageName); + if (tempFile != null) { + tempFile.delete(); + } - // Broadcast the "UPDATED" gmscore intent, normally sent by play store. - // TODO: Remove this broadcast if/when we get the play store to do this for us. - if (GMS_PACKAGE_NAME.equals(packageName)) { - Intent gmsInstalledIntent = new Intent(GMS_UPDATED_BROADCAST); - gmsInstalledIntent.setPackage(GMS_PACKAGE_NAME); - mContext.sendBroadcast(gmsInstalledIntent); + // Broadcast the "UPDATED" gmscore intent, normally sent by play store. + // TODO: Remove this broadcast if/when we get the play store to do this for us. + if (GMS_PACKAGE_NAME.equals(packageName)) { + Intent gmsInstalledIntent = new Intent(GMS_UPDATED_BROADCAST); + gmsInstalledIntent.setPackage(GMS_PACKAGE_NAME); + mContext.sendBroadcast(gmsInstalledIntent); + } + } finally { + finishService(mWakeLock, mStartId); } - - finishService(mWakeLock, mStartId); } } @@ -624,13 +626,16 @@ public class WearPackageInstallerService extends Service { } public void packageDeleted(String packageName, int returnCode) { - if (returnCode >= 0) { - Log.i(TAG, "Package " + packageName + " was uninstalled."); - } else { - Log.e(TAG, "Package uninstall failed " + packageName + ", returnCode " + - returnCode); + try { + if (returnCode >= 0) { + Log.i(TAG, "Package " + packageName + " was uninstalled."); + } else { + Log.e(TAG, "Package uninstall failed " + packageName + ", returnCode " + + returnCode); + } + } finally { + finishService(mWakeLock, mStartId); } - finishService(mWakeLock, mStartId); } } } |