Permalink
Browse files

Merge remote-tracking branch 'aosp/jb-mr1-release' into mr1-staging

Conflicts:
	AndroidProducts.mk
	BoardConfig.mk
	bcmdhd.cal
	board-info.txt
	device.mk
	full_toroplus.mk
	overlay/frameworks/base/core/res/res/values/config.xml
	overlay/frameworks/base/core/res/res/values/strings.xml
	overlay/frameworks/base/core/res/res/xml/eri.xml
	overlay/frameworks/base/core/res/res/xml/power_profile.xml
	overlay/frameworks/base/packages/SystemUI/res/values/config.xml
	overlay/packages/apps/Mms/res/xml/mms_config.xml
	overlay/packages/apps/Settings/res/values/bools.xml
	overlay/packages/apps/Settings/res/values/config.xml
	overlay/packages/apps/Settings/res/values/strings.xml
	recovery.fstab
	system.prop

Change-Id: I4a5b41504f0afad44689aec78f43fe87fe6d827a
  • Loading branch information...
2 parents 50ba154 + 4ea2e8d commit 28c7616bf9086965cbb6e8f47666151cad4792a7 @burnsra burnsra committed Nov 28, 2012
Showing with 4,159 additions and 1,573 deletions.
  1. +1 −1 AndroidProducts.mk
  2. +11 −5 BoardConfig.mk
  3. +52 −0 CleanSpec.mk
  4. +22 −0 bluetooth/bdroid_buildcfg.h
  5. +0 −4 board-info.txt
  6. +9 −17 device.mk
  7. +12 −9 full_toroplus.mk
  8. +40 −35 overlay/frameworks/base/core/res/res/values/config.xml
  9. +3 −4 overlay/frameworks/base/core/res/res/values/strings.xml
  10. +1,290 −1,266 overlay/frameworks/base/core/res/res/xml/eri.xml
  11. +55 −33 overlay/frameworks/base/core/res/res/xml/power_profile.xml
  12. +21 −0 overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
  13. +8 −5 overlay/frameworks/base/packages/SystemUI/res/values/config.xml
  14. +26 −0 overlay/packages/apps/Contacts/res/values/donottranslate_config.xml
  15. +10 −11 overlay/packages/apps/Mms/res/xml/mms_config.xml
  16. +19 −0 overlay/packages/apps/Settings/res/values-es/strings.xml
  17. +47 −0 proprietary-blobs.txt
  18. +18 −0 recovery/Android.mk
  19. +53 −0 recovery/recovery_updater.c
  20. +109 −0 recovery/update_cdma_modem.c
  21. +22 −0 recovery/update_cdma_modem.h
  22. +144 −0 releasetools.py
  23. 0 self-extractors/Android.mk
  24. +12 −0 self-extractors/PART1
  25. +22 −0 self-extractors/PART2
  26. +12 −0 self-extractors/PART3
  27. +2 −0 self-extractors/PROLOGUE
  28. +1 −0 self-extractors/broadcom/COPYRIGHT
  29. +218 −0 self-extractors/broadcom/LICENSE
  30. +13 −0 self-extractors/broadcom/staging/BoardConfigPartial.mk
  31. +17 −0 self-extractors/broadcom/staging/device-partial.mk
  32. +29 −0 self-extractors/broadcom/staging/proprietary/Android.mk
  33. +1 −0 self-extractors/csr/COPYRIGHT
  34. +1 −0 self-extractors/csr/LICENSE
  35. +13 −0 self-extractors/csr/staging/BoardConfigPartial.mk
  36. +18 −0 self-extractors/csr/staging/device-partial.mk
  37. +39 −0 self-extractors/csr/staging/proprietary/Android.mk
  38. +121 −0 self-extractors/generate-packages.sh
  39. +1 −0 self-extractors/imgtec/COPYRIGHT
  40. +218 −0 self-extractors/imgtec/LICENSE
  41. +13 −0 self-extractors/imgtec/staging/BoardConfigPartial.mk
  42. +29 −0 self-extractors/imgtec/staging/device-partial.mk
  43. +148 −0 self-extractors/imgtec/staging/proprietary/Android.mk
  44. +1 −0 self-extractors/invensense/COPYRIGHT
  45. +218 −0 self-extractors/invensense/LICENSE
  46. +13 −0 self-extractors/invensense/staging/BoardConfigPartial.mk
  47. +17 −0 self-extractors/invensense/staging/device-partial.mk
  48. +29 −0 self-extractors/invensense/staging/proprietary/Android.mk
  49. +1 −0 self-extractors/nxp/COPYRIGHT
  50. +218 −0 self-extractors/nxp/LICENSE
  51. +13 −0 self-extractors/nxp/staging/BoardConfigPartial.mk
  52. +17 −0 self-extractors/nxp/staging/device-partial.mk
  53. +29 −0 self-extractors/nxp/staging/proprietary/Android.mk
  54. +23 −0 self-extractors/root/BoardConfigVendor.mk
  55. +23 −0 self-extractors/root/device-vendor.mk
  56. +1 −0 self-extractors/samsung/COPYRIGHT
  57. +225 −0 self-extractors/samsung/LICENSE
  58. +13 −0 self-extractors/samsung/staging/BoardConfigPartial.mk
  59. +27 −0 self-extractors/samsung/staging/device-partial.mk
  60. +126 −0 self-extractors/samsung/staging/proprietary/Android.mk
  61. +1 −0 self-extractors/ti/COPYRIGHT
  62. +1 −0 self-extractors/ti/LICENSE
  63. +13 −0 self-extractors/ti/staging/BoardConfigPartial.mk
  64. +17 −0 self-extractors/ti/staging/device-partial.mk
  65. +29 −0 self-extractors/ti/staging/proprietary/Android.mk
  66. +6 −3 system.prop
  67. +181 −180 plus-apns-conf.xml → test-apns-conf_sprint.xml
  68. +17 −0 vendorsetup.sh
