From 727abbebe3776e347af1b9b6fcf55668f2895a2f Mon Sep 17 00:00:00 2001
From: Marco Brohet <marco@brohet.net>
Date: Wed, 17 Aug 2016 15:35:09 +0700
Subject: apns: Update hollandsnieuwe's (NL) APN

Some time ago, hollandsnieuwe issued new SIM cards, which should
be associated with a different APN. This patch makes sure that we
support both the old and new ones.

Patch set 2: Add username and password (credits to Louis Matthijssen)

Change-Id: I21d0060825bc126b40990789c7552d6a3f0f6e43
---
 prebuilt/common/etc/apns-conf.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 4c32e43..ed65537 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -64,12 +64,12 @@
   <apn carrier="EHRPD - VZW Roaming IMS" mcc="204" mnc="04" apn="VZWIMS" type="ims,ia" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer_bitmask="13" mvno_type="gid" mvno_match_data="BAE0000000000000" profile_id="2" modem_cognitive="true" max_conns="1023" max_conns_time="300" />
   <apn carrier="LTE - VZW Roaming CBS" mcc="204" mnc="04" apn="VZWAPP" type="cbs,mms" mmsc="http://mms.vzwreseller.com/servlets/mms" protocol="IPV4V6" roaming_protocol="IPV4V6" mvno_type="gid" mvno_match_data="BAE0000000000000" profile_id="4" modem_cognitive="true" max_conns="1023" max_conns_time="300" />
   <apn carrier="EHRPD - VZW Roaming CBS" mcc="204" mnc="04" apn="VZWAPP" type="cbs,mms" mmsc="http://mms.vzwreseller.com/servlets/mms" protocol="IPV4V6" roaming_protocol="IPV4V6" bearer_bitmask="13" mvno_type="gid" mvno_match_data="BAE0000000000000" profile_id="4" modem_cognitive="true" max_conns="1023" max_conns_time="300" />
-  <apn carrier="hollandsnieuwe int." mcc="204" mnc="04" apn="data.dataxs.mobi" type="default,supl" />
   <apn carrier="Vodafone MMS Business" mcc="204" mnc="04" apn="office.vodafone.nl" user="vodafone" password="vodafone" mmsc="http://mmsc.mms.vodafone.nl" mmsproxy="192.168.251.150" mmsport="8799" type="mms" />
   <apn carrier="中国电信NET设置" mcc="204" mnc="04" apn="ctnet" user="ctnet@mycdma.cn" password="vnet.mobi" authtype="3" type="default,supl,dun" />
   <apn carrier="中国电信WAP设置" mcc="204" mnc="04" apn="ctwap" user="ctwap@mycdma.cn" password="vnet.mobi" proxy="10.0.0.200" port="80" mmsproxy="10.0.0.200" mmsport="80" mmsc="http://mmsc.vnet.mobi" authtype="3" type="default,supl,dun,mms" />
   <apn carrier="Ziggo Mobiel" mcc="204" mnc="04" apn="ziggo.dataxs.mobi" authtype="1" type="default,supl" />
-  <apn carrier="Hollandsnieuwe" mcc="204" mnc="04" apn="data.dataxs.mobi" proxy="" port="" user="" password="" mmsc="" authtype="1" type="default,supl" />
+  <apn carrier="hollandsnieuwe (type 1)" mcc="204" mnc="04" apn="data.dataxs.mobi" proxy="" port="" user="hollandsnieuwe" password="hollandsnieuwe" mmsc="" authtype="1" type="default,supl" />
+  <apn carrier="hollandsnieuwe (type 2)" mcc="204" mnc="04" apn="live.vodafone.com" user="vodafone" password="vodafone" authtype="1" type="default,supl" />
   <apn carrier="Truphone" mcc="204" mnc="04" apn="truphone.com" type="default,dun" mvno_match_data="204043914" mvno_type="imsi" />
   <apn carrier="Truphone" mcc="204" mnc="04" apn="truphone.com" type="default,dun" mvno_match_data="20404794" mvno_type="imsi" />
   <apn carrier="KPN 4G LTE" mcc="204" mnc="08" apn="KPN4G.nl" mmsc="http://mp.mobiel.kpn/mmsc" mmsproxy="10.10.100.20" mmsport="5080" type="default,supl,mms" />
-- 
cgit v1.1


From 35aa4577ac8d7eedb76723dd87213dcf253a5656 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 23 Dec 2016 18:35:25 +0800
Subject: cm: common: Remove Launcher3 makefile entry

We no longer sync Launcher3. This entry never did anything anyway,
since we build Trebuchet instead, which overrides Launcher3.

Change-Id: Ia2c56c9f819025ba34cbff1daf8d3380a924a8a5
---
 config/common.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/common.mk b/config/common.mk
index 23185f4..1cd245a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -150,7 +150,6 @@ PRODUCT_PACKAGES += \
 
 # Custom CM packages
 PRODUCT_PACKAGES += \
-    Launcher3 \
     Trebuchet \
     AudioFX \
     CMWallpapers \
-- 
cgit v1.1


From 7f06bc78a903a2a19dc4fb35778a8d8a0dd2391d Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 23 Dec 2016 20:33:07 +0800
Subject: cm: Remove def_notif_count overlay

This overlay is no longer used.

Change-Id: I226d989396a4fb74736f5c78eb4b38eaa8febba5
---
 .../frameworks/base/packages/SettingsProvider/res/values/defaults.xml  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index cafca3c..4514a53 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,7 +18,4 @@
 -->
 <resources>
     <string name="def_backup_transport">com.google.android.gms/.backup.BackupTransportService</string>
-
-    <!-- Enable notification counters in statusbar -->
-    <integer name="def_notif_count">1</integer>
 </resources>
-- 
cgit v1.1


From e9bf91052812e2e66fb94318fdf58b4bd8adfe93 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Tue, 27 Dec 2016 15:12:38 +0800
Subject: cm: Rebrand to LineageOS

Change-Id: Icf53ce2b98306498cfa815e9fc7377e9a6c583a6
---
 CHANGELOG.mkdn                                         |  6 +++---
 CONTRIBUTORS.mkdn                                      |  4 ++--
 LICENSE                                                |  1 +
 README.mkdn                                            | 18 +++++++++---------
 build/core/apicheck_msg_current.txt                    |  4 ++--
 .../frameworks/base/core/res/res/values/config.xml     |  3 ++-
 prebuilt/common/bin/50-cm.sh                           |  2 +-
 prebuilt/common/etc/init.d/00banner                    | 11 +++++++----
 vendorsetup.sh                                         |  2 +-
 9 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index e4e2ae8..872a806 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -1,9 +1,9 @@
-CyanogenMod
+LineageOS
 ===============
 
-Visit http://github.com/CyanogenMod for full source and git access.
+Visit http://github.com/LineageOS for full source and git access.
 
-Visit http://review.cyanogenmod.org for our Gerrit instance.
+Visit http://review.lineageos.org for our Gerrit instance.
 
 CHANGELOG (notable new features)
 ---------
diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 7bb5a61..2c67d5a 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -1,7 +1,7 @@
-CyanogenMod
+LineageOS
 ===========
 
-Maintainers (CyanogenMod 13.0):
+Maintainers (LineageOS 13.0):
 -----------------------------
 * __Acer A700:__ pawitp
 * __Alcatel Idol 3:__ c457
diff --git a/LICENSE b/LICENSE
index 69f49a5..cdec959 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
    Copyright 2011-15 The CyanogenMod Project
+             2017    The LineageOS Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.mkdn b/README.mkdn
index 7f265ce..6edadab 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -1,9 +1,9 @@
-CyanogenMod
+LineageOS
 ===========
 
 Submitting Patches
 ------------------
-Patches are always welcome!  Please submit your patches via CyanogenMod Gerrit!
+Patches are always welcome!  Please submit your patches via LineageOS Gerrit!
 You can do this by using these commands:
 
     (From root android directory)
@@ -20,31 +20,31 @@ For more help on using this tool, use this command: repo help upload
 Make your changes and commit with a detailed message, starting with what you are working with (i.e. vision: Update Kernel)
 Commit your patches in a single commit. Squash multiple commit using this command: git rebase -i HEAD~<# of commits>
 
-To view the status of your and others' patches, visit [CyanogenMod Code Review](http://review.cyanogenmod.org/)
+To view the status of your and others' patches, visit [LineageOS Code Review](http://review.lineageos.org/)
 
 
 Getting Started
 ---------------
 
