Copy and update jfltecan for jflteatt

Add routine for djrbliss's loki boot patcher (invisiblek/attn1)

12 files changed, 123 insertions, 17 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index daedb97..acbab10 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,10 +24,17 @@
 -include device/samsung/jf-common/BoardConfigCommon.mk
 
 # inherit from the proprietary version
--include vendor/samsung/jfltecan/BoardConfigVendor.mk
+-include vendor/samsung/jflteatt/BoardConfigVendor.mk
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := jfltecan
+TARGET_OTA_ASSERT_DEVICE := jflteatt
 
 # Kernel
-TARGET_KERNEL_CONFIG         := jf_can_defconfig
\ No newline at end of file
+TARGET_KERNEL_CONFIG         := jf_can_defconfig
+TARGET_KERNEL_VARIANT_CONFIG := cyanogen_jf_defconfig
+TARGET_KERNEL_SELINUX_CONFIG := jfselinux_defconfig
+
+# loki
+TARGET_RELEASETOOLS_EXTENSIONS := device/samsung/jflteatt 
+
+
diff --git a/README b/README
index efa1894..c701d3a 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Copyright 2012 - The CyanogenMod Project
 
-Device configuration for Samsung Galaxy S4 (Canadian Models - Bell).
+Device configuration for Samsung Galaxy S4 (AT&T Model).
 
 WORK IN PROGRESS. WILL EAT YOUR CAT.
diff --git a/cm.mk b/cm.mk
index 691fe4f..00d72fd 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,4 +1,4 @@
-$(call inherit-product, device/samsung/jfltecan/full_jfltecan.mk)
+$(call inherit-product, device/samsung/jflteatt/full_jflteatt.mk)
 
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/gsm.mk)
@@ -9,8 +9,8 @@ $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=jfltevl TARGET_DEVICE=jfltecan BUILD_FINGERPRINT="samsung/jfltevl/jfltecan:4.2.2/JDQ39/I337MVLUAMDJ:user/release-keys" PRIVATE_BUILD_DESC="jfltevl-user 4.2.2 JDQ39 I337MVLUAMDJ release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=jfltevl TARGET_DEVICE=jflteatt BUILD_FINGERPRINT="samsung/jflteuc/jflteatt:4.2.2/JDQ39/I337UCUAMDL:user/release-keys" PRIVATE_BUILD_DESC="jflteuc-user 4.2.2 JDQ39 I337UCUAMDL release-keys"
 
-PRODUCT_NAME := cm_jfltecan
-PRODUCT_DEVICE := jfltecan
+PRODUCT_NAME := cm_jflteatt
+PRODUCT_DEVICE := jflteatt
 
diff --git a/device.mk b/device.mk
index 892f56e..3c3e2b6 100644
--- a/device.mk
+++ b/device.mk
@@ -15,7 +15,7 @@
 #
 
 ## (2) Also get non-open-source specific aspects if available
-$(call inherit-product-if-exists, vendor/samsung/jfltecan/jfltecan-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/jflteatt/jflteatt-vendor.mk)
 
 ## common overlays
 DEVICE_PACKAGE_OVERLAYS += device/samsung/jf-common/overlay-gsm
diff --git a/extract-files.sh b/extract-files.sh
index 94acc50..8d50b03 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-export DEVICE=jfltecan
+export DEVICE=jflteatt
 export VENDOR=samsung
 ./../jf-common/extract-files.sh $@
diff --git a/full_jfltecan.mk b/full_jflteatt.mk
index afc123f..bc56160 100644
--- a/full_jfltecan.mk
+++ b/full_jflteatt.mk
@@ -24,12 +24,17 @@
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-# Inherit from jfltecan device
-$(call inherit-product, device/samsung/jfltecan/device.mk)
+# Inherit from jflteatt device
+$(call inherit-product, device/samsung/jflteatt/device.mk)
 
 # Set those variables here to overwrite the inherited values.
 PRODUCT_NAME := full_jfltevl
