Merge branch 'aosp/honeycomb-LTE-release' into honeycomb-mr2-x86

Conflicts:
	core/build_id.mk

diff --git a/core/Makefile b/core/Makefile
index 407935b..0dc995a 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -966,6 +966,7 @@ built_ota_tools := \
        $(call intermediates-dir-for,EXECUTABLES,applypatch)/applypatch \
        $(call intermediates-dir-for,EXECUTABLES,applypatch_static)/applypatch_static \
        $(call intermediates-dir-for,EXECUTABLES,check_prereq)/check_prereq \
+       $(call intermediates-dir-for,EXECUTABLES,sqlite3)/sqlite3 \
        $(call intermediates-dir-for,EXECUTABLES,updater)/updater
 $(BUILT_TARGET_FILES_PACKAGE): PRIVATE_OTA_TOOLS := $(built_ota_tools)
 

diff --git a/core/build_id.mk b/core/build_id.mk
index 1e85c3b..796504b 100644 (file)
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -19,4 +19,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=HTJ85B
+export BUILD_ID=HLK75D

diff --git a/core/main.mk b/core/main.mk
index 76d96b6..f5962d6 100644 (file)
--- a/core/main.mk
+++ b/core/main.mk
@@ -323,18 +323,6 @@ ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
     $(warning implicitly installing apns-conf_sdk.xml)
   endif
 endif
-# If we're on an eng or tests build, but not on the sdk, and we have
-# a better one, use that instead.
-ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
-  ifndef is_sdk_build
-    apns_to_use := $(wildcard vendor/google/etc/apns-conf.xml)
-    ifneq ($(strip $(apns_to_use)),)
-      PRODUCT_COPY_FILES := \
-            $(filter-out %:system/etc/apns-conf.xml,$(PRODUCT_COPY_FILES)) \
-            $(strip $(apns_to_use)):system/etc/apns-conf.xml
-    endif
-  endif
-endif
 endif
 
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android

diff --git a/core/user_tags.mk b/core/user_tags.mk
index 090b7fa..120a502 100644 (file)
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -154,7 +154,6 @@ GRANDFATHERED_USER_MODULES += \
        init \
        input \
        ip \
-       iptables \
        iself \
        isprelinked \
        jarjar \

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index b54128c..ef85f84 100644 (file)
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
   # which is the version that we reveal to the end user.
   # Update this value when the platform version changes (rather
   # than overriding it somewhere else).  Can be an arbitrary string.
-  PLATFORM_VERSION := 3.2
+  PLATFORM_VERSION := 3.2.2
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"

diff --git a/target/board/generic_x86/device.mk b/target/board/generic_x86/device.mk
index 0170527..b47f51d 100644 (file)
--- a/target/board/generic_x86/device.mk
+++ b/target/board/generic_x86/device.mk
@@ -45,11 +45,11 @@ PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
     packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
 
-PRODUCT_LOCALES := hdpi mdpi
+PRODUCT_LOCALES := en_US
 
 PRODUCT_TAGS += dalvik.gc.type-precise
 
-PRODUCT_CHARACTERISTICS := tablet,nosdcard
+PRODUCT_CHARACTERISTICS := tablet
 
 # Get the touchscreen calibration tool
 $(call inherit-product-if-exists,external/tslib/tslib.mk)

diff --git a/target/product/core.mk b/target/product/core.mk
index 3eb72d3..fb46516 100644 (file)
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -23,6 +23,24 @@ PRODUCT_PROPERTY_OVERRIDES := \
     ro.config.alarm_alert=Alarm_Classic.ogg
 
 PRODUCT_PACKAGES := \
+    ApplicationsProvider \
+    Browser \
+    Bugreport \
+    Contacts \
+    ContactsProvider \
+    DefaultContainerService \
+    DownloadProvider \
+    DownloadProviderUi \
+    HTMLViewer \
+    Home \
+    MediaProvider \
+    PackageInstaller \
+    PicoTts \
+    SettingsProvider \
+    TelephonyProvider \
+    TtsService \
+    UserDictionaryProvider \
+    VpnServices \
     apache-xml \
     bouncycastle \
     com.android.location.provider \
@@ -41,7 +59,12 @@ PRODUCT_PACKAGES := \
     hprof-conv \
     icu.dat \
     installd \
+    ip \
     ip-up-vpn \
+    ip6tables \
+    iptables \
+    libOpenMAXAL \
+    libOpenSLES \
     libcrypto \
     libdex \
     libdvm \
@@ -51,34 +74,13 @@ PRODUCT_PACKAGES := \
     libjavacore \
     libnativehelper \
     libnfc_ndef \
-    libOpenMAXAL \
-    libOpenSLES \
     libsqlite_jni \
     libssl \
     libwilhelm \
     libz \
+    screencap \
     sqlite-jdbc \
-    wpa_supplicant.conf \
-    Browser \
-    Contacts \
-    Home \
-    HTMLViewer \
-    ApplicationsProvider \
-    ContactsProvider \
-    DownloadProvider \
-    DownloadProviderUi \
-    MediaProvider \
-    PicoTts \
-    SettingsProvider \
-    TelephonyProvider \
-    TtsService \
-    VpnServices \
-    UserDictionaryProvider \
-    PackageInstaller \
-    DefaultContainerService \
-    Bugreport \
-    ip \
-    screencap
+    wpa_supplicant.conf
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)

diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk
index a69a013..af00e50 100644 (file)
--- a/target/product/generic_x86.mk
+++ b/target/product/generic_x86.mk
@@ -39,9 +39,11 @@ PRODUCT_PACKAGES += \
     tune2fs \
 
 THIRD_PARTY_APPS = \
+    AndroidTerm \
     ConnectBot \
     FileManager \
     LIME \
+    ZeroXBenchmark \
 
 # Generic x86 device configurations
 $(call inherit-product,$(SRC_TARGET_DIR)/board/generic_x86/device.mk)
@@ -54,6 +56,7 @@ PRODUCT_BRAND := generic_x86
 PRODUCT_DEVICE := generic_x86
 PRODUCT_NAME := generic_x86
 PRODUCT_POLICY := android.policy_phone
+PRODUCT_LOCALES += mdpi
 
 GENERIC_X86_CONFIG_MK := $(SRC_TARGET_DIR)/board/generic_x86/BoardConfig.mk
 GENERIC_X86_ANDROID_MK := $(SRC_TARGET_DIR)/board/generic_x86/AndroidBoard.mk

diff --git a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
index 728e015..e353236 100644 (file)
--- a/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
+++ b/tools/droiddoc/templates-sdk/assets/android-developer-docs.js
@@ -255,23 +255,23 @@ function highlightNav(fullPageName) {
   if (lastSlashPos == (fullPageName.length - 1)) { // if the url ends in slash (add 'index.html')
     fullPageName = fullPageName + "index.html";
   }
-  // First check if the exact URL, with query string and all, is in the navigation menu
-  var pathPageName = fullPageName.substr(firstSlashPos);
+
+  // get the path and page name from the URL (such as 'guide/topics/graphics/index.html')
+  var htmlPos = fullPageName.indexOf(".html");
+  var pathPageName = fullPageName.slice(firstSlashPos, htmlPos + 5); // +5 advances past ".html"
+  // find instances of the page name in the side nav
   var link = $("#devdoc-nav a[href$='"+ pathPageName+"']");
-  if (link.length == 0) {
-    var htmlPos = fullPageName.lastIndexOf(".html", fullPageName.length);
-    pathPageName = fullPageName.slice(firstSlashPos, htmlPos + 5); // +5 advances past ".html"
-    link = $("#devdoc-nav a[href$='"+ pathPageName+"']");
-    if ((link.length == 0) && ((fullPageName.indexOf("/guide/") != -1) || (fullPageName.indexOf("/resources/") != -1))) {
-      // if there's no match, then let's backstep through the directory until we find an index.html page
-      // that matches our ancestor directories (only for dev guide and resources)
-      lastBackstep = pathPageName.lastIndexOf("/");
-      while (link.length == 0) {
-        backstepDirectory = pathPageName.lastIndexOf("/", lastBackstep);
-        link = $("#devdoc-nav a[href$='"+ pathPageName.slice(0, backstepDirectory + 1)+"index.html']");
-        lastBackstep = pathPageName.lastIndexOf("/", lastBackstep - 1);
-        if (lastBackstep == 0) break;
-      }
+  // if there's no match, then let's backstep through the directory until we find an index.html
+  // page that matches our ancestor directories (only for dev guide and resources)
+  if ((link.length == 0) && ((fullPageName.indexOf("/guide/") != -1) ||
+                  (fullPageName.indexOf("/resources/") != -1))) {
+    lastBackstep = pathPageName.lastIndexOf("/");
+    while (link.length == 0) {
+      backstepDirectory = pathPageName.lastIndexOf("/", lastBackstep);
+      link = $("#devdoc-nav a[href$='"+ pathPageName.slice(0, backstepDirectory +
+                      1)+"index.html']");
+      lastBackstep = pathPageName.lastIndexOf("/", lastBackstep - 1);
+      if (lastBackstep == 0) break;
     }
   }
 

diff --git a/tools/droiddoc/templates-sdk/assets/images/home/GTV_icon_large.png b/tools/droiddoc/templates-sdk/assets/images/home/GTV_icon_large.png
new file mode 100644 (file)
index 0000000..72d54ad
Binary files /dev/null and b/tools/droiddoc/templates-sdk/assets/images/home/GTV_icon_large.png differ

diff --git a/tools/droiddoc/templates-sdk/assets/images/home/GTV_icon_small.png b/tools/droiddoc/templates-sdk/assets/images/home/GTV_icon_small.png
new file mode 100644 (file)
index 0000000..3da1699
Binary files /dev/null and b/tools/droiddoc/templates-sdk/assets/images/home/GTV_icon_small.png differ

diff --git a/tools/droiddoc/templates-sdk/assets/images/home/tv_l.png b/tools/droiddoc/templates-sdk/assets/images/home/tv_l.png
deleted file mode 100644 (file)
index ed89bfc..0000000
Binary files a/tools/droiddoc/templates-sdk/assets/images/home/tv_l.png and /dev/null differ

diff --git a/tools/droiddoc/templates-sdk/assets/images/home/tv_s.png b/tools/droiddoc/templates-sdk/assets/images/home/tv_s.png
deleted file mode 100644 (file)
index 6ca68cb..0000000
Binary files a/tools/droiddoc/templates-sdk/assets/images/home/tv_s.png and /dev/null differ