-To get started with Android/CyanogenMod, you'll need to get
+To get started with Android/LineageOS, you'll need to get
 familiar with [Repo](https://source.android.com/source/using-repo.html) and [Version Control with Git](https://source.android.com/source/version-control.html).
 
-To initialize your local repository using the CyanogenMod trees, use a command like this:
+To initialize your local repository using the LineageOS trees, use a command like this:
 
-    repo init -u git://github.com/CyanogenMod/android.git -b cm-13.0
+    repo init -u git://github.com/LineageOS/android.git -b cm-13.0
 
 Then to sync up:
 
     repo sync
 
-Please see the [CyanogenMod Wiki](http://wiki.cyanogenmod.org/) for building instructions, by device.
+Please see the [LineageOS Wiki](http://wiki.lineageos.org/) for building instructions, by device.
 
 For more information on this Github Organization and how it is structured, 
-please [read the wiki article](http://wiki.cyanogenmod.org/w/Github_Organization)
+please [read the wiki article](http://wiki.lineageos.org/w/Github_Organization)
 
 Buildbot
 --------
 
 All supported devices are built nightly and periodically as changes are committed to ensure the source trees remain buildable.
 
-You can view the current build statuses in the [Jenkins](http://jenkins.cyanogenmod.org) tool.
+You can view the current build statuses in the [Jenkins](http://jenkins.lineageos.org) tool.
diff --git a/build/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt
index 05a0341..6881b3f 100644
--- a/build/core/apicheck_msg_current.txt
+++ b/build/core/apicheck_msg_current.txt
@@ -4,7 +4,7 @@ You have tried to change the API from what has been previously approved.
 
 STOP.
   Read this:
-  https://github.com/CyanogenMod/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
+  https://github.com/LineageOS/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
 
 To make these errors go away, you have two choices:
    1) You can add "@hide" javadoc comments to the methods, etc. listed in the
@@ -142,6 +142,6 @@ To make these errors go away, you have two choices:
                                       ,;+++++++++++++++++++++++++++++++++++++++++++++++++++++++:.
                                                 ..,;;+++++++++++++++++++++++++++++;:,.
 
-      To submit the revised current.txt to the main CyanogenMod repository,
+      To submit the revised current.txt to the main LineageOS repository,
       you will need approval.
 ******************************
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 403890e..cdbfec2 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -41,7 +42,7 @@
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
     </string-array>
 
-    <string name="config_mms_user_agent">CyanogenMod</string>
+    <string name="config_mms_user_agent">LineageOS</string>
     <string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
 
     <!-- Defines the default set of global actions. Actions may still be disabled or hidden based
diff --git a/prebuilt/common/bin/50-cm.sh b/prebuilt/common/bin/50-cm.sh
index c8b81cb..7eac06f 100755
--- a/prebuilt/common/bin/50-cm.sh
+++ b/prebuilt/common/bin/50-cm.sh
@@ -1,7 +1,7 @@
 #!/sbin/sh
 # 
 # /system/addon.d/50-cm.sh
-# During a CM13.0 upgrade, this script backs up /system/etc/hosts,
+# During a LineageOS 13.0 upgrade, this script backs up /system/etc/hosts,
 # /system is formatted and reinstalled, then the file is restored.
 #
 
diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner
index a04ef18..ece3d1f 100644
--- a/prebuilt/common/etc/init.d/00banner
+++ b/prebuilt/common/etc/init.d/00banner
@@ -4,7 +4,10 @@
 #
 L="log -p i -t cm"
 
-$L "____ _   _ ____ _  _ ____ ____ ____ _  _ _  _ ____ ___";
-$L "|     \\_/  |__| |\\ | |  | | __ |___ |\\ | |\\/| |  | |  \\";
-$L "|___   |   |  | | \\| |__| |__] |___ | \\| |  | |__| |__/";
-$L "Welcome to Android `getprop ro.build.version.release` / CyanogenMod-`getprop ro.cm.version`";
+$L "_ _                                       "
+$L "| (_)_ __   ___  __ _  __ _  ___  ___  ___ "
+$L "| | | '_ \\ / _ \\/ _\` |/ _\` |/ _ \\/ _ \\/ __|"
+$L "| | | | | |  __/ (_| | (_| |  __/ (_) \\__ \\"
+$L "|_|_|_| |_|\\___|\\__,_|\\__, |\\___|\\___/|___/"
+$L "                      |___/"
+$L "Welcome to Android `getprop ro.build.version.release` / LineageOS-`getprop ro.cm.version`";
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 642da70..08482e5 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,4 +1,4 @@
-for combo in $(curl -s https://raw.githubusercontent.com/CyanogenMod/hudson/master/cm-build-targets | sed -e 's/#.*$//' | grep cm-13.0 | awk '{printf "cm_%s-%s\n", $1, $2}')
+for combo in $(curl -s https://raw.githubusercontent.com/LineageOS/hudson/master/cm-build-targets | sed -e 's/#.*$//' | grep cm-13.0 | awk '{printf "cm_%s-%s\n", $1, $2}')
 do
     add_lunch_combo $combo
 done
-- 
cgit v1.1


From 33083a89c09c988e26bbb85e62f220669a6569ff Mon Sep 17 00:00:00 2001
From: Chau Truong Thinh <chautruongthinh@gmail.com>
Date: Wed, 16 Nov 2016 13:40:31 +0700
Subject: Clean up 3G config for Vietnamese network

Change-Id: Iab208827af814ccc3b41de849035bfd71ef9a806
(cherry picked from commit 5cec3974ab8b23190c500bf34f099535bdce04fb)
---
 prebuilt/common/etc/apns-conf.xml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index ed65537..3baa4cf 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -2999,27 +2999,16 @@
   <apn carrier="SKT 3G INTERNET" mcc="450" mnc="11" apn="web.sktelecom.com" type="default,mms,supl,fota,cbs" mmsc="http://omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" server="*" />
   <apn carrier="SKT LTE Roaming" mcc="450" mnc="11" apn="lte-roaming.sktelecom.com" mmsc="http://omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" server="*" />
   <apn carrier="SKT 3G Roaming" mcc="450" mnc="11" apn="roaming.sktelecom.com" mmsc="http://omms.nate.com:9082/oma_mms" mmsproxy="smart.nate.com" mmsport="9093" server="*" />
-  <apn carrier="Mobifone GPRS" mcc="452" mnc="01" apn="m-wap" user="mms" password="mms" authtype="1" type="default,supl" />
+  <apn carrier="Mobifone 3G" mcc="452" mnc="01" apn="m-wap" user="mms" password="mms" authtype="1" type="default,supl" />
   <apn carrier="Mobifone MMS" mcc="452" mnc="01" apn="m-i090" proxy="" port="" mmsproxy="203.162.21.114" mmsport="8080" mmsc="http://203.162.21.114/mmsc" user="mms" password="mms" authtype="1" type="mms" />
-  <apn carrier="Vinaphone GPRS" mcc="452" mnc="02" apn="v-internet" type="default,supl" />
-  <apn carrier="Vinaphone MMS" mcc="452" mnc="02" apn="m3-mms" proxy="" port="" mmsproxy="10.1.10.46" mmsport="8000" mmsc="http://mms.vinaphone.com.vn" type="mms" />
   <apn carrier="Vinaphone MMS" mcc="452" mnc="02" apn="m3-mms" user="mms" password="mms" mmsc="http://mms.vinaphone.vnn.vn:8002" mmsproxy="10.1.10.46" mmsport="9201" type="mms" />
-  <apn carrier="Vinaphone" mcc="452" mnc="02" apn="m3-world" user="mms" password="mms" type="default,supl" />
-  <apn carrier="Viettel WAP" mcc="452" mnc="04" apn="v-wap" proxy="192.168.233.10" port="8080" mmsc="" user="" password="" type="default,supl" />
-  <apn carrier="Viettel MMS" mcc="452" mnc="04" apn="v-mms" proxy="" port="" mmsproxy="192.168.233.10" mmsport="8080" mmsc="http://mms.viettelmobile.com.vn/mms/wapenc" user="" password="" type="mms" />
+  <apn carrier="Vinaphone 3G" mcc="452" mnc="02" apn="m3-world" user="mms" password="mms" type="default,supl" />
   <apn carrier="Viettel 3G" mcc="452" mnc="04" apn="v-internet" type="default,supl" />
-  <apn carrier="Viettel" mcc="452" mnc="04" apn="v-internet" type="default,supl" />
   <apn carrier="Viettel MMS" mcc="452" mnc="04" apn="v-mms" mmsc="http://mms.viettelmobile.com.vn/mms" mmsproxy="192.168.233.10" mmsport="9201" type="mms" />
-  <apn carrier="Vietnamobile GPRS" mcc="452" mnc="05" apn="internet" type="default,supl" />
+  <apn carrier="Vietnamobile 3G" mcc="452" mnc="05" apn="internet" type="default,supl" />
   <apn carrier="Vietnamobile MMS" mcc="452" mnc="05" apn="mms" proxy="" port="" mmsproxy="10.10.128.44" mmsport="8080" mmsc="http://10.10.128.58/servlets/mms" type="mms" />
-  <apn carrier="VIETNAMOBILE" mcc="452" mnc="05" apn="wap" proxy="10.10.128.44" port="8080" type="default,supl" />
-  <apn carrier="Beeline GPRS" mcc="452" mnc="07" apn="internet" type="default,supl" />
-  <apn carrier="Beeline MMS" mcc="452" mnc="07" apn="mms" proxy="" port="" mmsproxy="10.16.70.199" mmsport="8080" mmsc="http://mms" user="mms" password="mms" authtype="1" type="mms" />
-  <apn carrier="BeeLine VN" mcc="452" mnc="07" apn="internet" type="default,supl" />
+  <apn carrier="BeeLine VN 3G" mcc="452" mnc="07" apn="internet" type="default,supl" />
   <apn carrier="Beeline VN MMS" mcc="452" mnc="07" apn="MMS" user="mms" password="mms" mmsc="http://mms" mmsproxy="10.16.70.199" mmsport="8080" type="mms" />
-  <apn carrier="VIETNAMOBILE MMS" mcc="452" mnc="05" apn="mms" proxy="" port="" user="" password="" mmsc="http://10.10.128.58/servlets/mms" mmsproxy="10.10.128.44" mmsport="8080" type="mms" />
-  <apn carrier="VIETNAMOBILE" mcc="452" mnc="05" apn="wap" proxy="10.10.128.44" port="8080" user="" password="" mmsc="" type="default,supl" />
-  <apn carrier="Beeline VN MMS" mcc="452" mnc="07" apn="MMS" proxy="" port="" user="mms" password="mms" mmsc="http://mms" mmsproxy="10.16.70.199" mmsport="8080" type="mms" />
   <apn carrier="csl" mcc="454" mnc="00" apn="mobile" mmsc="http://192.168.58.171:8002" mmsproxy="192.168.59.51" mmsport="8080" type="default,mms,hipri" authtype="3" mvno_match_data="01020000" mvno_type="gid" />
   <apn carrier="csl Tethering" mcc="454" mnc="00" apn="lte.internet" type="dun" mvno_match_data="01020000" mvno_type="gid" />
   <apn carrier="csl" mcc="454" mnc="00" apn="mobile" mmsc="http://192.168.58.171:8002" mmsproxy="192.168.59.51" mmsport="8080" authtype="3" type="default,mms,hipri" />
-- 
cgit v1.1


From c50bcd724d0dff33d4a200e3db4c8c1aa79b9452 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Tue, 27 Dec 2016 17:02:13 +0800
Subject: cm: Switch to LineageOS privacy policy

Change-Id: I883961b172dd832d7bcc3dca8151f6b7c4c36ad3
---
 config/common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/common.mk b/config/common.mk
index 1cd245a..de94b82 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -339,7 +339,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
   ro.cm.version=$(CM_VERSION) \
   ro.cm.releasetype=$(CM_BUILDTYPE) \
   ro.modversion=$(CM_VERSION) \
-  ro.cmlegal.url=https://cyngn.com/legal/privacy-policy
+  ro.cmlegal.url=https://lineageos.org/legal
 
 -include vendor/cm-priv/keys/keys.mk
 
-- 
cgit v1.1


From 7429d144fa3f409cf8e9a26d34e2d249087d0379 Mon Sep 17 00:00:00 2001
From: Ilya Lebedev <ashuli2003@gmail.com>
Date: Sat, 17 Dec 2016 16:04:26 +0300
Subject: Contributors: Add maintainer for ARK Benefit A3 (peach)

Change-Id: I3ca16eeec0fd30150f2ca7277151135e42ec291a
(cherry picked from commit 06773b94fb2e6e94d72836b567b79d3e81068bf0)
---
 CONTRIBUTORS.mkdn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 2c67d5a..646c8a6 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -7,6 +7,7 @@ Maintainers (LineageOS 13.0):
 * __Alcatel Idol 3:__ c457
 * __Amazon Kindle Fire 1st Edition:__ Hashcode, FuZZ__
 * __Amazon Kindle Fire 2nd Edition:__ Hashcode, FuZZ__
+* __ARK Benefit A3 (peach):__ lolmaxlik
 * __Asus EeePad Transformer (TF101):__ Bumble-Bee, EnJens
 * __Asus EeePad Transformer Prime (TF201):__ Bumble-Bee, EnJens
 * __Asus EeePad Transformer Pad TF300T:__  chrmhoffmann
-- 
cgit v1.1


From 31a6dd50939041c88e9e5d01022eef067f567e0c Mon Sep 17 00:00:00 2001
From: Erwan Leboucher <erwanleboucher@gmail.com>
Date: Tue, 5 Apr 2016 05:59:13 -0700
Subject: Revert "contributors: add LG V10"

I do not own the device anymore.

This reverts commit 3f9f7a6b3db424c85d512c8edc445236ff6fa3b0.

Change-Id: I3a6e64d78e844cb1bbb7eeb5af75f48fbe516e5a
---
 CONTRIBUTORS.mkdn | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 646c8a6..d35f3ea 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -76,7 +76,6 @@ Maintainers (LineageOS 13.0):
 * __LG Optimus L90:__ Quarx2k, vm03, NikitaProAndroid
 * __LG Optimus LTE (P930) / LG Nitro HD {P935):__ arcee
 * __LG Optimus LTE (SK Telecom) (SU640):__ arcee
-* __LG V10 (T-Mobile) (H901):__ genesixxbf3
 * __Moto E 2014 (xt1021,xt1022,xt1023/condor):__
 * __Moto G 2014 (xt1063,xt1064,xt1068,xt1069/titan):__ LuK1337, luca020400
 * __Moto G 4G (xt1039,xt1040,xt1042,xt1045/peregrine):__ somcom3x, intervigil
-- 
cgit v1.1


From 7e822d2b0c014c607efa27085a5120220bf867f8 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 30 Dec 2016 16:17:57 +0800
Subject: cm: Remove root access prop

This property is already defaulted to 0 in the code.
The su_daemon is also disabled by default.

Thus, for all intents and purposes, root access is
already being disabled by default.

Change-Id: I1241689c0d3253aa2e44835c55839f24b3b74341
---
 config/common.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index de94b82..ca7aaef 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -250,9 +250,6 @@ PRODUCT_PACKAGES += \
     su
 endif
 
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.sys.root_access=0
-
 DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common
 
 PRODUCT_VERSION_MAJOR = 13
-- 
cgit v1.1


From a4ae4813c25df4eee79638b752f44139c4bae4bd Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Mon, 2 Jan 2017 12:06:00 +0800
Subject: cm: Rebrand CM_VERSION to LINEAGE_VERSION

Change-Id: I59edb97b51d43b7c7f5fa01e00972244fc2530dc
---
 config/common.mk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index ca7aaef..2b8c10f 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -312,35 +312,35 @@ endif
 
 ifeq ($(CM_BUILDTYPE), RELEASE)
     ifndef TARGET_VENDOR_RELEASE_BUILD_ID
-        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
+        LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
     else
         ifeq ($(TARGET_BUILD_VARIANT),user)
             ifeq ($(CM_VERSION_MAINTENANCE),0)
-                CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)
+                LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)
             else
-                CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)
+                LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD)
             endif
         else
-            CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
+            LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_MAINTENANCE)$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(CM_BUILD)
         endif
     endif
 else
     ifeq ($(CM_VERSION_MAINTENANCE),0)
-        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)
+        LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)
     else
-        CM_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)
+        LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(shell date -u +%Y%m%d)-$(CM_BUILDTYPE)$(CM_EXTRAVERSION)-$(CM_BUILD)
     endif
 endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
