invisiblek

HEAD detached from 166d4dff8
You are currently cherry-picking commit 72e249c3b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   res/values/config.xml
	modified:   res/xml/camera_preferences.xml
	modified:   res/xml/video_preferences.xml

invisiblek

commit 4dacee69ddac259bc50ac3f353acc11ab273c8c5 (HEAD)
Author: Dan Pasanen <[email protected]>
Date:   Thu Jan 26 11:01:59 2017 -0600

    bootctl: set a prop for next boot slot
    
    Change-Id: I640f8eeadcc0f3dd0dd70625c9b782f61c20ece6

diff --git a/boot_control.cpp b/boot_control.cpp
index 539c52c..ef2e120 100644

invisiblek

#!/sbin/sh

. /tmp/backuptool.functions

list_files() {
cat <<EOF
lib/libaptX-1.0.0-rel-Android21-ARMv7A.so
lib/libaptXScheduler.so
EOF
}

invisiblek

#!/sbin/sh

. /tmp/backuptool.functions

list_files() {
cat <<EOF
lib/libaptX-1.0.0-rel-Android21-ARMv7A.so
lib/libaptXScheduler.so
EOF
}

invisiblek

diff --git a/build/tasks/dt_image.mk b/build/tasks/dt_image.mk
index 0f84946..c8ccc67 100644
--- a/build/tasks/dt_image.mk
+++ b/build/tasks/dt_image.mk
@@ -2,7 +2,7 @@
 # Generate device tree image (dt.img)
 #----------------------------------------------------------------------
 ifeq ($(strip $(BOARD_CUSTOM_BOOTIMG_MK)),)
-ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)
+ifeq (,$(findstring -dtb,$(BOARD_KERNEL_IMAGE_NAME)))

invisiblek

diff --git a/build/tasks/dt_image.mk b/build/tasks/dt_image.mk
index 0f84946..93fed18 100644
--- a/build/tasks/dt_image.mk
+++ b/build/tasks/dt_image.mk
@@ -2,6 +2,7 @@
 # Generate device tree image (dt.img)
 #----------------------------------------------------------------------
 ifeq ($(strip $(BOARD_CUSTOM_BOOTIMG_MK)),)
+ifeq (,$(findstring -dtb,$(BOARD_KERNEL_IMAGE_NAME)))
 ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)

invisiblek

--------- beginning of system
05-23 17:47:13.767   422   430 I QISL    : QSEE Interrupt Service Listener Thread is started
05-23 17:47:13.768   422   430 I QISL    : QSEE Interrupt Service Listener was activated successfully
05-23 17:47:18.737   548   548 I vold    : Vold 3.0 (the awakening) firing up
05-23 17:47:18.739   548   548 V vold    : Detected support for: exfat ext4 ntfs vfat
05-23 17:47:19.036   548   554 I vold    : e4crypt_initialize_global_de
05-23 17:47:19.133   548   554 D vold    : Added key 956301598 (ext4:5d9c6cd4e8157320) to keyring 982807239 in process 548
05-23 17:47:19.197   548   554 D vold    : e4crypt_init_user0
05-23 17:47:19.197   548   554 D vold    : Preparing: /data/misc/vold/user_keys
05-23 17:47:19.198   548   554 D vold    : Preparing: /data/misc/vold/user_keys/ce

invisiblek

<?xml version="1.0" encoding="UTF-8"?>
<manifest>
  <remote name="opengapps" fetch="https://github.com/opengapps/"  />

  <project path="vendor/google/build" name="aosp_build" revision="master" remote="opengapps" />
  <project path="vendor/opengapps/sources/all" name="all" clone-depth="1" revision="master" remote="opengapps" />

  <project path="vendor/opengapps/sources/arm" name="arm" clone-depth="1" revision="master" remote="opengapps" />
  <project path="vendor/opengapps/sources/arm64" name="arm64" clone-depth="1" revision="master" remote="opengapps" />
</manifest>

invisiblek

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 865ea10..dbe9b8d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -57,6 +57,11 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
 
 # Camera
+TARGET_HAS_LEGACY_CAMERA_HAL1 := true
+BOARD_GLOBAL_CFLAGS += -DDECAY_TIME_DEFAULT=0

invisiblek

--------- beginning of main
01-12 13:30:28.817  2441  3411 W ContentTaskController: Invalid task was provided to stopTracking.
01-12 13:30:28.888 13033 15596 I Babel_ConcService: Acquired partial wake lock to keep ConcurrentService alive
01-12 13:30:28.903 13033 15596 I Babel_ConcService: Released partial wake lock as ConcurrentService became idle
01-12 13:30:28.904 13033 15618 I Babel_ConcService: Acquired partial wake lock to keep ConcurrentService alive
01-12 13:30:28.905 13033 15618 I Babel_ConcService: Released partial wake lock as ConcurrentService became idle
01-12 13:30:28.918  2441 15557 W ContentTaskController: Invalid newTask was provided to startTracking.
01-12 13:30:29.115 13033 15714 E MediaPlayer-JNI: JNIMediaPlayerFactory: bIsQCMediaPlayerPresent 0
01-12 13:30:29.116 13033 15714 E MediaPlayer-JNI: JNIMediaPlayerFactory: bIsQCMediaPlayerPresent 0
01-12 13:30:29.118 13033 15714 E MediaPlayer-JNI: JNIMediaPlayerFactory: bIsQCMediaPlayerPresent 0