[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea.spec
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/guhl/droid-config-thea.git</param>
<param name="branch">master</param>
- <param name="revision">263f70b8d1578b59c7c5e64b12d192cce63445a5</param>
+ <param name="revision">8bd3a03870a4372a4cd57778107c7194145aefa9</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-0.1.3.tar.bz2/droid-configs-device/patterns/hybris/jolla-hw-adaptation-hybris-droid-vibrator.yaml
^
|
@@ -1,8 +0,0 @@
-Description: Hybris HW Adaptation Pattern for Droid Vibrator
-Name: jolla-hw-adaptation-hybris-droid-vibrator
-Requires:
-- ngfd-plugin-droid-vibrator
-- qt5-feedback-haptics-droid-vibrator
-
-Summary: Jolla HW Adaptation Hybris Droid Vibrator
-
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-0.1.3.tar.bz2/droid-configs-device/patterns/hybris/jolla-hw-adaptation-hybris.yaml
^
|
@@ -1,22 +0,0 @@
-Description: Pattern with packages for the generic Hybris HW Adaptation
-Name: jolla-hw-adaptation-hybris
-Requires:
-- libhybris
-- libhybris-libEGL
-- libhybris-libGLESv1
-- libhybris-libGLESv2
-- libhybris-libOpenCL
-- libhybris-libOpenVG
-- libhybris-libhardware
-- libhybris-libnfc
-- libhybris-libsync
-- libhybris-libwayland-egl
-- libhybris-tests
-- libhybris-libvibrator
-
-- hybris-libsensorfw-qt5
-
-- qt5-plugin-generic-evdev
-
-Summary: Jolla HW Adaptation Hybris
-
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-0.1.3.tar.bz2/droid-configs-device/patterns/templates/jolla-ui-configuration-@DEVICE@.yaml
^
|
@@ -1,11 +0,0 @@
-Description: Pattern with UI related packages for @DEVICE@ configurations
-Name: jolla-ui-configuration-@DEVICE@
-Requires:
-- jolla-ambient-z@ICON_RES@
-- ambient-icons-closed-z@ICON_RES@
-
-# Introduced starting Sailfish OS 2.0.4.x:
-# 3rd party accounts like Twitter, VK, cloud services, etc
-- jolla-settings-accounts-extensions-3rd-party-all
-
-Summary: Jolla UI Configuration @DEVICE@
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-0.1.3.tar.bz2/droid-configs-device/sparse/lib/systemd/system/basic.target.wants/droid-battery-monitor.service
^
|
-(symlink to ../droid-battery-monitor.service)
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-0.1.3.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-battery-monitor.service
^
|
@@ -1,11 +0,0 @@
-[Unit]
-Description=Load and save battery aging data
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/system/bin/battery_monitor
-ExecStop=/system/bin/battery_shutdown
-
-[Install]
-WantedBy=basic.target
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-0.1.3.tar.bz2/droid-configs-device/sparse/usr/bin/droid/kill-cgroup.sh
^
|
@@ -1,74 +0,0 @@
-#!/bin/sh
-# Contact: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>
-#
-# Copyright (c) 2013, Jolla Ltd.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * Neither the name of the <organization> nor the
-# names of its contributors may be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# Kill all processes that are in this same cgroup ($1)
-[ -z "$1" ] && echo "Need cgroup path" && exit 1
-CGROUP=$1
-[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1
-
-get_pids() {
- # Get list of running pids in this cgroup
- # return list $PIDS and $NUM_PIDS
- PIDS=$(cat /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs)
- NUM_PIDS=$(echo $PIDS | wc -w)
-}
-
-kill_pids() {
- # Kill pids using signal $1
- for pid in $PIDS; do
- [ -d /proc/$pid ] && kill -$1 $pid
- done
-}
-
-# ============== main() ===============
-
-get_pids
-PREV_NUM_PIDS=$NUM_PIDS
-kill_pids TERM
-sleep 1
-WAIT=1
-get_pids
-MAX_WAIT=5
-while [ $NUM_PIDS -gt 0 -a $WAIT -lt $MAX_WAIT ]; do
- if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then
- # Number of running processes is getting smaller
- # Wait a little bit more
- sleep 1
- else
- # Number of pids is not gettting smaller
- break
- fi
- let WAIT=$WAIT+1
- PREV_NUM_PIDS=$NUM_PIDS
- get_pids
-done
-# If anyone left, hard kill them all
-[ $NUM_PIDS -gt 0 ] && kill_pids KILL
-exit 0
-
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/.gitignore
^
|
@@ -0,0 +1,3 @@
+documentation.list
+installroot/
+tmp/
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/configs/droid.kmap
^
|
@@ -1,12 +1,16 @@
keycode 100 = AltGr
-keycode 102 = Home
+keycode 353 = Select
keycode 114 = VolumeDown
keycode 115 = VolumeUp
+keycode 139 = MenuKB
+keycode 158 = Back
keycode 163 = MediaNext
keycode 164 = MediaTogglePlayPause
keycode 165 = MediaPrevious
keycode 166 = MediaStop
keycode 168 = AudioRewind
+keycode 169 = Call
+keycode 172 = HomePage
keycode 200 = MediaPlay
keycode 201 = MediaPause
keycode 208 = AudioForward
@@ -16,4 +20,5 @@
keycode 226 = ToggleCallHangup
# BTN_MISC
keycode 256 = ToggleCallHangup
-
+keycode 528 = CameraFocus
+keycode 766 = Camera
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/droid-config-@DEVICE@.spec.template
^
|
@@ -1,4 +1,5 @@
# These and other macros are documented in ../droid-configs-device/droid-configs.inc
+# Feel free to cleanup this file by removing comments, once you have memorised them ;)
%define device @DEVICE@
%define vendor @VENDOR@
@@ -6,13 +7,19 @@
%define vendor_pretty @VENDOR_PRETTY@
%define device_pretty @DEVICE_PRETTY@
-%define dcd_path ./
-
# Community HW adaptations need this
%define community_adaptation 1
-# Adjust this for your device
+# Sailfish OS is considered to-scale, if in app grid you get 4-in-a-row icons
+# and 2x2 or 3x3 covers when up-to-4 or 5-or-more apps are open respectively.
+# For 4-5.5" device screen sizes of 16:9 ratio, use this formula (hold portrait):
+# pixel_ratio = 4.5/DiagonalDisplaySizeInches * HorizontalDisplayResolution/540
+# Other screen sizes and ratios will require more trial-and-error.
%define pixel_ratio 1.0
%include droid-configs-device/droid-configs.inc
+# IMPORTANT if you want to comment out any macros in your .spec, delete the %
+# sign, otherwise they will remain defined! E.g.:
+#define some_macro "I'll not be defined because I don't have % in front"
+
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -27,10 +27,6 @@
# Nexus 5: 2.0
# Nexus 4: pixel_ratio=1.3 (icon resolution then drops to 1.0)
-# IMPORTANT if you want to comment out any macros in your .spec, delete the %
-# sign, otherwise they will remain defined! E.g.:
-#define some_macro "I'll not be defined because I don't have % in front"
-
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
# configuration files, do the following:
@@ -51,12 +47,11 @@
%define have_bluetooth 1
%endif
-# dcd_path is the base when run from hadk
-# dcd_common is the common stuff (!) and dcd_sparse is the common sparse
-%if 0%{!?dcd_path:1}
-%define dcd_path hybris/droid-configs
-%endif
+# dcd_path is defined for hysterical reasons (coming from dhd builds on OBS)
+# now obsolete, hence always the default:
+%define dcd_path .
+# dcd_common is the common stuff and dcd_sparse is the common sparse
%define dcd_common %{dcd_path}/droid-configs-device
%define dcd_sparse droid-configs-device/sparse
@@ -208,7 +203,7 @@
Provides: droid-config-flashing
Group: System
# Sparse image flashing support for flash-partition
-Requires: droid-hal-%{rpm_device}-tools
+Requires: droid-hal-tools
Summary: On device flashing files for %{rpm_device} hw
%description flashing
@@ -261,6 +256,32 @@
%description bluez4
%{summary}.
+
+%package bluez5
+Summary: %{rpm_device} packages for BlueZ 5
+Conflicts: droid-config-%{rpm_device}-bluez4
+Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
+Provides: %{rpm_device}-bluez-configs
+
+Requires: bluez5
+Conflicts: bluez
+
+Requires: bluez5-libs
+Conflicts: bluez-libs
+
+Requires: bluez5-obexd
+Conflicts: obexd
+
+Requires: kf5bluezqt-bluez5
+Conflicts: kf5bluezqt-bluez4
+
+Provides: bluez5-configs
+Conflicts: bluez-configs
+Obsoletes: bluez-configs-sailfish
+
+%description bluez5
+%{summary}.
%endif
################################################################
@@ -287,7 +308,7 @@
config_dir=$1
if [ -d $config_dir ]; then
(cd $config_dir; find . \( -type f -or -type l \) -print ) | sed 's/^.//' >> tmp/droid-config.files
- cp -R $config_dir/* $RPM_BUILD_ROOT/
+ cp -Rf $config_dir/* $RPM_BUILD_ROOT/
fi
}
@@ -356,9 +377,19 @@
done)
%endif
+# Delete files from droid-config.files which are packaged in main spec file
+if [ -e packaged-in-main-spec.files ]; then
+ delete_files tmp/droid-config.files packaged-in-main-spec.files 0
+fi
# We want to keep some files in separate subpackages.
# NOTE: some files might get to wrong place with this because of string assumption.
+%if 0%{?have_bluetooth:1}
+grep bluez4 tmp/droid-config.files > tmp/bluez4.files || true
+sed --in-place '/bluez4/d' tmp/droid-config.files
+grep bluez5 tmp/droid-config.files > tmp/bluez5.files || true
+sed --in-place '/bluez5/d' tmp/droid-config.files
+%endif
echo "%defattr(-,root,root,-)" > tmp/policy-settings.files
grep ohm tmp/droid-config.files > tmp/policy-settings.files
sed --in-place '/ohm/d' tmp/droid-config.files
@@ -370,10 +401,6 @@
sed --in-place '/\/dconf\/db\//d' tmp/droid-config.files
grep -e "flash-partition" -e "platform-updates" tmp/droid-config.files > tmp/flashing.files
sed --in-place -e '/flash-partition/d' -e '/platform-updates/d' tmp/droid-config.files
-%if 0%{?have_bluetooth:1}
-grep bluez4 tmp/droid-config.files > tmp/bluez4.files || true
-sed --in-place '/bluez4/d' tmp/droid-config.files
-%endif
%if 0%{?out_of_image_files:1}
if [ -e out-of-image-files.files ]; then
@@ -388,7 +415,6 @@
# patterns
mkdir -p %{buildroot}/usr/share/package-groups/
/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_common}/patterns/common -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}
-/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_common}/patterns/hybris -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}
/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_path}/patterns/ -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}
%if 0%{!?pixel_ratio:1}
@@ -397,12 +423,24 @@
sed --in-place 's|@PIXEL_RATIO@|%{pixel_ratio}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
+%define start_drag_distance %(awk 'BEGIN{print int(%{pixel_ratio}*20)}')
+sed --in-place 's|@START_DRAG_DISTANCE@|%{start_drag_distance}|' %{buildroot}/etc/xdg/QtProject/QPlatformTheme.conf
+
# icon_res can be only one of 1.0, 1.25, 1.5, 1.75 or 2.0 use pixel_ratio and pick closest one
%define icon_res %(awk 'BEGIN {a=int((%{pixel_ratio}-0.125)/0.25)*0.25+0.25;a=(a<=1?"1.0":(a>=2.0?"2.0":a));print a }')
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/usr/share/package-groups/*
+# In localbuilds it will break the system, because droid-hal-version-$DEVICE is
+# not built yet. Also it will pull many unnecessary things into the SDK target.
+%if 0%{?_obs_build_project:1}
+sed --in-place 's|@DEVICE@|%{rpm_device}|' %{buildroot}/etc/zypp/systemCheck.d/*.check
+%else
+sed --in-place '/systemCheck.d/d' tmp/droid-config.files
+rm -f %{buildroot}/etc/zypp/systemCheck.d/*.check
+%endif
+
# SSU board mapping for hardware adaptation
%if 0%{!?provides_own_board_mapping:1}
mkdir -p $RPM_BUILD_ROOT/%{board_mapping_dir}
@@ -413,11 +451,12 @@
-e "s|%VENDOR_PRETTY%|%{vendor_pretty}|g" \
-e "s|%ARCH%|%{_target_cpu}|g" \
droid-configs-device/ssu/board-mappings.d/05-sfe.ini.in >$RPM_BUILD_ROOT/%{board_mapping_file}
+%endif
%if 0%{?community_adaptation:1}
# Community ports have their adaptation repos on http://build.merproject.org
# Until we figure out how ssu works, we'll prevent the default adaptation0 from being created...
-sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_file}
+sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/*.ini
# ...and make a separate adaptation repo for community:
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/
sed -e 's|@DEVICE@|%{rpm_device}|g' \
@@ -426,8 +465,6 @@
>$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
%endif
-%endif
-
# Copy kickstart packs (for %%{rpm_device}-kickstart-configuration)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}
DEST_UPDATER=$RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}/hybris
@@ -510,11 +547,6 @@
done
fi
-# Delete files from droid-config.files which are packaged in main spec file
-if [ -e packaged-in-main-spec.files ]; then
- delete_files tmp/droid-config.files packaged-in-main-spec.files 0
-fi
-
################################################################
%post
# Force an update of ssu repositories
@@ -574,5 +606,7 @@
%if 0%{?have_bluetooth:1}
%files bluez4 -f tmp/bluez4.files
%defattr(644,root,root,-)
-%endif
+%files bluez5 -f tmp/bluez5.files
+%defattr(644,root,root,-)
+%endif
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
@@ -3,6 +3,7 @@
Requires:
- jolla-developer-mode
- sailfishsilica-qt5-demos
+- libhybris-tests
- busybox-static
- net-tools
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
@@ -4,8 +4,34 @@
- pattern:jolla-hw-adaptation-@DEVICE@
- pattern:jolla-sailfish-applications
- pattern:jolla-ui-wayland
+# For devices with cellular modem. Those without one, please comment out:
+- pattern:jolla-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
+- sailfish-content-graphics-z@ICON_RES@
+
+# For multi-SIM devices
+#- jolla-settings-networking-multisim
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+- jolla-settings-accounts-extensions-3rd-party-all
+
+# Introduced starting Sailfish OS 2.1.1.26
+# Required for Jolla Store Access
+- patterns-sailfish-consumer-generic
+
+# For Mozilla location services (online)
+- geoclue-provider-mlsdb
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+- csd
+
+# Devices with 2G or more memory should also include this booster
+# to improve camera startup times and the like
+#- mapplauncherd-booster-silica-qt5-media
+
Summary: Jolla Configuration @DEVICE@
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
@@ -1,10 +1,6 @@
Description: Pattern with packages for @DEVICE@ HW Adaptation
Name: jolla-hw-adaptation-@DEVICE@
Requires:
-- pattern:jolla-hw-adaptation-hybris
-- pattern:jolla-hw-adaptation-hybris-droid-vibrator
-- pattern:jolla-ui-configuration-@DEVICE@
-
- droid-hal-@DEVICE@
- droid-hal-@DEVICE@-img-boot
- droid-hal-@DEVICE@-kernel-modules
@@ -16,6 +12,21 @@
- droid-config-@DEVICE@-bluez4
- droid-hal-version-@DEVICE@
+# Hybris packages
+- libhybris-libEGL
+- libhybris-libGLESv2
+- libhybris-libwayland-egl
+
+# Sensors
+- hybris-libsensorfw-qt5
+
+# Vibra
+- ngfd-plugin-droid-vibrator
+- qt5-feedback-haptics-droid-vibrator
+
+# Needed for /dev/touchscreen symlink
+- qt5-plugin-generic-evdev
+
- pulseaudio-modules-droid
# for audio recording to work:
- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
@@ -25,18 +36,14 @@
- qt5-qpa-hwcomposer-plugin
- qtscenegraph-adaptation
-# GStreamer v0.10 multimedia support is being deprecated
-#- gstreamer0.10-droidcamsrc
-#- gstreamer0.10-omx
-#- gstreamer0.10-droideglsink
-#- nemo-qtmultimedia-plugins-gstvideotexturebackend
-
# Add GStreamer v1.0 as standard
- gstreamer1.0
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-base
- gstreamer1.0-plugins-bad
- nemo-gstreamer1.0-interfaces
+# For devices with droidmedia and gst-droid built, see HADK pdf for more information
+#- gstreamer1.0-droid
# This is needed for notification LEDs
- mce-plugin-libhybris
@@ -49,11 +56,11 @@
# Extra useful modes not officially supported:
# might need some configuration to get working
-- usb-moded-mass-storage-android-config
+#- usb-moded-mass-storage-android-config
# working but careful with roaming!
- usb-moded-connection-sharing-android-config
# android diag mode only usable for certain android tools
-- usb-moded-diag-mode-android
+#- usb-moded-diag-mode-android
# hammerhead, grouper, and maguro use this in scripts, so include for all
- rfkill
@@ -61,15 +68,12 @@
# enable device lock and allow to select untrusted software
- jolla-devicelock-plugin-encsfa
-# Settings app needs this since update15
-- jolla-settings-layout
-
-# For devices with working cellular modem:
-#- pattern:jolla-sailfish-cellular-apps
-#- telepathy-ring
+# For GPS
+- geoclue-provider-hybris
-# For devices where test_gps eventually gets a fix:
-#- geoclue-provider-hybris
+# For FM radio on some QCOM devices
+#- qt5-qtmultimedia-plugin-mediaservice-irisradio
+#- jolla-mediaplayer-radio
Summary: Jolla HW Adaptation @DEVICE@
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
@@ -29,7 +29,14 @@
load-module module-meego-mainvolume virtual_stream=true
### Automatically restore the volume of streams
-load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false sink_volume_table=/etc/pulse/x-maemo-sink-volume.table
+# load configuration based on bluez version
+.ifexists /etc/pulse/bluez4_stream_restore.pa
+.include /etc/pulse/bluez4_stream_restore.pa
+.endif
+
+.ifexists /etc/pulse/bluez5_stream_restore.pa
+.include /etc/pulse/bluez5_stream_restore.pa
+.endif
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -41,12 +48,16 @@
load-module module-droid-card rate=48000 mute_routing_before=24576 mute_routing_after=4096
+### Needed on many new devices. HADK guide explains how to implement this fully
+.ifexists module-droid-glue.so
+load-module module-droid-glue
+.endif
+
load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
-load-module module-bluez4-discover sco_sink=sink.fake.sco sco_source=source.fake.sco
+load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
-### Needed on many new devices. HADK guide explains how to implement this fully
-#load-module module-droid-glue
+load-module module-combine-sink sink_name=sink.primaryandbluez resample_method=trivial rate=48000 channels=2 ignore=sink.low_latency
load-module module-policy-enforcement
@@ -102,7 +113,7 @@
load-module module-dbus-protocol
.endif
-load-module module-switch-on-port-available
+load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
### Make some devices default
set-default-sink sink.primary
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez4_stream_restore.pa
^
|
@@ -0,0 +1,2 @@
+### Bluez4 specific module arguments
+load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false sink_volume_table=/etc/pulse/x-maemo-sink-volume.table
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez5_stream_restore.pa
^
|
@@ -0,0 +1,2 @@
+### Bluez5 specific module arguments
+load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
@@ -26,7 +26,7 @@
[group]
name = feedbacksound
-flags = route_audio, limit_volume, cork_stream, mute_by_route
+flags = set_sink, limit_volume, cork_stream, mute_by_route
sink = sink.primary
source = sink.null.monitor
@@ -159,132 +159,6 @@
# -------- Card section --------------------------------------------------------
-[card]
-type = tvoutandbta2dp
-name = startswith:"bluez_card"
-profile = a2dp
-flags = disable_notify
-
-
-[card]
-type = bta2dp
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-
-[card]
-type = bta2dpforalien
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:droid_card.primary
-profile1 = communication
-
-[card]
-type = tvoutandbthsp
-name = startswith:"bluez_card"
-profile = hsp
-flags = disable_notify
-
-[card]
-type = ihfandbthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-flags = disable_notify
-
-[card]
-type = bthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-
-[card]
-type = bthspforcall
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = voicecall
-
-[card]
-type = bthspforalien
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = communication
-
-[card]
-type = ihfandheadset
-name = equals:droid_card.primary
-profile = ringtone
-
-[card]
-type = ihfandheadphone
-name = equals:droid_card.primary
-profile = ringtone
-
-[card]
-type = headset
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = headsetforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = headsetforalien
-name = equals:droid_card.primary
-profile = communication
-
-[card]
-type = headphone
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = headphoneforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = headphoneforalien
-name = equals:droid_card.primary
-profile = communication
-
-[card]
-type = ihfandtvout
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = earpiece
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = earpieceforalien
-name = equals:droid_card.primary
-profile = communication
-
-[card]
-type = ihfforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = ihf
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = ihfforalien
-name = equals:droid_card.primary
-profile = communication
-
# -------- Device section ------------------------------------------------------
[device]
@@ -292,19 +166,6 @@
sink = name@startswith:"bluez_sink"
[device]
-type = tvoutandbthsp
-sink = equals:sink.primary
-
-[device]
-type = tvoutandbthsp
-source = equals:source.primary
-
-[device]
-type = ihfandbthsp
-sink = equals:sink.primary
-ports = sink.primary:output-speaker
-
-[device]
type = ihfandheadset
sink = equals:sink.primary
ports = sink.primary:output-speaker+wired_headphone
@@ -368,6 +229,42 @@
flags = disable_notify, refresh_always
[device]
+type = bthfp
+sink = equals:sink.primary
+ports = sink.primary:output-bluetooth_sco
+flags = disable_notify, refresh_always
+
+[device]
+type = bthfp
+source = equals:source.primary
+ports = source.primary:input-bluetooth_sco_headset
+flags = disable_notify, refresh_always
+
+[device]
+type = bthfpforcall
+sink = equals:sink.primary
+ports = sink.primary:output-bluetooth_sco
+flags = disable_notify, refresh_always, delayed_port_change
+
+[device]
+type = bthfpforcall
+source = equals:source.primary
+ports = source.primary:input-bluetooth_sco_headset
+flags = disable_notify, refresh_always
+
+[device]
+type = bthfpforalien
+sink = equals:sink.primary
+ports = sink.primary:output-bluetooth_sco
+flags = disable_notify, refresh_always, delayed_port_change
+
+[device]
+type = bthfpforalien
+source = equals:source.primary
+ports = source.primary:input-bluetooth_sco_headset
+flags = disable_notify, refresh_always
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
@@ -0,0 +1,180 @@
+# -------- Card section ------------------------------------------------------
+
+[card]
+type = ihfandheadset
+name = equals:droid_card.primary
+profile = ringtone
+
+[card]
+type = ihfandheadphone
+name = equals:droid_card.primary
+profile = ringtone
+
+[card]
+type = headset
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = headsetforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = headsetforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = headphone
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = headphoneforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = headphoneforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = ihfandtvout
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = earpiece
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = earpieceforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = earpieceforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = ihfforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = ihf
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = ihfforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = bthsp
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthspforcall
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthspforalien
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = communication
+
+[card]
+type = bthfp
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthfpforcall
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthfpforalien
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = communication
+
+[card]
+type = tvoutandbta2dp
+name = startswith:"bluez_card"
+profile = a2dp
+flags = disable_notify
+
+[card]
+type = bta2dp
+name0 = startswith:"bluez_card"
+profile0 = a2dp
+name1 = equals:droid_card.primary
+profile1 = primary-primary
+
+[card]
+type = bta2dpforalien
+name0 = startswith:"bluez_card"
+profile0 = a2dp
+name1 = equals:droid_card.primary
+profile1 = communication
+
+# -------- Context rule section ------------------------------------------------
+
+[context-rule]
+variable = bluetooth_override
+value = equals:active
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
+
+[context-rule]
+variable = bluetooth_override
+value = equals:inactive
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:inactive
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"false"
+
+[context-rule]
+variable = call
+value = equals:incoming
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:outgoing
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:inactive
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
+
+[context-rule]
+variable = call
+value = equals:incoming
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
+
+[context-rule]
+variable = call
+value = equals:outgoing
+set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
@@ -0,0 +1,193 @@
+# -------- Card section --------------------------------------------------------
+
+[card]
+type = tvoutandbta2dp
+name = startswith:"bluez_card"
+profile = a2dp
+flags = disable_notify
+
+
+[card]
+type = bta2dp
+name0 = startswith:"bluez_card"
+profile0 = a2dp_sink
+name1 = equals:droid_card.primary
+profile1 = primary-primary
+flags1 = disable_notify
+
+[card]
+type = bta2dpforalien
+name0 = startswith:"bluez_card"
+profile0 = a2dp_sink
+name1 = equals:droid_card.primary
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = bthsp
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
+profile1 = primary-primary
+flags1 = disable_notify
+
+[card]
+type = bthspforcall
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+flags1 = disable_notify
+
+[card]
+type = bthspforalien
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = bthfp
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
+profile1 = primary-primary
+flags1 = disable_notify
+
+[card]
+type = bthfpforcall
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+flags1 = disable_notify
+
+[card]
+type = bthfpforalien
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = ihfandheadset
+name0 = equals:droid_card.primary
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfandheadphone
+name0 = equals:droid_card.primary
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headset
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headsetforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headsetforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphone
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphoneforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphoneforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfandtvout
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpiece
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihf
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/xdg/QtProject/QPlatformTheme.conf
^
|
@@ -0,0 +1,2 @@
+[GenericUnixTheme]
+StartDragDistance=@START_DRAG_DISTANCE@
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/xdg/QtProject/QtQuick2.conf
^
|
@@ -0,0 +1,2 @@
+[QuickMouseArea]
+PressAndHoldDelay=600
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
@@ -0,0 +1,6 @@
+requires:droid-hal-@DEVICE@
+requires:droid-config-@DEVICE@
+requires:droid-hal-version-@DEVICE@
+requires:libhybris-libEGL
+requires:libhybris-libGLESv2
+requires:libhybris-libwayland-egl
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd.service
^
|
@@ -7,3 +7,4 @@
[Service]
Environment=PATH=/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
ExecStart=/sbin/adbd
+Restart=always
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
@@ -13,7 +13,7 @@
Type=notify
NotifyAccess=all
ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
-ExecStop=/usr/bin/droid/kill-cgroup.sh %c
+ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh %c
Restart=always
# Lets make sure we don't block minutes in case of errors.
TimeoutSec=15
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
@@ -11,3 +11,5 @@
SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/platform/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/bootdevice/by-name/$env{ID_PART_ENTRY_NAME}"
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
@@ -0,0 +1,93 @@
+#!/bin/sh
+# Contact: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>
+#
+# Copyright (c) 2013, Jolla Ltd.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# * Neither the name of the <organization> nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The following should be in /init.rc, so init will shut everything down:
+# on property:hybris.shutdown=*
+# class_stop late_start
+# class_stop main
+# class_stop core
+
+# Kill all processes that are in this same cgroup ($1)
+[ -z "$1" ] && echo "Need cgroup path" && exit 1
+CGROUP=$1
+[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1
+
+get_pids() {
+ # Get list of running pids in this cgroup
+ # return list $PIDS and $NUM_PIDS
+ PIDS=$(cat /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs)
+ NUM_PIDS=$(echo $PIDS | wc -w)
+ echo Android service PIDs remaining: $NUM_PIDS
+}
+
+# ============== main() ===============
+
+get_pids
+PREV_NUM_PIDS=$NUM_PIDS
+# This android property is supposed to ensure a shutdown if system-server crashes
+# We don't use it, but some init scripts watch for it as a signal to shut other things down
+/usr/bin/setprop sys.shutdown.requested 1
+
+echo Shutting down droid-hal-init services
+/usr/bin/setprop hybris.shutdown 1
+
+sleep 1
+WAIT=1
+get_pids
+MAX_WAIT=5
+# -gt 1 because droid-hal-init is also in this cgroup
+while [ $NUM_PIDS -gt 1 -a $WAIT -lt $MAX_WAIT ]; do
+ let WAIT=$WAIT+1
+ if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then
+ # Number of running processes is getting smaller
+ # Wait a little bit more
+ sleep 1
+ else
+ # Number of pids is not gettting smaller
+ break
+ fi
+ PREV_NUM_PIDS=$NUM_PIDS
+ get_pids
+done
+
+echo Killing droid-hal-init
+killall droid-hal-init
+
+echo Killing processes hybris.shutdown missed
+get_pids
+if [ $NUM_PIDS -gt 0 ]; then
+ killall $PIDS
+ sleep 1
+ get_pids
+ if [ $NUM_PIDS -gt 0 ]; then
+ killall -s 9 $PIDS
+ fi
+fi
+
+exit 0
+
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-startup.sh
^
|
@@ -1,6 +1,5 @@
#!/bin/sh
cd /
-sh /usr/libexec/droid/android-permission-fixup.sh &> /dev/null
touch /dev/.coldboot_done
export LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib/:/vendor/lib:/system/lib
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/btmono
^
|
@@ -1,2 +1,2 @@
-x-nemo.mainvolume.call = "0:-20000,1:-6175,2:-4875,3:-4225,4:-3625,5:-3025,6:-2425,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-450,14:-225,15:0"
+x-nemo.mainvolume.call = "0:-20000,1:-6175,2:-4875,3:-3625,4:-3025,5:-2425,6:-2025,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-250,14:-125,15:0"
x-nemo.mainvolume.media = "0:-20000,1:-6175,2:-4875,3:-4225,4:-3625,5:-3025,6:-2425,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-450,14:-225,15:0"
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/patterns/jolla-hw-adaptation-thea.yaml
^
|
@@ -11,6 +11,7 @@
- droid-hal-thea
- droid-hal-thea-img-boot
- droid-hal-thea-kernel-modules
+- droid-hal-thea-detritus
- droid-config-thea-sailfish
- droid-config-thea-pulseaudio-settings
- droid-config-thea-policy-settings
@@ -20,7 +21,9 @@
- droid-hal-version-thea
- pulseaudio-modules-droid
+# Fix for calls
- pulseaudio-modules-droid-glue
+
# for audio recording to work:
- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/Bluetooth_cal.acdb
^
|
+(symlink to /system/etc/Bluetooth_cal.acdb)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/General_cal.acdb
^
|
+(symlink to /system/etc/General_cal.acdb)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/Global_cal.acdb
^
|
+(symlink to /system/etc/Global_cal.acdb)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/Handset_cal.acdb
^
|
+(symlink to /system/etc/Handset_cal.acdb)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/Hdmi_cal.acdb
^
|
+(symlink to /system/etc/Hdmi_cal.acdb)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/Headset_cal.acdb
^
|
+(symlink to /system/etc/Headset_cal.acdb)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/Speaker_cal.acdb
^
|
+(symlink to /system/etc/Speaker_cal.acdb)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/clatd.conf
^
|
+(symlink to /system/etc/clatd.conf)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/gps.conf
^
|
+(symlink to /system/etc/gps.conf)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/izat.conf
^
|
+(symlink to /system/etc/izat.conf)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/media_codecs.xml
^
|
+(symlink to /system/etc/media_codecs.xml)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/media_codecs_ffmpeg.xml
^
|
+(symlink to /system/etc/media_codecs_ffmpeg.xml)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/media_codecs_google_audio.xml
^
|
+(symlink to /system/etc/media_codecs_google_audio.xml)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/media_codecs_google_telephony.xml
^
|
+(symlink to /system/etc/media_codecs_google_telephony.xml)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/media_codecs_google_video.xml
^
|
+(symlink to /system/etc/media_codecs_google_video.xml)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/media_profiles.xml
^
|
+(symlink to /system/etc/media_profiles.xml)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/pulse/arm_qualcomm_msm_8226_thea.pa
^
|
@@ -23,6 +23,8 @@
.fail
+load-module module-udev-detect
+
load-module module-droid-keepalive
load-module module-meego-parameters cache=1 directory=/var/lib/nemo-pulseaudio-parameters use_voice=false
@@ -47,8 +49,8 @@
load-module module-meego-mainvolume virtual_stream=true
### changed to route_sources_first=true for FM-Radio
-#load-module module-policy-enforcement
-load-module module-policy-enforcement route_sources_first=true
+load-module module-policy-enforcement
+#iload-module module-policy-enforcement route_sources_first=true
load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/pulse/xpolicy.conf
^
|
@@ -19,8 +19,14 @@
source = sink.null.monitor
[group]
+name = btnotify
+flags = set_sink, limit_volume, cork_stream, mute_by_route
+sink = sink.primaryandbluez
+source = sink.null.monitor
+
+[group]
name = feedbacksound
-flags = route_audio, limit_volume, cork_stream, mute_by_route
+flags = set_sink, limit_volume, cork_stream, mute_by_route
sink = sink.primary
source = sink.null.monitor
@@ -51,13 +57,12 @@
[group]
name = player
flags = route_audio, limit_volume, cork_stream
-#flags = limit_volume, cork_stream
sink = sink.primary
source = source.primary
[group]
name = game
-flags = set_sink, limit_volume, cork_stream
+flags = route_audio, limit_volume, cork_stream
sink = sink.primary
source = source.primary
@@ -69,7 +74,6 @@
[group]
name = ringtone
-#flags = set_sink, limit_volume, mute_by_route
flags = limit_volume, mute_by_route, cork_stream, media_notify
sink = sink.primary
source = source.null.monitor
@@ -106,7 +110,7 @@
[group]
name = cstone
-flags = set_sink, set_source, limit_volume
+flags = route_audio, set_source, limit_volume
sink = sink.primary
source = sink.null.monitor
@@ -146,127 +150,20 @@
sink = sink.primary
source = source.primary
+[group]
+name = aliencall
+flags = route_audio, limit_volume, cork_stream
+sink = sink.primary
+source = source.primary
-# -------- Card section --------------------------------------------------------
-[card]
-type = tvoutandbta2dp
-name = startswith:"bluez_card"
-profile = a2dp
-flags = disable_notify
-
-
-[card]
-type = bta2dp
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-
-[card]
-type = tvoutandbthsp
-name = startswith:"bluez_card"
-profile = hsp
-flags = disable_notify
-
-[card]
-type = ihfandbthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-flags = disable_notify
-
-[card]
-type = bthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-
-[card]
-type = bthspforcall
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = voicecall
-
-#[card]
-#type = bthsp
-#name = equals:droid_card.primary
-#profile = voicecall
-
-[card]
-type = ihfandheadset
-name = equals:droid_card.primary
-profile = ringtone
-
-[card]
-type = ihfandheadphone
-name = equals:droid_card.primary
-profile = ringtone
-
-[card]
-type = headset
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = headsetforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = headphone
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = headphoneforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = ihfandtvout
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = earpiece
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = ihfforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = ihf
-name = equals:droid_card.primary
-profile = primary-primary
+# -------- Card section --------------------------------------------------------
# -------- Device section ------------------------------------------------------
[device]
type = tvoutandbta2dp
sink = name@startswith:"bluez_sink"
-#ports =
-
-[device]
-type = tvoutandbthsp
-sink = equals:sink.primary
-#ports =
-
-[device]
-type = tvoutandbthsp
-source = equals:source.primary
-#ports
-
-[device]
-type = ihfandbthsp
-sink = equals:sink.primary
-ports = sink.primary:output-speaker
[device]
type = ihfandheadset
@@ -290,29 +187,79 @@
flags = disable_notify
[device]
+type = bta2dpforalien
+sink = name@startswith:"bluez_sink"
+ports = sink.primary:output-speaker
+flags = disable_notify
+
+[device]
type = bthsp
-#sink = equals:sink.fake.sco
sink = equals:sink.primary
ports = sink.primary:output-bluetooth_sco
flags = disable_notify, refresh_always
[device]
type = bthsp
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/pulse/xpolicy.conf.d/usbaudio.conf
^
|
@@ -0,0 +1,9 @@
+[device]
+type = usbaudio
+sink = name@startswith:"alsa_output."
+flags = refresh_always
+
+[device]
+type = usbaudio
+source= name@startswith:"alsa_input."
+flags = refresh_always
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/sap.conf
^
|
+(symlink to /system/etc/sap.conf)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/sec_config
^
|
+(symlink to /system/etc/sec_config)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/thermal-engine-8226.conf
^
|
+(symlink to /system/etc/thermal-engine-8226.conf)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/xtra_root_cert.pem
^
|
+(symlink to /system/etc/xtra_root_cert.pem)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-thea-0.1.4.tar.bz2/sparse/etc/xtwifi.conf
^
|
+(symlink to /system/etc/xtwifi.conf)
|