-  ro.cm.version=$(CM_VERSION) \
+  ro.cm.version=$(LINEAGE_VERSION) \
   ro.cm.releasetype=$(CM_BUILDTYPE) \
-  ro.modversion=$(CM_VERSION) \
+  ro.modversion=$(LINEAGE_VERSION) \
   ro.cmlegal.url=https://lineageos.org/legal
 
 -include vendor/cm-priv/keys/keys.mk
 
-CM_DISPLAY_VERSION := $(CM_VERSION)
+CM_DISPLAY_VERSION := $(LINEAGE_VERSION)
 
 ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),)
 ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
-- 
cgit v1.1


From 68718f97607eda3f2fd5e06aa9812ad739e6adce Mon Sep 17 00:00:00 2001
From: Dan Pasanen <invisiblek@cyanogenmod.org>
Date: Wed, 30 Nov 2016 18:56:46 -0600
Subject: vendor: Add a task for getting prebuilts via http

 * Gello being our first pawn
 * Use curl instead of wget (more powerful)
 * Ensure the intermediates directory exists prior to download

Change-Id: If19c18638a14a8b9ab55470ae6ee5a2deda2e3ec
---
 build/core/config.mk        |  3 +++
 build/core/http_prebuilt.mk | 32 ++++++++++++++++++++++++++++++++
 gello/Android.mk            | 11 +++++------
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 build/core/http_prebuilt.mk

diff --git a/build/core/config.mk b/build/core/config.mk
index 2e90a6f..7c0a4ef 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -1,4 +1,5 @@
 # Copyright (C) 2015 The CyanogenMod Project
+#           (C) 2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,3 +27,5 @@ FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/cm/build/core/apicheck_msg
 
 BUILD_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact.mk
 PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact_publish.mk
+
+BUILD_HTTP_PREBUILT := $(TOP)/vendor/cm/build/core/http_prebuilt.mk
diff --git a/build/core/http_prebuilt.mk b/build/core/http_prebuilt.mk
new file mode 100644
index 0000000..805b9f0
--- /dev/null
+++ b/build/core/http_prebuilt.mk
@@ -0,0 +1,32 @@
+# Copyright (C) 2015 The CyanogenMod Project
+#           (C) 2017 The LineageOS 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.
+
+ifeq ($(strip $(LOCAL_HTTP_PATH)),)
+  $(error LOCAL_HTTP_PATH not defined.)
+endif
+
+ifeq ($(strip $(LOCAL_HTTP_FILENAME)),)
+  $(error LOCAL_HTTP_FILENAME not defined.)
+endif
+
+LOCAL_PREBUILT_MODULE_FILE := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE),,COMMON)/$(LOCAL_HTTP_FILENAME)
+
+$(LOCAL_PREBUILT_MODULE_FILE): filename := $(LOCAL_HTTP_FILENAME)
+
+$(LOCAL_PREBUILT_MODULE_FILE):
+	$(hide) curl -L $(LOCAL_HTTP_PATH) --create-dirs -o $(dir $@)/$(filename) --compressed -H "Accept-Encoding: gzip,deflate,sdch"
+	@echo "Download: $@"
+
+include $(BUILD_PREBUILT)
diff --git a/gello/Android.mk b/gello/Android.mk
index 1cf0cd0..62e6aa6 100644
--- a/gello/Android.mk
+++ b/gello/Android.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
+#           (C) 2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -41,11 +42,9 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 
-LOCAL_MAVEN_REPO := https://maven.cyanogenmod.org/artifactory/gello_prebuilds
-LOCAL_MAVEN_GROUP := org.cyanogenmod
-LOCAL_MAVEN_VERSION := 40
-LOCAL_MAVEN_ARTIFACT := gello
-LOCAL_MAVEN_PACKAGING := apk
+LOCAL_GELLO_VERSION := 40
+LOCAL_HTTP_PATH := https://github.com/LineageOS/android_packages_apps_Gello/releases/download/$(LOCAL_GELLO_VERSION)/gello.apk
+LOCAL_HTTP_FILENAME := gello.apk
 
-include $(BUILD_MAVEN_PREBUILT)
+include $(BUILD_HTTP_PREBUILT)
 endif
-- 
cgit v1.1


From b20aa05024c626174f788eeb0f4259f41163b680 Mon Sep 17 00:00:00 2001
From: codeworkx <daniel.hillenbrand@codeworkx.de>
Date: Tue, 3 Jan 2017 17:37:06 +0100
Subject: vendor: add codeworkx as leeco le 2 (s2) maintainer

Change-Id: I7aac3f09097ae4c8dbd3e7a2cd2672b3f8a6aa52
---
 CONTRIBUTORS.mkdn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index d35f3ea..dbe1425 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -54,6 +54,7 @@ Maintainers (LineageOS 13.0):
 * __HTC One XL:__ h8rift, intervigil, jrior001
 * __Huawei Ascend Mate 2:__ mdmower, u-ra
 * __Huawei Honor 4/4X (cherry):__ dianlujitao, surdupetru, desalesouche
+* __LeEco Le 2 (s2):__ codeworkx
 * __LG G2 (AT&T) (D800):__ arcee, Rashed97, Shelnutt2
 * __LG G2 (T-Mobile) (D801):__ arcee, Rashed97, Shelnutt2
 * __LG G2 (International) (D802):__ arcee, Rashed97, Shelnutt2
-- 
cgit v1.1


From 5517e01a9e6b76343730f676be31b62cac809f5e Mon Sep 17 00:00:00 2001
From: Griffin Millender <griffinn.millender@gmail.com>
Date: Fri, 7 Oct 2016 18:16:06 -0500
Subject: cm: Rework boot animation generation

Keep the largest bootanimation extracted
and resize it at build-time.

Change-Id: Iee32f18440ff955d13ed85b273e97cbd540721fc
---
 bootanimation/Android.mk                           |  52 +++++++++++++++++++++
 bootanimation/bootanimation.tar                    | Bin 0 -> 6563840 bytes
 bootanimation/desc.txt                             |   3 ++
 bootanimation/generate-bootanimation.sh            |  32 +++++++++++++
 config/common.mk                                   |  33 -------------
 config/common_full_phone.mk                        |   5 --
 config/common_full_tablet_wifionly.mk              |   5 --
 config/common_full_tv.mk                           |   5 --
 config/common_mini_phone.mk                        |   5 --
 config/common_mini_tablet_wifionly.mk              |   5 --
 config/common_mini_tv.mk                           |   5 --
 prebuilt/common/bootanimation/1080.zip             | Bin 2372242 -> 0 bytes
 prebuilt/common/bootanimation/1200.zip             | Bin 3928983 -> 0 bytes
 prebuilt/common/bootanimation/1440.zip             | Bin 5501273 -> 0 bytes
 prebuilt/common/bootanimation/1536.zip             | Bin 6003639 -> 0 bytes
 prebuilt/common/bootanimation/1600.zip             | Bin 6453184 -> 0 bytes
 prebuilt/common/bootanimation/240.zip              | Bin 435593 -> 0 bytes
 prebuilt/common/bootanimation/320.zip              | Bin 617618 -> 0 bytes
 prebuilt/common/bootanimation/360.zip              | Bin 653060 -> 0 bytes
 prebuilt/common/bootanimation/480.zip              | Bin 1007196 -> 0 bytes
 prebuilt/common/bootanimation/540.zip              | Bin 1033536 -> 0 bytes
 prebuilt/common/bootanimation/600.zip              | Bin 1347040 -> 0 bytes
 prebuilt/common/bootanimation/720.zip              | Bin 1656955 -> 0 bytes
 prebuilt/common/bootanimation/768.zip              | Bin 1947247 -> 0 bytes
 prebuilt/common/bootanimation/800.zip              | Bin 2097364 -> 0 bytes
 prebuilt/common/bootanimation/halfres/1080.zip     | Bin 1041546 -> 0 bytes
 prebuilt/common/bootanimation/halfres/1200.zip     | Bin 1355050 -> 0 bytes
 prebuilt/common/bootanimation/halfres/1440.zip     | Bin 1664965 -> 0 bytes
 prebuilt/common/bootanimation/halfres/1536.zip     | Bin 1955257 -> 0 bytes
 prebuilt/common/bootanimation/halfres/1600.zip     | Bin 2105374 -> 0 bytes
 prebuilt/common/bootanimation/halfres/240.zip      | Bin 413702 -> 0 bytes
 prebuilt/common/bootanimation/halfres/320.zip      | Bin 543289 -> 0 bytes
 prebuilt/common/bootanimation/halfres/360.zip      | Bin 612865 -> 0 bytes
 prebuilt/common/bootanimation/halfres/480.zip      | Bin 443497 -> 0 bytes
 prebuilt/common/bootanimation/halfres/540.zip      | Bin 921935 -> 0 bytes
 prebuilt/common/bootanimation/halfres/600.zip      | Bin 1010305 -> 0 bytes
 prebuilt/common/bootanimation/halfres/720.zip      | Bin 661068 -> 0 bytes
 prebuilt/common/bootanimation/halfres/768.zip      | Bin 1319788 -> 0 bytes
 prebuilt/common/bootanimation/halfres/800.zip      | Bin 1400358 -> 0 bytes
 .../halfres/generate-half-res-anims.sh             |  25 ----------
 40 files changed, 87 insertions(+), 88 deletions(-)
 create mode 100644 bootanimation/Android.mk
 create mode 100644 bootanimation/bootanimation.tar
 create mode 100644 bootanimation/desc.txt
 create mode 100755 bootanimation/generate-bootanimation.sh
 delete mode 100644 prebuilt/common/bootanimation/1080.zip
 delete mode 100644 prebuilt/common/bootanimation/1200.zip
 delete mode 100644 prebuilt/common/bootanimation/1440.zip
 delete mode 100644 prebuilt/common/bootanimation/1536.zip
 delete mode 100644 prebuilt/common/bootanimation/1600.zip
 delete mode 100644 prebuilt/common/bootanimation/240.zip
 delete mode 100644 prebuilt/common/bootanimation/320.zip
 delete mode 100644 prebuilt/common/bootanimation/360.zip
 delete mode 100644 prebuilt/common/bootanimation/480.zip
 delete mode 100644 prebuilt/common/bootanimation/540.zip
 delete mode 100644 prebuilt/common/bootanimation/600.zip
 delete mode 100644 prebuilt/common/bootanimation/720.zip
 delete mode 100644 prebuilt/common/bootanimation/768.zip
 delete mode 100644 prebuilt/common/bootanimation/800.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/1080.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/1200.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/1440.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/1536.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/1600.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/240.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/320.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/360.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/480.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/540.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/600.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/720.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/768.zip
 delete mode 100644 prebuilt/common/bootanimation/halfres/800.zip
 delete mode 100755 prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh

diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk
new file mode 100644
index 0000000..f7ba13b
--- /dev/null
+++ b/bootanimation/Android.mk
@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2016 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.
+#
+
+define build-bootanimation
+    sh vendor/cm/bootanimation/generate-bootanimation.sh \
+    $(TARGET_SCREEN_WIDTH) \
+    $(TARGET_SCREEN_HEIGHT) \
+    $(TARGET_BOOTANIMATION_HALF_RES)
+endef
+
+TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip
+$(TARGET_GENERATED_BOOTANIMATION):
+	@echo "Building bootanimation"
+	$(build-bootanimation)
+
+ifeq ($(TARGET_BOOTANIMATION),)
+    TARGET_BOOTANIMATION := $(TARGET_GENERATED_BOOTANIMATION)
+    ifeq ($(shell command -v convert),)
+        $(info **********************************************)
+        $(info The boot animation could not be generated as)
+        $(info ImageMagick is not installed in your system.)
+        $(info $(space))
+        $(info Please install ImageMagick from this website:)
+        $(info https://imagemagick.org/script/binary-releases.php)
+        $(info **********************************************)
+        $(error stop)
+    endif
+endif
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := bootanimation.zip
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT)/media
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(TARGET_BOOTANIMATION)
+	@mkdir -p $(dir $@)
+	@cp $(TARGET_BOOTANIMATION) $@
diff --git a/bootanimation/bootanimation.tar b/bootanimation/bootanimation.tar
new file mode 100644
index 0000000..50e82bf
Binary files /dev/null and b/bootanimation/bootanimation.tar differ
diff --git a/bootanimation/desc.txt b/bootanimation/desc.txt
new file mode 100644
index 0000000..4aecc8e
--- /dev/null
+++ b/bootanimation/desc.txt
@@ -0,0 +1,3 @@
+c 1 0 part0
+c 0 0 part1
+c 1 0 part2
diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
new file mode 100755
index 0000000..37b8314
--- /dev/null
+++ b/bootanimation/generate-bootanimation.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+WIDTH="$1"
+HEIGHT="$2"
+HALF_RES="$3"
+OUT="$ANDROID_PRODUCT_OUT/obj/BOOTANIMATION"
+
+if [ "$HEIGHT" -lt "$WIDTH" ]; then
+    SIZE="$HEIGHT"
+else
+    SIZE="$WIDTH"
+fi
+
+if [ "$HALF_RES" = "true" ]; then
+    IMAGESIZE=$(expr $SIZE / 2)
+else
+    IMAGESIZE="$SIZE"
+fi
+
+RESOLUTION=""$IMAGESIZE"x"$IMAGESIZE""
+
+mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part{0..2}
+tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
+
+# Create desc.txt
+echo "$SIZE" "$SIZE" 30 > "$OUT/bootanimation/desc.txt"
+cat "vendor/cm/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt"
+
+# Create bootanimation.zip
+cd "$OUT/bootanimation"
+
+zip -qr0 "$OUT/bootanimation.zip" .
diff --git a/config/common.mk b/config/common.mk
index 2b8c10f..969bd87 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -1,38 +1,5 @@
 PRODUCT_BRAND ?= cyanogenmod
 
-ifneq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-# determine the smaller dimension
-TARGET_BOOTANIMATION_SIZE := $(shell \
-  if [ $(TARGET_SCREEN_WIDTH) -lt $(TARGET_SCREEN_HEIGHT) ]; then \
-    echo $(TARGET_SCREEN_WIDTH); \
-  else \
-    echo $(TARGET_SCREEN_HEIGHT); \
-  fi )
-
-# get a sorted list of the sizes
-bootanimation_sizes := $(subst .zip,, $(shell ls vendor/cm/prebuilt/common/bootanimation))
-bootanimation_sizes := $(shell echo -e $(subst $(space),'\n',$(bootanimation_sizes)) | sort -rn)
-
-# find the appropriate size and set
-define check_and_set_bootanimation
-$(eval TARGET_BOOTANIMATION_NAME := $(shell \
-  if [ -z "$(TARGET_BOOTANIMATION_NAME)" ]; then
-    if [ $(1) -le $(TARGET_BOOTANIMATION_SIZE) ]; then \
-      echo $(1); \
-      exit 0; \
-    fi;
-  fi;
-  echo $(TARGET_BOOTANIMATION_NAME); ))
-endef
-$(foreach size,$(bootanimation_sizes), $(call check_and_set_bootanimation,$(size)))
-
-ifeq ($(TARGET_BOOTANIMATION_HALF_RES),true)
-PRODUCT_BOOTANIMATION := vendor/cm/prebuilt/common/bootanimation/halfres/$(TARGET_BOOTANIMATION_NAME).zip
-else
-PRODUCT_BOOTANIMATION := vendor/cm/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip
-endif
-endif
-
 PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
 
 ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 6ee8c00..94798dc 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -8,9 +8,4 @@ PRODUCT_PACKAGES += \
 # Include CM LatinIME dictionaries
 PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
 
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/480.zip:system/media/bootanimation.zip
-endif
-
 $(call inherit-product, vendor/cm/config/telephony.mk)
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index 8dc9332..47e7845 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -7,8 +7,3 @@ PRODUCT_PACKAGES += \
 
 # Include CM LatinIME dictionaries
 PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif
