|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/MisterMagisterDev/droid-config-titan.git</param>
<param name="branch">hybris-12.1</param>
- <param name="revision">d6fe5fc20c79dbc3ee936949a72070468a20c729</param>
+ <param name="revision">36559593e298001f6b19ae2afedf05eb6585aabd</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.1.1.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -203,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
@@ -423,12 +423,17 @@
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/*
+sed --in-place 's|@DEVICE@|%{rpm_device}|' %{buildroot}/etc/zypp/systemCheck.d/*.check
+
# SSU board mapping for hardware adaptation
%if 0%{!?provides_own_board_mapping:1}
mkdir -p $RPM_BUILD_ROOT/%{board_mapping_dir}
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.1.1.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
@@ -48,7 +55,9 @@
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"
+
+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
@@ -104,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-titan-1.1.1.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-titan-1.1.1.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-titan-1.1.1.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-titan-1.1.1.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
+
+[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
+
+[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
+
+[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
+
+[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
+
+[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-titan-1.1.1.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
+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
+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
+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
+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
+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
+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
+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-titan-1.1.1.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-titan-1.1.1.tar.bz2/droid-configs-device/sparse/etc/xdg/QtProject/QtQuick2.conf
^
|
| @@ -0,0 +1,2 @@
+[QuickMouseArea]
+PressAndHoldDelay=600
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.1.1.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-titan-1.1.1.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-titan-1.1.1.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
Restart=always
# Lets make sure we don't block minutes in case of errors.
TimeoutSec=15
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.1.1.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-titan-1.1.1.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
| @@ -0,0 +1,81 @@
+#!/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
+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
+
+echo All done. Killing droid-hal-init
+killall droid-hal-init
+
+exit 0
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.1.1.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-titan-1.1.1.tar.bz2/patterns/jolla-hw-adaptation-titan.yaml
^
|
| @@ -14,6 +14,8 @@
- droid-config-titan-pulseaudio-settings
- droid-config-titan-policy-settings
- droid-config-titan-preinit-plugin
+- droid-config-titan-flashing
+- droid-config-titan-bluez4
- droid-hal-version-titan
# Hybris packages
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.1.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
-
|