-PRODUCT_DEVICE := jfltecan
+PRODUCT_DEVICE := jflteatt
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
-PRODUCT_MODEL := SGH-I337M
+PRODUCT_MODEL := SGH-I337
+
+# loki
+PRODUCT_COPY_FILES += \
+    device/samsung/jflteatt/loki/loki.sh:system/bin/loki.sh \
+    device/samsung/jflteatt/loki/loki_patch:system/bin/loki_patch
diff --git a/loki/loki.sh b/loki/loki.sh
new file mode 100644
index 0000000..5479e02
--- /dev/null
+++ b/loki/loki.sh
@@ -0,0 +1,32 @@
+#!/sbin/sh
+#
+# This leverages the loki_patch utility created by djrbliss which allows us
+# to bypass the bootloader checks on jfltevzw and jflteatt
+# See here for more information on loki: https://github.com/djrbliss/loki
+#
+#
+# Run loki patch on boot images with certain bootloaders
+#
+# Valid:
+# Bootloader Version I337UCUAMDB (AT&T)
+# Bootloader Version I337UCUAMDL (AT&T)
+# Bootloader Version I545VRUAMDK (Verizon)
+
+cat /proc/cmdline|egrep -q '(bootloader=I337UCUAMDB)|(bootloader=I337UCUAMDL)|(bootloader=I545VRUAMDK)'
+if [ $? = 0 ];
+    then
+       cd /tmp
+       chmod 777 loki_patch
+       dd if=/dev/block/platform/msm_sdcc.1/by-name/aboot of=aboot.img
+       ./loki_patch boot aboot.img boot.img boot.lok
+        dd if=/tmp/boot.lok of=/dev/block/platform/msm_sdcc.1/by-name/boot
+
+# cleanup
+       rm /system/bin/loki.sh
+       rm /system/bin/loki_patch
+
+fi
+
+
+
+
diff --git a/loki/loki_patch b/loki/loki_patch
new file mode 100755
index 0000000..6d54e9d
--- /dev/null
+++ b/loki/loki_patch
diff --git a/overlay/packages/providers/TelephonyProvider/res/values/config.xml b/overlay/packages/providers/TelephonyProvider/res/values/config.xml
new file mode 100644
index 0000000..9f82f18
--- /dev/null
+++ b/overlay/packages/providers/TelephonyProvider/res/values/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The CyanogenMod 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- The preferred APN to use, in the format name,mcc,mnc
+         Leave empty to choose automatically. -->
+    <string name="config_preferred_apn">pta,310,410</string>
+</resources>
+
diff --git a/releasetools.py b/releasetools.py
new file mode 100644
index 0000000..c2892f4
--- /dev/null
+++ b/releasetools.py
@@ -0,0 +1,38 @@
+# Copyright (C) 2012 The Android Open Source Project
+# Copyright (C) 2013 The CyanogenMod 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.
+#
+#
+#
+# This leverages the loki_patch utility created by djrbliss which allows us
+# to bypass the bootloader checks on jfltevzw and jflteatt
+# See here for more information on loki: https://github.com/djrbliss/loki
+#
+
+"""Custom OTA commands for jf"""
+
+#import common
+#import os
+#import shutil
+
+def FullOTA_InstallEnd(info):
+  info.script.script = [cmd for cmd in info.script.script if not "boot.img" in cmd]
+  info.script.script = [cmd for cmd in info.script.script if not "show_progress(0.100000, 0);" in cmd] 
+  info.script.AppendExtra('package_extract_file("system/bin/loki.sh", "/tmp/loki.sh");')
+  info.script.AppendExtra('package_extract_file("system/bin/loki_patch", "/tmp/loki_patch");')
+  info.script.AppendExtra('package_extract_file("boot.img", "/tmp/boot.img");')
+  info.script.AppendExtra('set_perm(0, 0, 0777, "/tmp/loki.sh");')
+  info.script.AppendExtra('run_program("/tmp/loki.sh");')
+
+
diff --git a/system.prop b/system.prop
index 75ce826..3b7a085 100644
--- a/system.prop
+++ b/system.prop
@@ -1,4 +1,4 @@
-# system.prop for SGH-I337M
+# system.prop for SGH-I337
 #
 
 # cannot take spaces
@@ -8,4 +8,5 @@ rild.libargs=-d /dev/smd0
 # MAX PROP NAME is 31 chars --|
 ro.telephony.ril_class=SamsungQualcommUiccRIL
 telephony.lteOnGsmDevice=1
-ro.telephony.default_network=9
\ No newline at end of file
+ro.telephony.default_network=9
+
diff --git a/vendorsetup.sh b/vendorsetup.sh
index b28db43..f3caedc 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,2 +1,2 @@
-add_lunch_combo cm_jfltecan-eng
+add_lunch_combo cm_jflteatt-eng