diff --git a/config/common_full_tv.mk b/config/common_full_tv.mk
index 779b918..10b2a5c 100644
--- a/config/common_full_tv.mk
+++ b/config/common_full_tv.mk
@@ -1,7 +1,2 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cm/config/common_full.mk)
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index 828b5b9..b4c0cb3 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -4,9 +4,4 @@ $(call inherit-product, vendor/cm/config/common_mini.mk)
 PRODUCT_PACKAGES += \
     LatinIME
 
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/320.zip:system/media/bootanimation.zip
-endif
-
 $(call inherit-product, vendor/cm/config/telephony.mk)
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
index 1d5810f..285a55d 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -4,8 +4,3 @@ $(call inherit-product, vendor/cm/config/common_mini.mk)
 # Required CM packages
 PRODUCT_PACKAGES += \
     LatinIME
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif
diff --git a/config/common_mini_tv.mk b/config/common_mini_tv.mk
index 63f2bcf..86f1a6b 100644
--- a/config/common_mini_tv.mk
+++ b/config/common_mini_tv.mk
@@ -1,7 +1,2 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cm/config/common_mini.mk)
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif
diff --git a/prebuilt/common/bootanimation/1080.zip b/prebuilt/common/bootanimation/1080.zip
deleted file mode 100644
index c2d29e2..0000000
Binary files a/prebuilt/common/bootanimation/1080.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/1200.zip b/prebuilt/common/bootanimation/1200.zip
deleted file mode 100644
index 95b1fdc..0000000
Binary files a/prebuilt/common/bootanimation/1200.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/1440.zip b/prebuilt/common/bootanimation/1440.zip
deleted file mode 100644
index d9c6dc3..0000000
Binary files a/prebuilt/common/bootanimation/1440.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/1536.zip b/prebuilt/common/bootanimation/1536.zip
deleted file mode 100644
index a2fc1b6..0000000
Binary files a/prebuilt/common/bootanimation/1536.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/1600.zip b/prebuilt/common/bootanimation/1600.zip
deleted file mode 100644
index f008848..0000000
Binary files a/prebuilt/common/bootanimation/1600.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/240.zip b/prebuilt/common/bootanimation/240.zip
deleted file mode 100644
index 94b671e..0000000
Binary files a/prebuilt/common/bootanimation/240.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/320.zip b/prebuilt/common/bootanimation/320.zip
deleted file mode 100644
index 7a9f86d..0000000
Binary files a/prebuilt/common/bootanimation/320.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/360.zip b/prebuilt/common/bootanimation/360.zip
deleted file mode 100644
index 1906137..0000000
Binary files a/prebuilt/common/bootanimation/360.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/480.zip b/prebuilt/common/bootanimation/480.zip
deleted file mode 100644
index de6d2fa..0000000
Binary files a/prebuilt/common/bootanimation/480.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/540.zip b/prebuilt/common/bootanimation/540.zip
deleted file mode 100644
index 3458bbb..0000000
Binary files a/prebuilt/common/bootanimation/540.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/600.zip b/prebuilt/common/bootanimation/600.zip
deleted file mode 100644
index f7662ce..0000000
Binary files a/prebuilt/common/bootanimation/600.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/720.zip b/prebuilt/common/bootanimation/720.zip
deleted file mode 100644
index aaabf4f..0000000
Binary files a/prebuilt/common/bootanimation/720.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/768.zip b/prebuilt/common/bootanimation/768.zip
deleted file mode 100644
index f8521dd..0000000
Binary files a/prebuilt/common/bootanimation/768.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/800.zip b/prebuilt/common/bootanimation/800.zip
deleted file mode 100644
index 08d5785..0000000
Binary files a/prebuilt/common/bootanimation/800.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1080.zip b/prebuilt/common/bootanimation/halfres/1080.zip
deleted file mode 100644
index efb45ca..0000000
Binary files a/prebuilt/common/bootanimation/halfres/1080.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1200.zip b/prebuilt/common/bootanimation/halfres/1200.zip
deleted file mode 100644
index d63a0b0..0000000
Binary files a/prebuilt/common/bootanimation/halfres/1200.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1440.zip b/prebuilt/common/bootanimation/halfres/1440.zip
deleted file mode 100644
index eba6346..0000000
Binary files a/prebuilt/common/bootanimation/halfres/1440.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1536.zip b/prebuilt/common/bootanimation/halfres/1536.zip
deleted file mode 100644
index 3f6da27..0000000
Binary files a/prebuilt/common/bootanimation/halfres/1536.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/1600.zip b/prebuilt/common/bootanimation/halfres/1600.zip
deleted file mode 100644
index 61132a9..0000000
Binary files a/prebuilt/common/bootanimation/halfres/1600.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/240.zip b/prebuilt/common/bootanimation/halfres/240.zip
deleted file mode 100644
index 59735d0..0000000
Binary files a/prebuilt/common/bootanimation/halfres/240.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/320.zip b/prebuilt/common/bootanimation/halfres/320.zip
deleted file mode 100644
index 7497da0..0000000
Binary files a/prebuilt/common/bootanimation/halfres/320.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/360.zip b/prebuilt/common/bootanimation/halfres/360.zip
deleted file mode 100644
index f1247f7..0000000
Binary files a/prebuilt/common/bootanimation/halfres/360.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/480.zip b/prebuilt/common/bootanimation/halfres/480.zip
deleted file mode 100644
index 44db576..0000000
Binary files a/prebuilt/common/bootanimation/halfres/480.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/540.zip b/prebuilt/common/bootanimation/halfres/540.zip
deleted file mode 100644
index 35b631c..0000000
Binary files a/prebuilt/common/bootanimation/halfres/540.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/600.zip b/prebuilt/common/bootanimation/halfres/600.zip
deleted file mode 100644
index ec352f7..0000000
Binary files a/prebuilt/common/bootanimation/halfres/600.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/720.zip b/prebuilt/common/bootanimation/halfres/720.zip
deleted file mode 100644
index cc7b7d3..0000000
Binary files a/prebuilt/common/bootanimation/halfres/720.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/768.zip b/prebuilt/common/bootanimation/halfres/768.zip
deleted file mode 100644
index f87e834..0000000
Binary files a/prebuilt/common/bootanimation/halfres/768.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/800.zip b/prebuilt/common/bootanimation/halfres/800.zip
deleted file mode 100644
index 051db72..0000000
Binary files a/prebuilt/common/bootanimation/halfres/800.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh b/prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh
deleted file mode 100755
index 70f6fad..0000000
--- a/prebuilt/common/bootanimation/halfres/generate-half-res-anims.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-HALF_RES_RESOLUTIONS="240 320 360 480 540 600 720 768 800 1080 1200 1440 1536 1600"
-
-for i in $HALF_RES_RESOLUTIONS; do
-	rm -f $i.zip
-	mkdir $i
-	cd $i
-	if [ -f ../../$(($i/2)).zip ]; then
-		# use the existing scaled images
-		echo "Using existing half-scale images instead of scaling from $i px"
-		unzip ../../$(($i/2)).zip
-		rm -f desc.txt
-		unzip ../../$i.zip desc.txt
-	else
-		unzip ../../$i.zip
-		for j in */*.[pP][nN][gG]; do
-			convert $j -resize 50% tmp.png
-			mv tmp.png $j
-		done
-	fi
-	zip -r0 ../$i.zip .
-	cd ..
-	rm -rf $i
-done
-- 
cgit v1.1


From f5897a1be6275794ed494b5a93cf9477285f57a2 Mon Sep 17 00:00:00 2001
From: David Marble <drmarble1@gmail.com>
Date: Fri, 2 Dec 2016 15:38:47 -0600
Subject: Fix wrong bootanimation.zip from mkdir .../part{0..2}

For some reason the mkdir command:
mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part{0..2}
creates a directory part{0..2} instead of three separate directories.
Non-fatal build errors and a 386 byte bootanimation.zip file result.
This explicitly creates each directory.

Change-Id: Ia6ae0e4f64521992de8cc34a376af3eaac5c8819
---
 bootanimation/generate-bootanimation.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index 37b8314..295edb9 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -19,7 +19,9 @@ fi
 
 RESOLUTION=""$IMAGESIZE"x"$IMAGESIZE""
 
-mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part{0..2}
+mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part0
+mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part1
+mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part2
 tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
 
 # Create desc.txt
-- 
cgit v1.1


From 3521fa5a3bd003269498eea337009ee4e17f3eda Mon Sep 17 00:00:00 2001
From: Rashed Abdel-Tawab <rashed@linux.com>
Date: Fri, 2 Dec 2016 23:06:47 -0500
Subject: bootanim: Use a for loop to make part# folders

Change-Id: Iec90f3521e589de4e8352c0349e1a0751d65d989
---
 bootanimation/generate-bootanimation.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index 295edb9..b5d8f19 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -19,9 +19,10 @@ fi
 
 RESOLUTION=""$IMAGESIZE"x"$IMAGESIZE""
 
-mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part0
-mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part1
-mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part2
+for part_cnt in 0 1 2
+do
+    mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt
+done
 tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
 
 # Create desc.txt
-- 
cgit v1.1


From 1846ec0341efacef7f90012ff64bae440fa12f1c Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <brandon.mcansh@gmail.com>
Date: Fri, 30 Dec 2016 16:26:44 -0500
Subject: http_prebuilt: Implement archive of artifacts

* checksum will be downloaded and asserted to prevent a
    redownload every clean
* Archives will exist (invisibly) at vendor/cm/prebuilt/archive

Change-Id: I637e86cacd146d665044a119885900dc4660e22b
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
---
 .gitignore                        |  1 +
 build/core/http_prebuilt.mk       | 59 +++++++++++++++++++++++++++++++++++++--
 build/tasks/http_curl_prebuilt.sh |  6 ++++
 gello/Android.mk                  |  5 ++--
 4 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100755 build/tasks/http_curl_prebuilt.sh

diff --git a/.gitignore b/.gitignore
index f5b82f3..931ce07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 proprietary/*
+prebuilt/archive
diff --git a/build/core/http_prebuilt.mk b/build/core/http_prebuilt.mk
index 805b9f0..9dc3975 100644
--- a/build/core/http_prebuilt.mk
+++ b/build/core/http_prebuilt.mk
@@ -21,12 +21,67 @@ ifeq ($(strip $(LOCAL_HTTP_FILENAME)),)
   $(error LOCAL_HTTP_FILENAME not defined.)
 endif
 
+ifeq ($(strip $(LOCAL_HTTP_MD5SUM)),)
+  $(error LOCAL_HTTP_MD5SUM not defined.)
+endif
+
+PREBUILT_MODULE_ARCHIVE := vendor/cm/prebuilt/archive/$(LOCAL_MODULE)
+
+PREBUILT_MODULE_FILE := $(PREBUILT_MODULE_ARCHIVE)/$(LOCAL_HTTP_FILENAME)
+
+PREBUILT_MODULE_MD5SUM := $(PREBUILT_MODULE_ARCHIVE)/md5sum
+
+HTTP_FILE_URL := $(LOCAL_HTTP_PATH)/$(LOCAL_HTTP_FILENAME)
+HTTP_FILE_MD5_URL := $(LOCAL_HTTP_PATH)/$(LOCAL_HTTP_MD5SUM)
+
 LOCAL_PREBUILT_MODULE_FILE := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE),,COMMON)/$(LOCAL_HTTP_FILENAME)
 
 $(LOCAL_PREBUILT_MODULE_FILE): filename := $(LOCAL_HTTP_FILENAME)
+$(LOCAL_PREBUILT_MODULE_FILE): checksum := $(PREBUILT_MODULE_MD5SUM)
+$(LOCAL_PREBUILT_MODULE_FILE): filepath := $(PREBUILT_MODULE_FILE)
+$(LOCAL_PREBUILT_MODULE_FILE): version  := $(LOCAL_HTTP_FILE_VERSION)
+
+define curl-checksum
+  @echo "Pulling comparison md5sum for $(filename)"
+  $(call download-prebuilt-module, $(HTTP_FILE_MD5_URL),$(checksum))
+endef
+
+define audit-checksum
+  @echo "Downloading: $(filename) (version $(version))" -> $(filepath);
+  $(hide) if [ ! -f $(filepath) ]; then \
+            $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
+          else \
+            if [ "$(shell echo $(md5sum $(filepath)))" != "$(shell cat $(checksum) | cut -d ' ' -f1)" ]; then \
+              rm -rf $(filepath); \
+              $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
+            fi; \
+          fi; \
+          rm -f $(checksum);
+endef
+
+# $(1) url
+# $(2) file output
+define download-prebuilt-module
+  ./vendor/cm/build/tasks/http_curl_prebuilt.sh $(1) $(2);
+endef
+
+define cleanup
+  @echo "Copying: $(filename) -> $(dir $@)"
+  $(hide) mkdir -p $(dir $@)
+  $(hide) cp $(filepath) $(dir $@)/$(filename)
+endef
 
 $(LOCAL_PREBUILT_MODULE_FILE):
-	$(hide) curl -L $(LOCAL_HTTP_PATH) --create-dirs -o $(dir $@)/$(filename) --compressed -H "Accept-Encoding: gzip,deflate,sdch"
-	@echo "Download: $@"
+	$(call curl-checksum)
+	$(call audit-checksum)
+	$(call cleanup)
 
 include $(BUILD_PREBUILT)
+
+# the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree
+fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE)
+
+# the "nukeprebuilts" target will evict all archived artifacts
+nukeprebuilts:
+	  @echo "Removing artifact for $(LOCAL_HTTP_FILENAME)"
+	  $(hide) rm -rf $(PREBUILT_MODULE_ARCHIVE)
diff --git a/build/tasks/http_curl_prebuilt.sh b/build/tasks/http_curl_prebuilt.sh
new file mode 100755
index 0000000..c90c35f
--- /dev/null
+++ b/build/tasks/http_curl_prebuilt.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+url=$1
+output=$2
+
+curl -L "$url" --create-dirs -o $output --compressed -H "Accept-Encoding: gzip,deflate,sdch" && exit 0 || exit 1
diff --git a/gello/Android.mk b/gello/Android.mk
index 62e6aa6..a88c42a 100644
--- a/gello/Android.mk
+++ b/gello/Android.mk
@@ -42,9 +42,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 
-LOCAL_GELLO_VERSION := 40
-LOCAL_HTTP_PATH := https://github.com/LineageOS/android_packages_apps_Gello/releases/download/$(LOCAL_GELLO_VERSION)/gello.apk
+LOCAL_HTTP_FILE_VERSION := 40
+LOCAL_HTTP_PATH := https://github.com/LineageOS/android_packages_apps_Gello/releases/download/$(LOCAL_HTTP_FILE_VERSION)
 LOCAL_HTTP_FILENAME := gello.apk
+LOCAL_HTTP_MD5SUM := $(LOCAL_HTTP_FILENAME).md5sum
 
 include $(BUILD_HTTP_PREBUILT)
 endif
-- 
cgit v1.1


From 84cfb7f0d1d7d677eee4ef98d3a63de2c22dc29f Mon Sep 17 00:00:00 2001
From: David Marble <drmarble1@gmail.com>
Date: Thu, 12 Jan 2017 00:21:36 -0600
Subject: http_prebuilt: Improve retrieval of artifacts from archive

The current version always redownloads the artifact.
Kali does not like the nested md5sum command and ignores it
leaving file checksum value blank so the test always fails.
A temporary variable is used to get around this limitation
of kali.

The echo "Downloading..." command has been modified to actually
print and has been moved so it only does so when downloading
the artifact.

Change-Id: I115860a87e55399a652d6548fe50f6204337f854
(cherry picked from commit 20c06fd75e09f3910ec699bdc54eec08f6bb4594)
---
 build/core/http_prebuilt.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/core/http_prebuilt.mk b/build/core/http_prebuilt.mk
index 9dc3975..4d7556a 100644
--- a/build/core/http_prebuilt.mk
+++ b/build/core/http_prebuilt.mk
@@ -47,11 +47,13 @@ define curl-checksum
 endef
 
 define audit-checksum
-  @echo "Downloading: $(filename) (version $(version))" -> $(filepath);
   $(hide) if [ ! -f $(filepath) ]; then \
+            echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
             $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
           else \
-            if [ "$(shell echo $(md5sum $(filepath)))" != "$(shell cat $(checksum) | cut -d ' ' -f1)" ]; then \
+            temp_checksum=$(shell md5sum $(filepath) | cut -d ' ' -f1); \
+            if [ "$$temp_checksum" != "$(shell cat $(checksum) | cut -d ' ' -f1)" ]; then \
+              echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
               rm -rf $(filepath); \
               $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
             fi; \
-- 
cgit v1.1


From 76b66c1ab812e6e4749bec53e03bfc5084c38257 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 13 Jan 2017 15:41:01 +0800
Subject: cm: config: Remove obsolete props

All usages of ro.com.android.dataroaming default to false.
The rest of the props are no longer used.

Change-Id: I2320e82a1859f8c13f3430a43aa8714186158ee0
---
 config/common.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index 969bd87..cc8701c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -11,13 +11,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    keyguard.no_require_sim=true \
-    ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
-    ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
-    ro.com.android.wifi-watchlist=GoogleGuest \
-    ro.setupwizard.enterprise_mode=1 \
-    ro.com.android.dateformat=MM-dd-yyyy \
-    ro.com.android.dataroaming=false
+    keyguard.no_require_sim=true
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.build.selinux=1
-- 
cgit v1.1


From d687ac59b2ae338a4342ead2047d3cef2570bab9 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Sat, 14 Jan 2017 15:09:05 -0800
Subject: vendorsetup: match lineage naming for build roster

Change-Id: Ic8853443faf74a864ac14e7b29bd3c885083f63a
---
 vendorsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendorsetup.sh b/vendorsetup.sh
index 08482e5..b520579 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,4 +1,4 @@
-for combo in $(curl -s https://raw.githubusercontent.com/LineageOS/hudson/master/cm-build-targets | sed -e 's/#.*$//' | grep cm-13.0 | awk '{printf "cm_%s-%s\n", $1, $2}')
+for combo in $(curl -s https://raw.githubusercontent.com/LineageOS/hudson/master/lineage-build-targets | sed -e 's/#.*$//' | grep cm-13.0 | awk '{printf "cm_%s-%s\n", $1, $2}')
 do
     add_lunch_combo $combo
 done
-- 
cgit v1.1


From 2d28880a51bf098f0ecf1f52558690bca212193e Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Tue, 27 Dec 2016 22:30:35 -0800
Subject: Disable SU by default

- We plan on distributing an addon for our SU
- Developers that want SU by default can export
    WITH_SU=true to their env
- This helps with application compatibility for
    various services, while maintaining user flexibility

Change-Id: I6d52159676f805c3698ff59c896d943a3a4b25db
---
 config/common.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/common.mk b/config/common.mk
index cc8701c..b03299a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -207,9 +207,14 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ifneq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_PACKAGES += \
     procmem \
-    procrank \
+    procrank
+
+# Conditionally build in su
+ifeq ($(WITH_SU),true)
+PRODUCT_PACKAGES += \
     su
 endif
+endif
 
 DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common
 
-- 
cgit v1.1


From fecbcbe269efe76c1ba9ee018a47cb3cb2ce78b6 Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Sat, 7 Jan 2017 14:08:17 -0600
Subject: extract_utils: Introduce variable INITIAL_COPYRIGHT_YEAR

Let a device specify INITIAL_COPYRIGHT_YEAR=XXXX in setup-makefiles.sh
so that the correct copyright(s) is/are included in vendor makefiles.
The CyanogenMod copyright is retained when INITIAL_COPYRIGHT_YEAR<2017
and the LineageOS copyright is now included for >=2017.

Change-Id: I6895b5b69bc7ba399042ac3c29e17f3209d15f1b
(cherry picked from commit 8945f5e8c796a3fca6fe2ae3cd90df331959c167)
---
 build/tools/extract_utils.sh | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 6f2ff15..8ffdc7d 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -429,12 +429,35 @@ function write_product_packages() {
 # be executed first!
 #
 function write_header() {
+    if [ -f $1 ]; then
+        rm $1
+    fi
+
     YEAR=$(date +"%Y")
 
     [ "$COMMON" -eq 1 ] && local DEVICE="$DEVICE_COMMON"
 
-    cat << EOF > $1
-# Copyright (C) $YEAR The CyanogenMod Project
+    NUM_REGEX='^[0-9]+$'
+    if [[ $INITIAL_COPYRIGHT_YEAR =~ $NUM_REGEX ]] && [ $INITIAL_COPYRIGHT_YEAR -le $YEAR ]; then
+        if [ $INITIAL_COPYRIGHT_YEAR -lt 2016 ]; then
+            printf "# Copyright (C) $INITIAL_COPYRIGHT_YEAR-2016 The CyanogenMod Project\n" > $1
+        elif [ $INITIAL_COPYRIGHT_YEAR -eq 2016 ]; then
+            printf "# Copyright (C) 2016 The CyanogenMod Project\n" > $1
+        fi
+        if [ $YEAR -eq 2017 ]; then
+            printf "# Copyright (C) 2017 The LineageOS Project\n" >> $1
+        elif [ $INITIAL_COPYRIGHT_YEAR -eq $YEAR ]; then
+            printf "# Copyright (C) $YEAR The LineageOS Project\n" >> $1
+        elif [ $INITIAL_COPYRIGHT_YEAR -le 2017 ]; then
+            printf "# Copyright (C) 2017-$YEAR The LineageOS Project\n" >> $1
+        else
+            printf "# Copyright (C) $INITIAL_COPYRIGHT_YEAR-$YEAR The LineageOS Project\n" >> $1
+        fi
+    else
+        printf "# Copyright (C) $YEAR The LineageOS Project\n" > $1
+    fi
+
+    cat << EOF >> $1
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
-- 
cgit v1.1


From 2371d23f28c2aa3c71315b9079babcec45e5e375 Mon Sep 17 00:00:00 2001
From: Asher Simonds <dayanhammer@gmail.com>
Date: Mon, 16 Jan 2017 21:52:24 -0600
Subject: vendor: lineage boot animation

Change-Id: Iff2087eb97aee5e586eecf3898f0066d99bc885c
---
 bootanimation/bootanimation.tar         | Bin 6563840 -> 5416960 bytes
 bootanimation/generate-bootanimation.sh |  17 ++++++++++-------
 config/common.mk                        |   4 ++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bootanimation/bootanimation.tar b/bootanimation/bootanimation.tar
index 50e82bf..95f6b4c 100644
Binary files a/bootanimation/bootanimation.tar and b/bootanimation/bootanimation.tar differ
diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index b5d8f19..5a30c39 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -6,18 +6,21 @@ HALF_RES="$3"
 OUT="$ANDROID_PRODUCT_OUT/obj/BOOTANIMATION"
 
 if [ "$HEIGHT" -lt "$WIDTH" ]; then
-    SIZE="$HEIGHT"
+    IMAGEWIDTH="$HEIGHT"
 else
-    SIZE="$WIDTH"
+    IMAGEWIDTH="$WIDTH"
 fi
 
+IMAGESCALEWIDTH="$IMAGEWIDTH"
+IMAGESCALEHEIGHT=$(expr $IMAGESCALEWIDTH / 3)
+
 if [ "$HALF_RES" = "true" ]; then
-    IMAGESIZE=$(expr $SIZE / 2)
-else
-    IMAGESIZE="$SIZE"
+    IMAGEWIDTH=$(expr $IMAGEWIDTH / 2)
 fi
 
-RESOLUTION=""$IMAGESIZE"x"$IMAGESIZE""
+IMAGEHEIGHT=$(expr $IMAGEWIDTH / 3)
+
+RESOLUTION=""$IMAGEWIDTH"x"$IMAGEHEIGHT""
 
 for part_cnt in 0 1 2
 do
@@ -26,7 +29,7 @@ done
 tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
 
 # Create desc.txt
-echo "$SIZE" "$SIZE" 30 > "$OUT/bootanimation/desc.txt"
+echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 30 > "$OUT/bootanimation/desc.txt"
 cat "vendor/cm/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt"
 
 # Create bootanimation.zip
diff --git a/config/common.mk b/config/common.mk
index b03299a..5671283 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -90,6 +90,10 @@ include vendor/cm/config/themes_common.mk
 # CMSDK
 include vendor/cm/config/cmsdk_common.mk
 
+# Bootanimation
+PRODUCT_PACKAGES += \
+    bootanimation.zip
+
 # Required CM packages
 PRODUCT_PACKAGES += \
     CMAudioService \
-- 
cgit v1.1


From 80926bd327cb9b666f972003e03db3c62042abf2 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Wed, 18 Jan 2017 17:23:38 +0800
Subject: cm: bootanimation: Clear intermediaries

Make sure that any changes to the boot animation can be picked up
and rebuilt by running 'mka bootanimation.zip'.

Change-Id: Ice10e919df4c1b651c5c5dbb9700cab38eeac748
(cherry picked from commit e796a286bd72df3e4715164171a3e7ef6d2eadb2)
---
 bootanimation/CleanSpec.mk | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 bootanimation/CleanSpec.mk

diff --git a/bootanimation/CleanSpec.mk b/bootanimation/CleanSpec.mk
new file mode 100644
index 0000000..a32a883
--- /dev/null
+++ b/bootanimation/CleanSpec.mk
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2017 The LineageOS 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.
+#
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/BOOTANIMATION)
-- 
cgit v1.1


From 2a2b14a0519d1c36ec58342dce17e9e89d2d601b Mon Sep 17 00:00:00 2001
From: Adrian DC <radian.dc@gmail.com>
Date: Sun, 15 Jan 2017 14:03:26 +0100
Subject: extract_utils: Detect output existence before moving it for backup

 * Avoids:
    Cleaning output directory (./../../../vendor/.../.../proprietary)..
    mv: cannot stat './../../../vendor/.../.../proprietary/*':
    No such file or directory

Change-Id: I3258e64f3997f139d8db4fb4e07d14964a469c78
(cherry picked from commit 3c6bdac74bc212b26f723aa8697099fd636451a8)
---
 build/tools/extract_utils.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 8ffdc7d..fe63a12 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -784,7 +784,9 @@ function extract() {
         echo "Cleaning output directory ($OUTPUT_ROOT).."
         rm -rf "${OUTPUT_TMP:?}"
         mkdir -p "${OUTPUT_TMP:?}"
-        mv "${OUTPUT_ROOT:?}/"* "${OUTPUT_TMP:?}/"
+        if [ -d "$OUTPUT_ROOT" ]; then
+            mv "${OUTPUT_ROOT:?}/"* "${OUTPUT_TMP:?}/"
+        fi
         VENDOR_STATE=1
     fi
 
-- 
cgit v1.1


From cac593aa296fdcb01e83c694fdbc6c25b5fc2e67 Mon Sep 17 00:00:00 2001
From: Asher Simonds <dayanhammer@gmail.com>
Date: Mon, 16 Jan 2017 21:52:24 -0600
Subject: cm: bootanimation: Improve boot animation

 * Make it run at 60 FPS
 * Slow down the pace to make it more relaxed

Change-Id: I563b09da875c53f1cd456606ee7a6200e8841bb1
(cherry picked from commit 070053c6abf1d2d23a9cbbcf910db139fde8100c)
---
 bootanimation/bootanimation.tar         | Bin 5416960 -> 10265600 bytes
 bootanimation/desc.txt                  |   2 ++
 bootanimation/generate-bootanimation.sh |   2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bootanimation/bootanimation.tar b/bootanimation/bootanimation.tar
index 95f6b4c..7e4b0dc 100644
Binary files a/bootanimation/bootanimation.tar and b/bootanimation/bootanimation.tar differ
diff --git a/bootanimation/desc.txt b/bootanimation/desc.txt
index 4aecc8e..5ddacd6 100644
--- a/bootanimation/desc.txt
+++ b/bootanimation/desc.txt
@@ -1,3 +1,5 @@
 c 1 0 part0
 c 0 0 part1
 c 1 0 part2
+c 1 1 part3
+c 1 0 part4
diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index 5a30c39..6ef0312 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -29,7 +29,7 @@ done
 tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
 
 # Create desc.txt
-echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 30 > "$OUT/bootanimation/desc.txt"
+echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 60 > "$OUT/bootanimation/desc.txt"
 cat "vendor/cm/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt"
 
 # Create bootanimation.zip
-- 
cgit v1.1


From 642b513a805e1f9fd5722cd623d99e7978c50712 Mon Sep 17 00:00:00 2001
From: Dan Pasanen <dan.pasanen@gmail.com>
Date: Thu, 19 Jan 2017 14:01:59 -0600
Subject: bootanimation: get all the parts

Change-Id: I6f2b38a64629f918b79d28ba8b1d0d6535901142
---
 bootanimation/generate-bootanimation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index 6ef0312..492113a 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -22,7 +22,7 @@ IMAGEHEIGHT=$(expr $IMAGEWIDTH / 3)
 
 RESOLUTION=""$IMAGEWIDTH"x"$IMAGEHEIGHT""
 
-for part_cnt in 0 1 2
+for part_cnt in 0 1 2 3 4
 do
     mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt
 done
-- 
cgit v1.1


From c126a4e795a051329632e4e5ff4802e067afdd0b Mon Sep 17 00:00:00 2001
From: Eloi Carracedo <eloimuns@gmail.com>
Date: Thu, 19 Jan 2017 16:04:53 +0100
Subject: apns: Add Freedompop foggmobile APN

Used for freedompop in Spain.
Change-Id: Iae465f70bc7dad535eea8f13de425857093045c3
(cherry picked from commit 9ec810f6830a97300f2ed29b96b1858ec2bab539)
---
 prebuilt/common/etc/apns-conf.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 3baa4cf..446d7e6 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -603,6 +603,7 @@
   <apn carrier="3 Modem" mcc="234" mnc="20" apn="3internet" type="default,supl" />
   <apn carrier="3 MMS" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="mms" />
   <apn carrier="3 UK" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="default,supl,mms" />
+  <apn carrier="FreedomPop" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="default,supl" />
   <apn carrier="Giffgaff" mcc="234" mnc="20" apn="giffgaff.com" proxy="" port="" user="giffgaff" password="user" mmsc="http://mmsc.mediamessaging.co.uk:8002" mmsproxy="193.113.200.195" mmsport="8080" mvno_type="spn" mvno_match_data="giffgaff" type="default,supl,mms" />
   <apn carrier="BT Business" mcc="234" mnc="230" apn="btmobile.bt.com" user="bt" password="bt" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="default,supl,mms" />
   <apn carrier="Truphone UK" mcc="234" mnc="25" apn="truphone.com" type="default,supl" />
-- 
cgit v1.1


From 8b06d3a3b1dc5694de430083ac5ce3118705cb9e Mon Sep 17 00:00:00 2001
From: Scott Warner <Tortel1210@gmail.com>
Date: Fri, 27 Jan 2017 06:54:59 -0500
Subject: bootanimation: Limit the PNGs to 250 colors

Some systems seem to have with the convert command as-is:
convert: Cannot write PNG8 or color-type 3; colormap is NULL

Because we are writing PNG8, there area a max of 256 colors total.
Explicitly telling convert to stay under the max fixes the issue.

Change-Id: I595fb4503396ca20226ea76bf7b15ed9878752fd
---
 bootanimation/generate-bootanimation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index 492113a..98be46b 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -26,7 +26,7 @@ for part_cnt in 0 1 2 3 4
 do
     mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt
 done
-tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
+tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' -colors 250 \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
 
 # Create desc.txt
 echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 60 > "$OUT/bootanimation/desc.txt"
-- 
cgit v1.1


From cb84ed654b709379cc928ad0998f7b5765e0590d Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Tue, 24 Jan 2017 12:45:50 -0800
Subject: Default mobile data in OOBE to off

Encourage WiFi usage first, and let folks with limited
 sim plans make the choice to enable

Change-Id: I9529d85f3d22af73b9baf255d47681ec43089b14
---
 .../SettingsProvider/res/values/customize.xml       | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml

diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
new file mode 100644
index 0000000..9ca5c09
--- /dev/null
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 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.
+ * 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>
+    <string name="def_enable_mobile_data">false</string>
+</resources>
-- 
cgit v1.1


From dc9d6a4bfd02fe4e0f5f11616e3802de949b19ad Mon Sep 17 00:00:00 2001
From: Sean hoyt <seanhoyt963@gmail.com>
Date: Fri, 3 Feb 2017 02:04:52 +0000
Subject: Fix def_enable_mobile_data overlay

Change-Id: I2f7e38e2726df641089e291725bc25904ac35537
---
 .../frameworks/base/packages/SettingsProvider/res/values/customize.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
index 9ca5c09..1317274 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/customize.xml
@@ -17,5 +17,5 @@
  */
 -->
 <resources>
