OSDN Git Service

SDK Manager: Fix NPE when deleting local archive. Do not merge.
authorRaphael <raphael@google.com>
Wed, 5 Oct 2011 06:31:35 +0000 (23:31 -0700)
committerRaphael Moll <raphael@google.com>
Wed, 5 Oct 2011 06:59:08 +0000 (23:59 -0700)
commite75843be78e31ece5d30ec8a6cc51dad45d6d9cb
treed8d252ab4bde278fbecdd888b93a92043c9c24a5
parent642999bdbade5a877743381a3fc9e4193c90a38f
SDK Manager: Fix NPE when deleting local archive. Do not merge.

Properly enforce that all local archive should have
an actual installation path to be considered local.

This was missing in the system image and the source
archives introduced last week.

(cherry picked from commit 903ae4af34664fb8ffffa7a86e907814f860dab1)

Change-Id: I7265bf8460acb5c9ff5c9f1df6770b82e3b3e2f8
12 files changed:
sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Archive.java
sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java
sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java
sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SourcePackage.java
sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/SystemImagePackage.java
sdkmanager/libs/sdklib/src/com/android/sdklib/io/FileOp.java
sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockBrokenPackage.java
sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockEmptyPackage.java
sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockSourcePackage.java
sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/MockSystemImagePackage.java
sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SourcePackageTest.java
sdkmanager/libs/sdklib/tests/src/com/android/sdklib/internal/repository/SystemImagePackageTest.java