summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-12-04 21:49:07 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2015-12-04 21:49:07 (GMT)
commit546c1ffab682f913845977d17b96e9428f07d993 (patch)
tree07129c85e0a9fc260a8cf7510847172c1a5714f2
parentee232c4b6f5fc2d778832f470e98b57508befe62 (diff)
parentcfc6b97c7d4dbaf7a50433a0f459ee4e25725e82 (diff)
downloadandroid_packages_apps_PackageInstaller-546c1ffab682f913845977d17b96e9428f07d993.zip
android_packages_apps_PackageInstaller-546c1ffab682f913845977d17b96e9428f07d993.tar.gz
android_packages_apps_PackageInstaller-546c1ffab682f913845977d17b96e9428f07d993.tar.bz2
Fix wake lock leak
am: cfc6b97c7d * commit 'cfc6b97c7d4dbaf7a50433a0f459ee4e25725e82': Fix wake lock leak
-rw-r--r--src/com/android/packageinstaller/wear/WearPackageInstallerService.java59
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 6dc5aa7..229a3df 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);
}
}
}