-    <string name="def_enable_mobile_data">false</string>
+    <bool name="def_enable_mobile_data">false</bool>
 </resources>
-- 
cgit v1.1


From 8e2fedf3ce426a8366f88ef34ccf20b070c0c197 Mon Sep 17 00:00:00 2001
From: Tom Powell <zifnab@zifnab06.net>
Date: Sat, 4 Feb 2017 15:32:20 -0800
Subject: vendor/cm: symlink repopick to build/tools

Change-Id: I04b86c7b9445dc98510ba9b3f89a9a9410b26033
---
 build/tools/repopick.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 build/tools/repopick.py

diff --git a/build/tools/repopick.py b/build/tools/repopick.py
new file mode 120000
index 0000000..de58d7e
--- /dev/null
+++ b/build/tools/repopick.py
@@ -0,0 +1 @@
+../../../../build/tools/repopick.py
\ No newline at end of file
-- 
cgit v1.1


From d2bf7327bbff5437e27d3fc842e44c1d1b70d1f9 Mon Sep 17 00:00:00 2001
From: "Christopher N. Hesse" <raymanfx@gmail.com>
Date: Sun, 5 Feb 2017 21:19:25 +0100
Subject: bootanimation: Use mogrify to convert images in place

Fixes bootanimation generation for Darwin/BSD.

