invisiblek

9eb72f7cc9a0d2c7858cedc0bec207f6b6747085 (blek/cm-14.1_android-7.1.1_r22, blek/cm-14.1_android-7.1.1_r21) marlin: regen defconfig
ee15ebcad41d271d02bac43a9f53696ad86c1a4e Merge remote-tracking branch 'aosp/android-msm-marlin-3.18-nougat-mr1.3' into cm-14.1
367e64520dba1652d8f6d0ac1ebda3cab0f9e374 input: synaptics_dsx: remove update sysfs entries
1d6d364ee174676a225a77dc7ca8dac887199718 fs/proc/array.c: make safe access to group_leader
773179468893965c2b81aa7ffe3722b6868ef749 input: touchscreen: disable generic update i/f
123b90a61aa365d59a3621bcb49601a70d90ca04 drivers: soc: add size checks and update log messages
09b679d2ba35c87fcffe3d79cbea69e59102fe22 qcacld-2.0: wlan host driver upgrade to 4.4.25.027s_1
3f9a4ada777f9989acc1cf066dc810a9af3d888f qseecom: remove entry from qseecom_registered_app_list
57ac3404a192eb697d7d7422cbb093837afbf2b2 qcacld-2.0: Avoid overflow of "set_bssid_hotlist" params
f6080d05ac3b5cd554bd4a16b6b75da5c80c8665 qcacld-2.0: Avoid overflow of "significant change" params

invisiblek

9eb72f7cc9a0d2c7858cedc0bec207f6b6747085 (blek/cm-14.1_android-7.1.1_r22, blek/cm-14.1_android-7.1.1_r21) marlin: regen defconfig
ee15ebcad41d271d02bac43a9f53696ad86c1a4e Merge remote-tracking branch 'aosp/android-msm-marlin-3.18-nougat-mr1.3' into cm-14.1
367e64520dba1652d8f6d0ac1ebda3cab0f9e374 input: synaptics_dsx: remove update sysfs entries
1d6d364ee174676a225a77dc7ca8dac887199718 fs/proc/array.c: make safe access to group_leader
773179468893965c2b81aa7ffe3722b6868ef749 input: touchscreen: disable generic update i/f
123b90a61aa365d59a3621bcb49601a70d90ca04 drivers: soc: add size checks and update log messages
09b679d2ba35c87fcffe3d79cbea69e59102fe22 qcacld-2.0: wlan host driver upgrade to 4.4.25.027s_1
3f9a4ada777f9989acc1cf066dc810a9af3d888f qseecom: remove entry from qseecom_registered_app_list
57ac3404a192eb697d7d7422cbb093837afbf2b2 qcacld-2.0: Avoid overflow of "set_bssid_hotlist" params
f6080d05ac3b5cd554bd4a16b6b75da5c80c8665 qcacld-2.0: Avoid overflow of "significant change" params

invisiblek

#!/bin/bash

# Usage
# aospmerge.sh [caf/aosp] <old tag> <new tag>
#   If the first parameter is not set to 'caf' or 'aosp' it defaults to an aosp merge
#

export cmversion=14.1

if [ $1 == "caf" ]; then

invisiblek

commit 5caa388373f6e713e17203290e50efc2e615ed63 (HEAD -> nougat-mr1.1-release, origin/nougat-mr1.1-release, origin/HEAD)
Author:     Daniel Micay <[email protected]>
AuthorDate: Wed Feb 1 07:14:37 2017 -0500
Commit:     Daniel Micay <[email protected]>
CommitDate: Thu Feb 2 05:50:15 2017 -0500

    hide MAC randomization toggle when not supported
    
    Change-Id: I0ff0d4e9e53ce61c585c4de5f05d43a6b13ffe6f

invisiblek

allow init block_device : dir { search };
allow dumpstate dumpstate : rawip_socket { ioctl read write create getattr setattr lock append bind connect getopt setopt shutdown };
allow init qmuxd_socket : fifo_file { read create getattr setattr relabelfrom relabelto unlink open };
allow init sockfs : dir { read setattr search open };
allow init proc_security : dir { read setattr search open };
allowxperm untrusted_app untrusted_app : udp_socket ioctl { 0x5411 0x5451 };
allowxperm untrusted_app untrusted_app : udp_socket ioctl { 0x8906-0x8907 0x8910 0x8912-0x8913 0x8915 0x8917 0x8919 0x891b 0x8921 0x8933 0x8938 0x8942 };
allowxperm untrusted_app untrusted_app : udp_socket ioctl { 0x8b01 0x8b05 0x8b07 0x8b09 0x8b0b 0x8b0d 0x8b0f 0x8b11-0x8b13 0x8b21 0x8b23 0x8b25 0x8b27 0x8b29 0x8b2d };
allow untrusted_app untrusted_app : udp_socket { ioctl read write create getattr setattr lock append bind connect getopt setopt shutdown };
allow drmserver mediaserver : fd { use };

