Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
diff --git a/Android.mk b/Android.mk
index e5980b4..a116c9d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -439,8 +439,8 @@
## Latest ADT version identifiers, for reference from published docs
framework_docs_ADT_VERSION:=0.9.7
framework_docs_ADT_DOWNLOAD:=ADT-0.9.7.zip
-framework_docs_ADT_BYTES:=na
-framework_docs_ADT_CHECKSUM:=na
+framework_docs_ADT_BYTES:=8033750
+framework_docs_ADT_CHECKSUM:=de2431c8d4786d127ae5bfc95b4605df
framework_docs_LOCAL_DROIDDOC_OPTIONS += \
-hdf sdk.version $(framework_docs_SDK_VERSION) \
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index d383fde..5e92253 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -2,16 +2,16 @@
sdk.redirect=0
sdk.win_download=android-sdk_r06-windows.zip
-sdk.win_bytes=
-sdk.win_checksum=
+sdk.win_bytes=23293160
+sdk.win_checksum=7c7fcec3c6b5c7c3df6ae654b27effb5
sdk.mac_download=android-sdk_r06-mac_86.zip
-sdk.mac_bytes=
-sdk.mac_checksum=
+sdk.mac_bytes=19108077
+sdk.mac_checksum=c92abf66a82c7a3f2b8493ebe025dd22
sdk.linux_download=android-sdk_r06-linux_86.tgz
-sdk.linux_bytes=
-sdk.linux_checksum=
+sdk.linux_bytes=16971139
+sdk.linux_checksum=848371e4bf068dbb582b709f4e56d903
@jd:body
diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd
index 361da42..69cc73d 100644
--- a/docs/html/sdk/ndk/index.jd
+++ b/docs/html/sdk/ndk/index.jd
@@ -1,16 +1,16 @@
ndk=true
ndk.win_download=android-ndk-r4-windows.zip
-ndk.win_bytes=
-ndk.win_checksum=
+ndk.win_bytes=45778965
+ndk.win_checksum=1eded98a7f5cd5e71f8ac74565f73f11
ndk.mac_download=android-ndk-r4-darwin-x86.zip
-ndk.mac_bytes=
-ndk.mac_checksum=
+ndk.mac_bytes=50572163
+ndk.mac_checksum=b7d5f149fecf951c05a79b045f00419f
ndk.linux_download=android-ndk-r4-linux-x86.zip
-ndk.linux_bytes=
-ndk.linux_checksum=
+ndk.linux_bytes=49450682
+ndk.linux_checksum=0892b0637d45d145e045cc68e163dee3
page.title=Android NDK
@jd:body
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index ee725cc..22becba 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -5315,13 +5315,13 @@
}
SdInstallArgs(String cid) {
- this((Uri)null, cid);
+ super(null, null, PackageManager.INSTALL_EXTERNAL, null);
+ this.cid = cid;
}
SdInstallArgs(Uri packageURI, String cid) {
super(packageURI, null, PackageManager.INSTALL_EXTERNAL, null);
this.cid = cid;
- cachePath = PackageHelper.getSdDir(cid);
}
void createCopyFile() {