Change-Id: Id9e38bcb9db7b550f22bda1250dbb515599e8f93
(cherry picked from commit 70658805a6ddbecd55877fafe4fba8b2efd83f74)
---
 bootanimation/generate-bootanimation.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh
index 98be46b..cab7be8 100755
--- a/bootanimation/generate-bootanimation.sh
+++ b/bootanimation/generate-bootanimation.sh
@@ -26,7 +26,8 @@ for part_cnt in 0 1 2 3 4
 do
     mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt
 done
-tar xfp "vendor/cm/bootanimation/bootanimation.tar" --to-command="convert - -resize '$RESOLUTION' -colors 250 \"png8:$OUT/bootanimation/\$TAR_FILENAME\""
+tar xfp "vendor/cm/bootanimation/bootanimation.tar" -C "$OUT/bootanimation/"
+mogrify -resize $RESOLUTION -colors 250 "$OUT/bootanimation/"*"/"*".png"
 
 # Create desc.txt
 echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 60 > "$OUT/bootanimation/desc.txt"
-- 
cgit v1.1


From c245bf435aeb3167911a354e06cc7b7d30dab342 Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Thu, 26 Jan 2017 13:45:11 -0600
Subject: apns: Correct FreedomPop Global GSM APN

* Type configuration is empty, not "default,supl"

Change-Id: I4d9bb0e4d61058dbf256059c3ba6b217faabcf78
Signed-off-by: Paul Keith <javelinanddart@gmail.com>
(cherry picked from commit 1bbf68ffee1f8eb85e4d10a7841f52401f6791e9)
---
 prebuilt/common/etc/apns-conf.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 446d7e6..b69c381 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -603,7 +603,7 @@
   <apn carrier="3 Modem" mcc="234" mnc="20" apn="3internet" type="default,supl" />
   <apn carrier="3 MMS" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="mms" />
   <apn carrier="3 UK" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="default,supl,mms" />
-  <apn carrier="FreedomPop" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="default,supl" />
+  <apn carrier="FreedomPop" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
   <apn carrier="Giffgaff" mcc="234" mnc="20" apn="giffgaff.com" proxy="" port="" user="giffgaff" password="user" mmsc="http://mmsc.mediamessaging.co.uk:8002" mmsproxy="193.113.200.195" mmsport="8080" mvno_type="spn" mvno_match_data="giffgaff" type="default,supl,mms" />
   <apn carrier="BT Business" mcc="234" mnc="230" apn="btmobile.bt.com" user="bt" password="bt" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="default,supl,mms" />
   <apn carrier="Truphone UK" mcc="234" mnc="25" apn="truphone.com" type="default,supl" />
-- 
cgit v1.1


From 2cd690e9cc363070726fbd4f5da09c30a9681dcd Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Tue, 10 Jan 2017 16:43:28 -0600
Subject: apns: Update H2O Wireless

* It's H2O, not H20
* Update based on
  - https://www.h2owirelessnow.com/mainControl.php?page=dataManualConfig
  - https://www.h2owirelessnow.com/images/pdf/ManualConfigurations011211.pdf

Change-Id: I181f0aa1fe3a67afd37b65a0f93107f242b479e1
(cherry picked from commit 0e579746302af63a749972bfcdca8bd643ba7ad5)
---
 prebuilt/common/etc/apns-conf.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index b69c381..14c9c3d 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -1458,7 +1458,7 @@
   <apn carrier="Straight Talk" mcc="310" mnc="410" apn="tfdata" port="80" mmsc="http://mms-tf.net" mmsproxy="mms3.tracfone.com" mmsport="80" mvno_type="gid" mvno_match_data="deff" type="default,mms,supl" />
   <apn carrier="Red Pocket" mcc="310" mnc="410" apn="PRODATA" port="" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" mvno_type="gid" mvno_match_data="4201" type="default,mms,supl" />
   <apn carrier="Black Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl,agps,fota" authtype="1" />
-  <apn carrier="H20 Wireless" mcc="310" mnc="410" apn="prodata" proxy="" port="" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,mms,supl" />
+  <apn carrier="H2O Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" type="default,mms,supl" />
   <apn carrier="Pure Talk USA" mcc="310" mnc="410" apn="att.mvno" proxy="" port="" mmsc="http://mmsc.cingular.com" mmsproxy="proxy.mvno.telrite.com" mmsport="80" type="default,mms,supl" />
   <apn carrier="AirVoice Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl" />
   <apn carrier="Jolt Mobile" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl" />
-- 
cgit v1.1


From 7971d7e53d05c10452256cf1ecd5bb2ab676be0f Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Thu, 26 Jan 2017 14:36:30 -0600
Subject: apns: Add FreedomPop US LTE sim APN

Change-Id: I91a9f5d503e49161399ab3f73cad4d8a8174c40b
Signed-off-by: Paul Keith <javelinanddart@gmail.com>
(cherry picked from commit 3576ede78cf34a01bb0aeb7afb6def521be3c5a9)
---
 prebuilt/common/etc/apns-conf.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 14c9c3d..416d2c8 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -604,6 +604,7 @@
   <apn carrier="3 MMS" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="mms" />
   <apn carrier="3 UK" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="default,supl,mms" />
   <apn carrier="FreedomPop" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
+  <apn carrier="FreedomPop (US GSM LTE)" mcc="234" mnc="20" apn="fp.com.attz" type="" />
   <apn carrier="Giffgaff" mcc="234" mnc="20" apn="giffgaff.com" proxy="" port="" user="giffgaff" password="user" mmsc="http://mmsc.mediamessaging.co.uk:8002" mmsproxy="193.113.200.195" mmsport="8080" mvno_type="spn" mvno_match_data="giffgaff" type="default,supl,mms" />
   <apn carrier="BT Business" mcc="234" mnc="230" apn="btmobile.bt.com" user="bt" password="bt" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="default,supl,mms" />
   <apn carrier="Truphone UK" mcc="234" mnc="25" apn="truphone.com" type="default,supl" />
-- 
cgit v1.1


From ab2315ce654766fd156c9f53f978d8f45b64ae8d Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@gmail.com>
Date: Thu, 26 Jan 2017 14:36:56 -0600
Subject: apns: Add differentiation to FreedomPop Global GSM APN

Change-Id: Ifd45a3ce39002ff3f1668e03b2ddb822a096d326
Signed-off-by: Paul Keith <javelinanddart@gmail.com>
(cherry picked from commit 4e3f2767361509326367bd25e1ab6ab0742795ca)
---
 prebuilt/common/etc/apns-conf.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 416d2c8..5f00d3d 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -603,7 +603,7 @@
   <apn carrier="3 Modem" mcc="234" mnc="20" apn="3internet" type="default,supl" />
   <apn carrier="3 MMS" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="mms" />
   <apn carrier="3 UK" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="default,supl,mms" />
