This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HEAD detached from def27a9 | |
You have unmerged paths. | |
(fix conflicts and run "git commit") | |
Changes to be committed: | |
modified: Documentation/devicetree/bindings/arm/msm/msm_watchdog.txt | |
new file: arch/arm/boot/dts/qcom/dsi-panel-sharp-dualmipi0-1080p_120hz.dtsi | |
new file: arch/arm/boot/dts/qcom/dsi-panel-sharp-dualmipi1-1080p_120hz.dtsi | |
modified: drivers/cpuidle/cpuidle.c |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[1mdiff --git a/victara.txt b/clark.txt[m | |
[1mindex 421bac9..8fae3cd 100644[m | |
[1m--- a/victara.txt[m | |
[1m+++ b/clark.txt[m | |
[36m@@ -23,7 +23,7 @@[m [mint __fastcall raiseException(int a1, int a2, int a3);[m | |
int __fastcall jniRegisterNativeMethods(int a1, char *a2, int a3, int a4);[m | |
// int access(const char *name, int type);[m | |
// int asprintf(char **, const char *, ...);[m | |
[31m-signed int __fastcall irGesturesRegisterNativeMethods(int a1);[m | |
[32m+[m[32mint __fastcall irGesturesRegisterNativeMethods(int a1);[m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
__bionic_open_tzdata: couldn't find any tzdata when looking for localtime! | |
__bionic_open_tzdata: couldn't find any tzdata when looking for GMT! | |
__bionic_open_tzdata: couldn't find any tzdata when looking for posixrules! | |
Starting TWRP 3.0.2-0 on Fri Jan 2 17:27:07 1970 | |
(pid 346) | |
I:Lun file '/sys/class/android_usb/android0/f_mass_storage/lun0/file' does not exist, USB storage mode disabled | |
TW_INCLUDE_CRYPTO := true | |
I:Found brightness file at '/sys/class/leds/lcd-backlight/brightness' | |
I:Got max brightness 255 from '/sys/class/leds/lcd-backlight/max_brightness' | |
I:TWFunc::Set_Brightness: Setting brightness control to 255 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<6>[ 0.000000,0] Initializing cgroup subsys cpu | |
<6>[ 0.000000,0] Initializing cgroup subsys cpuacct | |
<5>[ 0.000000,0] Linux version 3.10.84-perf-g0ec7138 (hudsoncm@ilclbld87) (gcc version 4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Nov 3 05:01:11 CST 2015 | |
<4>[ 0.000000,0] CPU: AArch64 Processor [410fd033] revision 3 | |
<6>[ 0.000000,0] Machine: clark | |
<6>[ 0.000000,0] cma: Found secure_region@0, memory base 0x0000000000000000, size 300 MiB, limit 0xffffffffffffffff | |
<6>[ 0.000000,0] cma: Found qsecom_region@0, memory base 0x0000000000000000, size 24 MiB, limit 0xffffffffffffffff | |
<6>[ 0.000000,0] cma: Found audio_region@0, memory base 0x0000000000000000, size 4 MiB, limit 0xffffffffffffffff | |
<6>[ 0.000000,0] cma: Found removed_regions@0, memory base 0x0000000006400000, size 14 MiB, limit 0xffffffffffffffff | |
<6>[ 0.000000,0] cma: Found dfps_data_mem@0, memory base 0x0000000003400000, size 0 MiB, limit 0xffffffffffffffff |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?xml version="1.0" encoding="UTF-8"?> | |
<manifest> | |
<remote name="teamwin" fetch="ssh://[email protected]/TeamWin" review="gerrit.twrp.me" /> | |
<remote name="caf" fetch="git://codeaurora.org/quic/la/" /> | |
<remote name="gitlab" fetch="ssh://[email protected]" /> | |
<project name="invisiblek/android_vendor_invisiblek" path="vendor/invisiblek" remote="gitlab" /> | |
<project name="CyanogenMod/hudson" path="hudson" revision="master" /> | |
<project name="mdmower/twrp" path="bootable/recovery-twrp" /> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hello |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/system/bin/linker | |
Android | |
__ashldi3 | |
__lshrdi3 | |
__cxa_finalize | |
LIBC | |
libc.so | |
libmmcamera2_sensor_modules.so | |
__aeabi_llsr | |
__aeabi_llsl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp | |
index c16e646..bd07cf1 100644 | |
--- a/media/mediaserver/main_mediaserver.cpp | |
+++ b/media/mediaserver/main_mediaserver.cpp | |
@@ -135,13 +135,13 @@ int main(int argc __unused, char** argv) | |
ALOGI("ServiceManager: %p", sm.get()); | |
AudioFlinger::instantiate(); | |
MediaPlayerService::instantiate(); | |
+ AudioPolicyService::instantiate(); | |
ResourceManagerService::instantiate(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp | |
index c16e646..bd07cf1 100644 | |
--- a/media/mediaserver/main_mediaserver.cpp | |
+++ b/media/mediaserver/main_mediaserver.cpp | |
@@ -135,13 +135,13 @@ int main(int argc __unused, char** argv) | |
ALOGI("ServiceManager: %p", sm.get()); | |
AudioFlinger::instantiate(); | |
MediaPlayerService::instantiate(); | |
+ AudioPolicyService::instantiate(); | |
ResourceManagerService::instantiate(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/system/bin/linker | |
Android | |
dladdr | |
LIBC | |
libdl.so | |
__snprintf_chk | |
libc.so | |
__libc_init | |
__cxa_atexit | |
__gnu_Unwind_Find_exidx |