diff options
-rw-r--r-- | camera/CameraWrapper.cpp | 1 | ||||
-rwxr-xr-x | cm.mk | 2 | ||||
-rwxr-xr-x | configs/bcmdhd.cal | 2 | ||||
-rw-r--r-- | configs/nvram_mfg.txt | 112 | ||||
-rw-r--r-- | configs/nvram_net.txt | 112 | ||||
-rwxr-xr-x | n7000.mk | 11 | ||||
-rw-r--r-- | overlay/packages/apps/Camera/res/values/config.xml | 8 | ||||
-rwxr-xr-x | overlay/packages/apps/Phone/res/values/config.xml | 2 | ||||
-rw-r--r-- | recovery.rc | 3 |
9 files changed, 14 insertions, 239 deletions
diff --git a/camera/CameraWrapper.cpp b/camera/CameraWrapper.cpp index 144b5d3..a605b08 100644 --- a/camera/CameraWrapper.cpp +++ b/camera/CameraWrapper.cpp @@ -125,7 +125,6 @@ char * camera_fixup_setparams(int id, const char * settings) if(params.get("cam_mode")) { const char* previewSize = params.get(android::CameraParameters::KEY_PREVIEW_SIZE); - params.set(android::CameraParameters::KEY_VIDEO_SIZE, previewSize); params.set(android::CameraParameters::KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO, previewSize); params.set(android::CameraParameters::KEY_SUPPORTED_VIDEO_SIZES, video_preview_sizes[id]); } @@ -17,5 +17,5 @@ PRODUCT_BRAND := Samsung PRODUCT_MODEL := GT-N7000
#Set build fingerprint / ID / Prduct Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-N7000 BUILD_FINGERPRINT=samsung/GT-N7000/GT-N7000:4.0.3/IML74K/ZCLP6:user/release-keys PRIVATE_BUILD_DESC="GT-N7000-user 4.0.3 IML74K ZCLP6 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-N7000 TARGET_DEVICE=GT-N7000 BUILD_FINGERPRINT=samsung/GT-N7000/GT-N7000:4.0.3/IML74K/ZCLP6:user/release-keys PRIVATE_BUILD_DESC="GT-N7000-user 4.0.3 IML74K ZCLP6 release-keys"
diff --git a/configs/bcmdhd.cal b/configs/bcmdhd.cal index a820b83..105088f 100755 --- a/configs/bcmdhd.cal +++ b/configs/bcmdhd.cal @@ -15,7 +15,7 @@ ag0=252 ag1=252 aa2g=1 aa5g=1 -ccode=GB +ccode=ALL #for BT-coexistence btc_params80=0 diff --git a/configs/nvram_mfg.txt b/configs/nvram_mfg.txt deleted file mode 100644 index 5311632..0000000 --- a/configs/nvram_mfg.txt +++ /dev/null @@ -1,112 +0,0 @@ -manfid=0x2d0
-prodid=0x0532
-vendid=0x14e4
-devid=0x4360
-boardtype=0x0532
-boardrev=0x20
-boardflags=0x10080201
-
-nocrc=1
-xtalfreq=37400
-xtalmode=0x20,0x4,0
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-ag0=255
-ag1=255
-aa2g=1
-ccode=ALL
-
-btc_params80=0
-btc_params6=10
-btc_params8=10000
-
-sd_gpout=0
-sd_oobonly=1
-
-# 2G PA para B42G_R08_110729
-pa0b0=0x14CF
-pa0b1=0xFD9F
-pa0b2=0xFF6D
-#pa0itssit=62
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-
-# rssi params for 5GHz B42G_R08_110729
-#rssismf5g=0x4
-rssismf5g=0xa
-rssismc5g=0x7
-rssisav5g=0x1
-#PA parameters for lower band
-pa1lob0=5907
-pa1lob1=64797
-pa1lob2=65324
-#PA parameters for midband
-pa1b0=6071
-pa1b1=64780
-pa1b2=65325
-#PA parameters for high band
-pa1hib0=6015
-pa1hib1=64782
-pa1hib2=65321
-
-# 2G PA offset B42G_R08_110825
-maxp2ga0=76
-sromrev=3
-cckpo=0
-ofdm2gpo=0x66666666
-mcs2gpo0=0x8888
-mcs2gpo1=0x8888
-
-# 5G PA offset B42G_R08_110825
-maxp5ga0=66
-maxp5gla0=66
-maxp5gha0=66
-ofdm5gpo=0x00000000
-ofdm5glpo=0x11111111
-ofdm5ghpo=0x11111111
-mcs5gpo0=0x2222
-mcs5gpo1=0x2222
-mcs5glpo0=0x3333
-mcs5glpo1=0x3333
-mcs5ghpo0=0x3333
-mcs5ghpo1=0x3333
-
-cckPwrOffset=4
-cckdigfilttype=21
-ofdmdigfilttype=2
-extpagain5g=2
-#wl0id=0x431b
-
-# For 2GHz Tx EVM/SM
-rfreg033=0x19
-rfreg033_cck=0x1f
-pacalidx2g=65
-dacrate2g=160
-txalpfbyp2g=1
-bphyscale=17
-
-#5GHz LOFT and IQ CAL
-txgaintbl5g=1
-txiqlopapu5g=1
-txiqlopag5g=0x10
-iqlocalidx5g=24
-
-# 5GHz Noise CAL parameter
-noise_cal_po_5g=5
-noise_cal_enable_5g=0
-
-# 2GHz RxPER at low rates
-noise_cal_ref_2g=56
-noise_cal_po_bias_2g=-4
-noise_cal_enable_2g=1
-
-# Max input level on a-band
-triso5g=1
-
-# Tx power control, especially temp.
-tssitime=1
-
-swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff
-swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8
-
diff --git a/configs/nvram_net.txt b/configs/nvram_net.txt deleted file mode 100644 index c1d5a9b..0000000 --- a/configs/nvram_net.txt +++ /dev/null @@ -1,112 +0,0 @@ -manfid=0x2d0
-prodid=0x0532
-vendid=0x14e4
-devid=0x4360
-boardtype=0x0532
-boardrev=0x20
-boardflags=0x10080201
-
-nocrc=1
-xtalfreq=37400
-xtalmode=0x20,0x4,0
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-ag0=252
-ag1=255
-aa2g=1
-ccode=GB
-
-btc_params80=0
-btc_params6=10
-btc_params8=10000
-
-sd_gpout=0
-sd_oobonly=1
-
-# 2G PA para B42G_R08_110729
-pa0b0=0x14CF
-pa0b1=0xFD9F
-pa0b2=0xFF6D
-#pa0itssit=62
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-
-# rssi params for 5GHz B42G_R08_110729
-#rssismf5g=0x4
-rssismf5g=0xa
-rssismc5g=0x7
-rssisav5g=0x1
-#PA parameters for lower band
-pa1lob0=5907
-pa1lob1=64797
-pa1lob2=65324
-#PA parameters for midband
-pa1b0=6071
-pa1b1=64780
-pa1b2=65325
-#PA parameters for high band
-pa1hib0=6015
-pa1hib1=64782
-pa1hib2=65321
-
-# 2G PA offset B42G_R08_110825
-maxp2ga0=80
-sromrev=3
-cckpo=0
-ofdm2gpo=0x66666666
-mcs2gpo0=0x8888
-mcs2gpo1=0x8888
-
-# 5G PA offset B42G_R08_110825
-maxp5ga0=66
-maxp5gla0=66
-maxp5gha0=66
-ofdm5gpo=0x00000000
-ofdm5glpo=0x11111111
-ofdm5ghpo=0x11111111
-mcs5gpo0=0x2222
-mcs5gpo1=0x2222
-mcs5glpo0=0x3333
-mcs5glpo1=0x3333
-mcs5ghpo0=0x3333
-mcs5ghpo1=0x3333
-
-cckPwrOffset=4
-cckdigfilttype=21
-ofdmdigfilttype=2
-extpagain5g=2
-#wl0id=0x431b
-
-# For 2GHz Tx EVM/SM
-rfreg033=0x19
-rfreg033_cck=0x1f
-pacalidx2g=65
-dacrate2g=160
-txalpfbyp2g=1
-bphyscale=17
-
-#5GHz LOFT and IQ CAL
-txgaintbl5g=1
-txiqlopapu5g=1
-txiqlopag5g=0x10
-iqlocalidx5g=24
-
-# 5GHz Noise CAL parameter
-noise_cal_po_5g=5
-noise_cal_enable_5g=0
-
-# 2GHz RxPER at low rates
-noise_cal_ref_2g=56
-noise_cal_po_bias_2g=-4
-noise_cal_enable_2g=1
-
-# Max input level on a-band
-triso5g=1
-
-# Tx power control, especially temp.
-tssitime=1
-
-swctrlmap_2g=0x84048404, 0x82028202, 0x84048404, 0x010202, 0x1ff
-swctrlmap_5g=0xC040C040, 0xB030A020, 0xA020C040, 0x010A02, 0x2F8
-
@@ -20,7 +20,7 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi PRODUCT_LOCALES += xhdpi #Bootanimation -TARGET_BOOTANIMATION_NAME := vertical-720x1280 +TARGET_BOOTANIMATION_NAME := vertical-800x1280 # Init files PRODUCT_COPY_FILES := \ @@ -42,8 +42,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Wifi PRODUCT_COPY_FILES += \ - device/samsung/n7000/configs/nvram_net.txt:system/etc/nvram_net.txt \ - device/samsung/n7000/configs/nvram_mfg.txt:system/etc/nvram_mfg.txt \ device/samsung/n7000/configs/bcmdhd.cal:system/etc/wifi/bcmdhd.cal PRODUCT_PROPERTY_OVERRIDES += \ @@ -68,7 +66,6 @@ PRODUCT_PACKAGES := \ PRODUCT_PACKAGES += \ lights.exynos4 \ libhwconverter \ - libswconverter \ libs5pjpeg \ libfimg @@ -83,7 +80,7 @@ PRODUCT_PACKAGES += \ # OMX PRODUCT_PACKAGES += \ libstagefrighthw \ - libcsc \ + libseccscapi \ libsecbasecomponent \ libsecosal \ libSEC_OMX_Resourcemanager \ @@ -210,7 +207,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ $(call inherit-product, frameworks/base/build/phone-xhdpi-1024-dalvik-heap.mk) # Include exynos4 platform specific parts -$(call inherit-product, hardware/samsung/exynos4/Android.mk) +TARGET_HAL_PATH := hardware/samsung/exynos4/hal +TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax +$(call inherit-product, hardware/samsung/exynos4210.mk) $(call inherit-product-if-exists, vendor/samsung/n7000/n7000-vendor.mk) $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk) diff --git a/overlay/packages/apps/Camera/res/values/config.xml b/overlay/packages/apps/Camera/res/values/config.xml index 65687b6..472a0b2 100644 --- a/overlay/packages/apps/Camera/res/values/config.xml +++ b/overlay/packages/apps/Camera/res/values/config.xml @@ -18,6 +18,10 @@ --> <resources> - <!-- Samsung Camcorder Mode --> - <bool name="needsSamsungCamMode">true</bool> + <!-- Allows setting video size before recording starts --> + <bool name="needsEarlyVideoSize">true</bool> + <!-- Samsung Camcorder Mode --> + <bool name="needsSamsungCamMode">true</bool> + <!-- Samsung Camera Settings --> + <bool name="hasSamsungCamSettings">true</bool> </resources> diff --git a/overlay/packages/apps/Phone/res/values/config.xml b/overlay/packages/apps/Phone/res/values/config.xml index 29e3b62..00f2f7b 100755 --- a/overlay/packages/apps/Phone/res/values/config.xml +++ b/overlay/packages/apps/Phone/res/values/config.xml @@ -18,6 +18,6 @@ <resources> <!-- Flag indicating if the tty is enabled --> - <bool name="tty_enabled">true</bool> + <bool name="tty_enabled">false</bool> </resources> diff --git a/recovery.rc b/recovery.rc index 225f87e..53a0b2f 100644 --- a/recovery.rc +++ b/recovery.rc @@ -18,9 +18,6 @@ on init mkdir /preload mount /tmp /tmp tmpfs -on fs - mount ext4 /dev/block/mmcblk0p9 /system - on boot # Permissions for mDNIe |