From cfc6b97c7d4dbaf7a50433a0f459ee4e25725e82 Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Fri, 4 Dec 2015 13:30:49 -0800
Subject: Fix wake lock leak

Wake lock was not being released when installation failed
due to early bail out call.  I wrapped the calls into
a try/finally to ensure it gets released.

Code was tested by tweaking the code to force a failure
and test installing/uninstalling apps.

BUG: 25814793
Change-Id: I2e81e5d76edcfb601ce734cf571705e979c51f32
---
 .../wear/WearPackageInstallerService.java          | 59 ++++++++++++----------
 1 file 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);
         }
     }
 }
-- 
cgit v1.2.3