invisiblek

--------- beginning of main
02-01 08:36:38.449  1002  1431 D AudioService: Stream muted, skip playback
--------- beginning of system
02-01 08:36:38.467  1002  1002 I Telecom : CallIntentProcessor: onReceive - isUnknownCall: false: PCR.oR@BZU
02-01 08:36:38.467  1002  1002 I Telecom : Class:  processOutgoingCallIntent isCallPull = false: PCR.oR@BZU
02-01 08:36:38.467  1002  1002 I Telecom : Class:  processOutgoingCallIntent handle = tel:266-2751,scheme = tel, uriString = 266-2751, isSkipSchemaParsing = false, isAddParticipant = false: PCR.oR@BZU
02-01 08:36:38.474  1002  1002 I Telecom : Event: Call TC@3: CREATED, null: PCR.oR@BZU
02-01 08:36:38.475  1002  1002 I Telecom : Event: Call TC@3: SET_CONNECTING, ComponentInfo{com.android.phone/com.android.services.telephony.TelephonyConnectionService}, [133551f45f85c5d21a12856b0fa9438a0750b453], UserHandle{0}: PCR.oR@BZU
02-01 08:36:38.475  1002  1002 I Telecom : InCallController: onCanAddCallChanged : false: PCR.oR@BZU
02-01 08:36:38.476  1002  1002 I Telecom : Tel

invisiblek

diff --git a/src/com/cyanogenmod/updater/service/DownloadCompleteIntentService.java b/src/com/cyanogenmod/updater/service/DownloadCompleteIntentService.java
index 1eacc4a..b8dd0c1 100644
--- a/src/com/cyanogenmod/updater/service/DownloadCompleteIntentService.java
+++ b/src/com/cyanogenmod/updater/service/DownloadCompleteIntentService.java
@@ -87,6 +87,11 @@ public class DownloadCompleteIntentService extends IntentService {
                 FileChannel inChannel = inStream.getChannel();
                 FileChannel outChannel = outStream.getChannel();
                 inChannel.transferTo(0, inChannel.size(), outChannel);
+
+                inChannel.close();

invisiblek

#!/bin/bash

export oldtag=android-7.1.1_r6
export newtag=android-7.1.1_r9
export cmversion=14.1
# CAF
#export remotebase=https://source.codeaurora.org/quic/la/platform
# AOSP
export remotebase=https://android.googlesource.com/platform

invisiblek

[    1.801067] c2      1 hidraw: raw HID events driver (C) Jiri Kosina
[    1.801342] c2      1 usbcore: registered new interface driver usbhid
[    1.801349] c2      1 usbhid: USB HID core driver
[    1.801962] c2      1 ashmem: initialized
[    1.980403] c1      6 [TP]:fwu_start_reflash: Start of reflash process
[    2.423395] c0    249 FUSB fusb_GPIO_Set_VBus5v: set vbus ctrl: 0, typec_state(0x2), pd_state(0x0), retry: 1
[    2.504739] c2      1 nanohub: loaded; ret=0
[    2.504884] c2      1 qpnp_coincell_charger_show_state: enabled=Y, voltage=3200 mV, resistance=2100 ohm
[    2.517745] c2      1 bimc-bwmon 408000.qcom,cpu-bwmon: BW HWmon governor registered.
[    2.519523] c2      1 arm-memlat-mon soc:qcom,arm-memlat-mon-0: Memory Latency governor registered.

invisiblek

#!/bin/bash

echo "bootctl get-current-slot: `adb shell bootctl get-current-slot`"
echo "bootctl is-slot-bootable 0: `adb shell bootctl is-slot-bootable 0`"
echo "bootctl is-slot-bootable 1: `adb shell bootctl is-slot-bootable 1`"
echo "bootctl is-slot-marked-successful 0: `adb shell bootctl is-slot-marked-successful 0`"
echo "bootctl is-slot-marked-successful 1: `adb shell bootctl is-slot-marked-successful 1`"
echo "bootctl get-suffix 0: `adb shell bootctl get-suffix 0`"
echo "bootctl get-suffix 1: `adb shell bootctl get-suffix 1`"