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

Commit 21f15f68 authored by Suchi Amalapurapu's avatar Suchi Amalapurapu Committed by Android Git Automerger
Browse files

am a77acab9: Merge "Handle exceptions when doing dexopt." into froyo 

Merge commit 'a77acab9' into froyo-plus-aosp

* commit 'a77acab9':
  Handle exceptions when doing dexopt.
parents f0e62b7a a77acab9

services/java/com/android/server/PackageManagerService.java

+7 −1
Original line number Diff line number Diff line
@@ -2681,7 +2681,13 @@ class PackageManagerService extends IPackageManager.Stub { 
                Slog.w(TAG, "Apk not found for dexopt: " + path);

                ret = -1;

            } catch (IOException e) {

                Slog.w(TAG, "Exception reading apk: " + path, e);

                Slog.w(TAG, "IOException reading apk: " + path, e);

                ret = -1;

            } catch (dalvik.system.StaleDexCacheError e) {

                Slog.w(TAG, "StaleDexCacheError when reading apk: " + path, e);

                ret = -1;

            } catch (Exception e) {

                Slog.w(TAG, "Exception when doing dexopt : ", e);

                ret = -1;

            }

            if (ret < 0) {