View
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011 The Android Open-Source Project
+# Copyright (C) 2011 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
View
@@ -12,16 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# Default values, possibly overridden by BoardConfigVendor.mk
+TARGET_BOARD_INFO_FILE := device/samsung/toroplus/board-info.txt
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/toroplus/bluetooth
+
# Use the non-open-source part, if present
-include vendor/samsung/toroplus/BoardConfigVendor.mk
-# Use the open-source board-info file if none was set by the vendor
-# config.
-TARGET_BOARD_INFO_FILE ?= device/samsung/toroplus/board-info.txt
-
# Use the part that is common between all tunas
include device/samsung/tuna/BoardConfig.mk
-# on toro boards we need to apply a special adaptive filter
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 30691799040
+
+# Use/add toroplus-specific variants
+TARGET_RECOVERY_UPDATER_LIBS += librecovery_updater_toroplus
+TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/toroplus
+
+# on toroplus boards we need to apply a special adaptive filter
# on the compass output because of noise generated by the pmic.
BOARD_INVENSENSE_APPLY_COMPASS_NOISE_FILTER := true
View
@@ -0,0 +1,52 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+$(call add-clean-step, rm -rf $(TARGET_OUT_VENDOR)/lib/libsecril-client.so)
+$(call add-clean-step, rm -rf $(TARGET_OUT_VENDOR)/lib/hw/gps.omap4.hspa.so)
+$(call add-clean-step, rm -rf $(TARGET_OUT_VENDOR)/etc/gps.sirfgps.hspa.conf)
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _BDROID_BUILDCFG_H
+#define _BDROID_BUILDCFG_H
+
+#define BTM_DEF_LOCAL_NAME "Galaxy NexusCDMA 2"
+
+#endif
View
@@ -1,5 +1 @@
require board=tuna
-require version-bootloader=PRIMEKK15|PRIMEKL01|PRIMESPH-L700EL01|PRIMESPH-L700.FC12|PRIMESPH-L700.FD01|PRIMESPH-L700.FD02
-require version-baseband=I515.EK02|I515.EK04|I515.EL01|L700.EL04|L700.FC12|L700.FD01|L700.FD02
-require version-cdma=I515.EK05|I515.EK06|I515.EK09|L700.EL04|L700.FC12|L700.FD01|L700.FD02
-
View
@@ -12,31 +12,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# This file includes all definitions that apply only to toroplus devices
+# This file includes all definitions that apply only to toroplus device
#
# Anything that is generic to all tuna products should go in the tuna directory
#
# Everything in this directory will become public
-# use toro device as base so in upgrades we will upgrade both at once
-$(call inherit-product, device/samsung/tuna/device.mk)
-
-# Telephony property for CDMA
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.cdma.home.operator.numeric=310120 \
- ro.cdma.home.operator.alpha=Sprint \
- ro.telephony.default_network=4
+DEVICE_PACKAGE_OVERLAYS += device/samsung/toroplus/overlay
-# Hardware-specific features
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml
+ device/samsung/toroplus/bcmdhd.cal:system/etc/wifi/bcmdhd.cal \
+ frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml
-# APNs for 3G network access
-PRODUCT_COPY_FILES += \
- device/samsung/toroplus/plus-apns-conf.xml:system/etc/apns-conf.xml
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.config.vc_call_vol_steps=7
-# Overlay for WiMAX-related settings
-DEVICE_PACKAGE_OVERLAYS += device/samsung/toroplus/overlay
+PRODUCT_PACKAGES := \
+ CellBroadcastReceiver
-# Add Toro spring specific device configuration
+$(call inherit-product, device/samsung/tuna/device.mk)
$(call inherit-product-if-exists, vendor/samsung/toroplus/device-vendor.mk)
View
@@ -14,26 +14,29 @@
#
# This file is the build configuration for a full Android
-# build for toro hardware. This cleanly combines a set of
+# build for toroplus hardware. This cleanly combines a set of
# device-specific aspects (drivers) with a device-agnostic
# product configuration (apps). Except for a few implementation
# details, it only fundamentally contains two inherit-product
-# lines, full and toro, hence its name.
+# lines, full and maguro, hence its name.
#
PRODUCT_PACKAGES := \
- Gallery \
GNexusParts
-#if we do this after the full_base_telephony is included some of these don't get picked up..
-PRODUCT_COPY_FILES += \
- device/samsung/toroplus/bcmdhd.cal:system/etc/wifi/bcmdhd.cal \
- device/samsung/toroplus/plus-apns-conf.xml:system/etc/apns-conf.xml \
- frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml
+# Get the long list of APNs
+PRODUCT_COPY_FILES += device/samsung/toroplus/test-apns-conf_sprint.xml:system/etc/apns-conf.xml
# Inherit from those products. Most specific first.
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
# This is where we'd set a backup provider if we had one
#$(call inherit-product, device/sample/products/backup_overlay.mk)
-# Inherit from toro device
+# Inherit from toroplus device
$(call inherit-product, device/samsung/toroplus/device.mk)
+
+# Set those variables here to overwrite the inherited values.
+#PRODUCT_NAME := full_toroplus
+#PRODUCT_DEVICE := toroplus
+#PRODUCT_BRAND := Android
+#PRODUCT_MODEL := Full AOSP on Toroplus
+#PRODUCT_RESTRICT_VENDOR_FILES := true
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
-** Copyright 2011, The Android Open Source Project
+** Copyright 2009, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -17,32 +17,12 @@
*/
-->
-<!-- Sojus - specific voice mail resources -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Do not translate. Defines the slots for the right-hand side icons. That is to say, the
- icons in the status bar that are not notifications. -->
- <string-array name="config_statusBarIcons">
- <item><xliff:g id="id">ime</xliff:g></item>
- <item><xliff:g id="id">sync_failing</xliff:g></item>
- <item><xliff:g id="id">sync_active</xliff:g></item>
- <item><xliff:g id="id">gps</xliff:g></item>
- <item><xliff:g id="id">bluetooth</xliff:g></item>
- <item><xliff:g id="id">nfc</xliff:g></item>
- <item><xliff:g id="id">tty</xliff:g></item>
- <item><xliff:g id="id">speakerphone</xliff:g></item>
- <item><xliff:g id="id">mute</xliff:g></item>
- <item><xliff:g id="id">volume</xliff:g></item>
- <item><xliff:g id="id">wifi</xliff:g></item>
- <item><xliff:g id="id">wimax</xliff:g></item>
- <item><xliff:g id="id">cdma_eri</xliff:g></item>
- <item><xliff:g id="id">data_connection</xliff:g></item>
- <item><xliff:g id="id">phone_evdo_signal</xliff:g></item>
- <item><xliff:g id="id">phone_signal</xliff:g></item>
- <item><xliff:g id="id">battery</xliff:g></item>
- <item><xliff:g id="id">alarm_clock</xliff:g></item>
- <item><xliff:g id="id">secure</xliff:g></item>
- <item><xliff:g id="id">clock</xliff:g></item>
- </string-array>
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+
+ <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
+ Please don't copy them, copy anything else. -->
<!-- This string array should be overridden by the device to present a list of network
attributes. This is used by the connectivity manager to decide which networks can coexist
@@ -62,14 +42,20 @@
<item>"mobile_hipri,5,0,3,60000,true"</item>
<item>"bluetooth,7,7,0,-1,true"</item>
<item>"ethernet,9,9,1,-1,true"</item>
- <item>"mobile_fota,10,0,2,60000,true"</item>
+ <item>"mobile_fota,10,0,2,180000,true"</item>
<item>"mobile_ims,11,0,2,-1,true"</item>
<item>"mobile_cbs,12,0,2,60000,true"</item>
</string-array>
- <!-- If this value is true, The mms content-disposition field is supported correctly.
- If false, Content-disposition fragments are ignored -->
- <bool name="config_mms_content_disposition_support">false</bool>
+ <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
+ <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
+ <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
+ <integer-array translatable="false" name="config_tether_upstream_types">
+ <item>0</item>
+ <item>1</item>
+ <item>4</item>
+ <item>7</item>
+ </integer-array>
<!-- If the DUN connection for this CDMA device supports more than just DUN -->
<!-- traffic you should list them here. -->
@@ -83,10 +69,29 @@
<item>"supl"</item>
</string-array>
- <!-- Set to true if the RSSI should always display CDMA signal
- strength even on EVDO -->
- <bool name="config_alwaysUseCdmaRssi">true</bool>
-
<!-- The VoiceMail default value is displayed to my own number if it is true -->
<bool name="config_telephony_use_own_number_for_voicemail">true</bool>
+ <!-- sms encoded as octet is decoded by utf8 decoder. if it is true -->
+ <bool name="config_sms_utf8_support">true</bool>
+
+ <!-- The mms content disposition field is supported correctly. if it is true
+ If false, some fields of content disposition do not follow wap-230-wsp-20010705-a.rdf -->
+ <bool name="config_mms_content_disposition_support">false</bool>
+
+ <!-- If this value is true, duplicate Source/Destination port fields
+ in WDP header of some carriers OMADM wap push are supported.
+ ex: MSGTYPE-TotalSegments-CurrentSegment
+ -SourcePortDestPort-SourcePortDestPort-OMADM PDU
+ If false, not supported. -->
+ <bool name="config_duplicate_port_omadm_wappush">true</bool>
+
+ <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
+ <bool name="config_cellBroadcastAppLinks">true</bool>
+
+ <!-- Default network policy warning threshold, in megabytes. -->
+ <integer name="config_networkPolicyDefaultWarning">51200</integer>
+
+ <!-- Set to true if the RSSI should always display CDMA signal strength -->
+ <bool name="config_alwaysUseCdmaRssi">true</bool>
+
</resources>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- /* //device/apps/common/assets/res/any/strings.xml
+/* //device/apps/common/assets/res/any/strings.xml
**
** Copyright 2006, The Android Open Source Project
**
@@ -21,8 +21,7 @@
<!-- CDMA Roaming Indicator Strings (non ERI)--> <skip />
<!-- Default roaming indicator text -->
- <string name="roamingText0">CDMA Roaming</string>
+ <string name="roamingText0">Digital Roaming</string>
<string name="roamingText1">Sprint</string>
- <string name="roamingText2">CDMA Roaming</string>
-
+ <string name="roamingText2">Digital Roaming</string>
</resources>
Oops, something went wrong. Retry.

0 comments on commit 28c7616

Please sign in to comment.