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

Merge commit '21f15f68c2940a87954d9889e208ffbbed2c1995' into kraken

* commit '21f15f68c2940a87954d9889e208ffbbed2c1995':
  Handle exceptions when doing dexopt.
This commit is contained in:
Suchi Amalapurapu
2010-04-02 12:53:45 -07:00
committed by Android Git Automerger

View File

@@ -2692,7 +2692,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) {