-  <apn carrier="FreedomPop" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
+  <apn carrier="FreedomPop (Global GSM)" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
   <apn carrier="FreedomPop (US GSM LTE)" mcc="234" mnc="20" apn="fp.com.attz" type="" />
   <apn carrier="Giffgaff" mcc="234" mnc="20" apn="giffgaff.com" proxy="" port="" user="giffgaff" password="user" mmsc="http://mmsc.mediamessaging.co.uk:8002" mmsproxy="193.113.200.195" mmsport="8080" mvno_type="spn" mvno_match_data="giffgaff" type="default,supl,mms" />
   <apn carrier="BT Business" mcc="234" mnc="230" apn="btmobile.bt.com" user="bt" password="bt" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="default,supl,mms" />
-- 
cgit v1.1


From 71c83d686d4da72a0b6c106e3f5a72bb230d264f Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@aidenswann.com>
Date: Sun, 29 Jan 2017 13:21:26 -0600
Subject: apns: Correct FreedomPop US LTE APN

* This is not run on 3 UK's network, but AT&T's

Change-Id: I81c8881b04ebd5c7a24794835097056d9075d9a2
Signed-off-by: Paul Keith <javelinanddart@aidenswann.com>
(cherry picked from commit 6dc33ac9c59065c676bb908fea860ba48be9acc6)
---
 prebuilt/common/etc/apns-conf.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 5f00d3d..3fc72ae 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -604,7 +604,6 @@
   <apn carrier="3 MMS" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="mms" />
   <apn carrier="3 UK" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="default,supl,mms" />
   <apn carrier="FreedomPop (Global GSM)" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
-  <apn carrier="FreedomPop (US GSM LTE)" mcc="234" mnc="20" apn="fp.com.attz" type="" />
   <apn carrier="Giffgaff" mcc="234" mnc="20" apn="giffgaff.com" proxy="" port="" user="giffgaff" password="user" mmsc="http://mmsc.mediamessaging.co.uk:8002" mmsproxy="193.113.200.195" mmsport="8080" mvno_type="spn" mvno_match_data="giffgaff" type="default,supl,mms" />
   <apn carrier="BT Business" mcc="234" mnc="230" apn="btmobile.bt.com" user="bt" password="bt" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="default,supl,mms" />
   <apn carrier="Truphone UK" mcc="234" mnc="25" apn="truphone.com" type="default,supl" />
@@ -1402,6 +1401,7 @@
   <apn carrier="ATT Broadband" mcc="310" mnc="170" apn="Broadband" type="default,supl" />
   <apn carrier="DataConnect" mcc="310" mnc="170" apn="isp.cingular" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
   <apn carrier="Cingular MMS" mcc="310" mnc="170" apn="wap.cingular" proxy="" port="" user="WAP@CINGULARGPRS.COM" password="CINGULAR1" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.32" mmsport="8080" type="mms" />
+  <apn carrier="FreedomPop (US GSM LTE)" mcc="310" mnc="170" apn="fp.com.attz" type="" />
   <apn carrier="ATT WAP" mcc="310" mnc="180" apn="wap.cingular" proxy="wireless.cingular.com" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="wireless.cingular.com" mmsport="80" type="default,mms" />
   <apn carrier="ATT Broadband" mcc="310" mnc="180" apn="Broadband" type="default,supl" />
   <apn carrier="WCW Internet" mcc="310" mnc="180" apn="internet.wcc.net" user="3257630000" password="mmsc" type="default,supl" authtype="0" />
-- 
cgit v1.1


From 895fce99c8307f15dc77da15c77a84e8c188dbe7 Mon Sep 17 00:00:00 2001
From: Paul Keith <javelinanddart@aidenswann.com>
Date: Sun, 29 Jan 2017 13:21:58 -0600
Subject: apns: Remove differentiation between FreedomPop GSM APNs

* Unnecessary due to differing mcc/mnc

Change-Id: Ica43ec381d4aa1873f2e332adf31381fac309e1b
Signed-off-by: Paul Keith <javelinanddart@aidenswann.com>
(cherry picked from commit 4f163738655de88ec6b2818028bbf8356d4a4e39)
---
 prebuilt/common/etc/apns-conf.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 3fc72ae..e3ac3c7 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -603,7 +603,7 @@
   <apn carrier="3 Modem" mcc="234" mnc="20" apn="3internet" type="default,supl" />
   <apn carrier="3 MMS" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="mms" />
   <apn carrier="3 UK" mcc="234" mnc="20" apn="three.co.uk" proxy="" port="" user="" password="" mmsc="http://mms.um.three.co.uk:10021/mmsc" mmsproxy="217.171.129.2" mmsport="8799" type="default,supl,mms" />
-  <apn carrier="FreedomPop (Global GSM)" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
+  <apn carrier="FreedomPop" mcc="234" mnc="20" apn="freedompop.foggmobile.com" type="" />
   <apn carrier="Giffgaff" mcc="234" mnc="20" apn="giffgaff.com" proxy="" port="" user="giffgaff" password="user" mmsc="http://mmsc.mediamessaging.co.uk:8002" mmsproxy="193.113.200.195" mmsport="8080" mvno_type="spn" mvno_match_data="giffgaff" type="default,supl,mms" />
   <apn carrier="BT Business" mcc="234" mnc="230" apn="btmobile.bt.com" user="bt" password="bt" mmsc="http://mms/" mmsproxy="149.254.201.135" mmsport="8080" authtype="1" type="default,supl,mms" />
   <apn carrier="Truphone UK" mcc="234" mnc="25" apn="truphone.com" type="default,supl" />
@@ -1401,7 +1401,7 @@
   <apn carrier="ATT Broadband" mcc="310" mnc="170" apn="Broadband" type="default,supl" />
   <apn carrier="DataConnect" mcc="310" mnc="170" apn="isp.cingular" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
   <apn carrier="Cingular MMS" mcc="310" mnc="170" apn="wap.cingular" proxy="" port="" user="WAP@CINGULARGPRS.COM" password="CINGULAR1" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.32" mmsport="8080" type="mms" />
-  <apn carrier="FreedomPop (US GSM LTE)" mcc="310" mnc="170" apn="fp.com.attz" type="" />
+  <apn carrier="FreedomPop" mcc="310" mnc="170" apn="fp.com.attz" type="" />
   <apn carrier="ATT WAP" mcc="310" mnc="180" apn="wap.cingular" proxy="wireless.cingular.com" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="wireless.cingular.com" mmsport="80" type="default,mms" />
   <apn carrier="ATT Broadband" mcc="310" mnc="180" apn="Broadband" type="default,supl" />
   <apn carrier="WCW Internet" mcc="310" mnc="180" apn="internet.wcc.net" user="3257630000" password="mmsc" type="default,supl" authtype="0" />
-- 
cgit v1.1


From c9fc176de890e08ffaa7a2e6f37592499acbcbce Mon Sep 17 00:00:00 2001
From: Daniel Marsee <rdmarsee@gmail.com>
Date: Tue, 24 Jan 2017 11:15:18 -0500
Subject: apns: Update H2O Wireless for LTE

New H2O Wireless APN to allow LTE is PRODATA, not att.mvno
New settings were copied from
http://easygo.h2owirelessnow.com/easygo/images/english/APN_SETTING-2014.pdf.

Change-Id: Ic09f9c9a8db90877fa2842d076762a14bdf154ca
(cherry picked from commit a434e63395933d22ef8731858ee9af8e824408d3)
---
 prebuilt/common/etc/apns-conf.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index e3ac3c7..11e16b8 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -1459,7 +1459,7 @@
   <apn carrier="Straight Talk" mcc="310" mnc="410" apn="tfdata" port="80" mmsc="http://mms-tf.net" mmsproxy="mms3.tracfone.com" mmsport="80" mvno_type="gid" mvno_match_data="deff" type="default,mms,supl" />
   <apn carrier="Red Pocket" mcc="310" mnc="410" apn="PRODATA" port="" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" mvno_type="gid" mvno_match_data="4201" type="default,mms,supl" />
   <apn carrier="Black Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl,agps,fota" authtype="1" />
-  <apn carrier="H2O Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" type="default,mms,supl" />
+  <apn carrier="H2O Wireless" mcc="310" mnc="410" apn="PRODATA" mmsc="http://mmsc.mobile.att.net" mmsproxy="proxy.mobile.att.net" mmsport="80" type="default,mms,supl" />
   <apn carrier="Pure Talk USA" mcc="310" mnc="410" apn="att.mvno" proxy="" port="" mmsc="http://mmsc.cingular.com" mmsproxy="proxy.mvno.telrite.com" mmsport="80" type="default,mms,supl" />
   <apn carrier="AirVoice Wireless" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl" />
   <apn carrier="Jolt Mobile" mcc="310" mnc="410" apn="att.mvno" proxy="66.209.11.33" port="80" mmsc="http://mmsc.cingular.com" mmsproxy="66.209.11.33" mmsport="80" type="default,mms,supl" />
-- 
cgit v1.1


From 49d115a88ac1cd596391743dc389f44ab5338207 Mon Sep 17 00:00:00 2001
From: nicknitewolf <nickradiantwtf@gmail.com>
Date: Wed, 1 Feb 2017 20:00:10 +0800
Subject: apns: Add SingTel hi!card sim APN

Change-Id: I0715dcdfb7ff845f0d156e2a0919ae6ce02a72b0
(cherry picked from commit 0258f3e8a2e308353264ffd531330770ee0f5ec9)
---
 prebuilt/common/etc/apns-conf.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 11e16b8..ec1c322 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -3365,6 +3365,7 @@
   <apn carrier="True" mcc="520" mnc="99" apn="internet" user="true" password="true" type="default,supl" />
   <apn carrier="True MMS" mcc="520" mnc="99" apn="mms" user="true" password="true" mmsc="http://mms.trueworld.net:8002" mmsproxy="10.4.7.39" mmsport="8080" type="mms" />
   <apn carrier="SingTel" mcc="525" mnc="01" apn="e-ideas" type="default,supl" />
+  <apn carrier="SingTel hi!card" mcc="525" mnc="01" apn="hicard" mmsc="http://mms.singtel.com:10021/mmsc" mmsproxy="165.21.42.84" mmsport="8080" authtype="1" type="default,supl,mms" />
   <apn carrier="IDEAS" mcc="525" mnc="01" apn="e-ideas" type="default,supl,mms" />
   <apn carrier="IDEAS MMS" mcc="525" mnc="01" apn="e-ideas" user="65IDEAS" password="65ideas" mmsc="http://mms.singtel.com:10021/mmsc" mmsproxy="165.21.42.84" mmsport="8080" type="mms" />
   <apn carrier="SingTel" mcc="525" mnc="02" apn="e-ideas" type="default,supl" />
-- 
cgit v1.1


From dee66450bb214aa7afa174f176c88a09df86d5ba Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Sat, 11 Feb 2017 06:01:13 +0800
Subject: cm: bootanimation: Fail the build if mogrify is absent

We're no longer using convert, but mogrify.

Change-Id: Ifd58527b49e5548dd94b35a8cf0ffa4ad5196804
---
 bootanimation/Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk
index f7ba13b..77547e3 100644
--- a/bootanimation/Android.mk
+++ b/bootanimation/Android.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
+#               2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,7 +29,7 @@ $(TARGET_GENERATED_BOOTANIMATION):
 
 ifeq ($(TARGET_BOOTANIMATION),)
     TARGET_BOOTANIMATION := $(TARGET_GENERATED_BOOTANIMATION)
-    ifeq ($(shell command -v convert),)
+    ifeq ($(shell command -v mogrify),)
         $(info **********************************************)
         $(info The boot animation could not be generated as)
         $(info ImageMagick is not installed in your system.)
-- 
cgit v1.1