|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -10,4 +10,4 @@
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
-</service></services>
+</service></services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -74,7 +74,7 @@
Group: Configs
License: GPLv2
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: ssu-kickstart-configuration-jolla
+BuildRequires: ssu-kickstart-configuration
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
@@ -152,7 +152,7 @@
%package kickstart-configuration
Summary: Kickstart configuration for %{rpm_device}
Provides: droid-config-kickstart-configuration
-Requires: ssu-kickstart-configuration-jolla
+Requires: ssu-kickstart-configuration
Provides: droid-hal-kickstart-configuration
# the %{name} contains ssu.ini file which is needed to build kickstarts
Requires: %{name} = %{version}-%{release}
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -75,8 +75,5 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
-# For devices with SD Card
-#- sd-utils
-
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -40,6 +40,12 @@
.fail
.endif
+.ifexists module-droid-hidl.so
+ .nofail
+ load-module module-droid-hidl
+ .fail
+.endif
+
load-module module-meego-parameters cache=1 directory=/var/lib/nemo-pulseaudio-parameters use_voice=false
load-module module-meego-mainvolume virtual_stream=true
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -43,6 +43,10 @@
# -------- Group section -------------------------------------------------------
[group]
+name = othermedia
+flags = route_audio, limit_volume, cork_stream
+
+[group]
name = idle
flags = nopolicy
sink = sink.null
@@ -203,6 +207,13 @@
delay = $delay_time
[device]
+type = ihfandlineout
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-speaker+wired_headphone
+flags = $droid_sink_port_change_delay
+delay = $delay_time
+
+[device]
type = bta2dp
sink = startswith:"bluez_sink"
ports = droid.output.primary@equals:"true"->output-speaker
@@ -343,6 +354,26 @@
flags = refresh_always
[device]
+type = lineout
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = disable_notify, refresh_always, $droid_sink_port_change_delay
+delay = $delay_time
+
+[device]
+type = lineoutforcall
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = refresh_always, delayed_port_change
+delay = 200
+
+[device]
+type = lineoutforalien
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = refresh_always
+
+[device]
type = ihfandtvout
sink = droid.output.media_latency@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
@@ -542,3 +573,8 @@
variable = media_state
value = matches:"^[^t].*"
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.media.state", value@copy-from-context
+
+[context-rule]
+variable = emergency_call
+value = matches:".*"
+set-property = module-name@equals:module-policy-enforcement, property:"x.emergency_call.state", value@copy-from-context
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -11,6 +11,11 @@
profile = ringtone
[card]
+type = ihfandlineout
+name = equals:$droid_card
+profile = ringtone
+
+[card]
type = headset
name = equals:$droid_card
profile = $droid_card_profile
@@ -40,6 +45,21 @@
name = equals:$droid_card
profile = communication
+[card]
+type = lineout
+name = equals:$droid_card
+profile = $droid_card_profile
+
+[card]
+type = lineoutforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = lineoutforalien
+name = equals:$droid_card
+profile = communication
+
[card]
type = ihfandtvout
name = equals:$droid_card
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -88,6 +88,14 @@
flags1 = disable_notify
[card]
+type = ihfandlineout
+name0 = equals:$droid_card
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
type = headset
name0 = equals:$droid_card
profile0= $droid_card_profile
@@ -136,6 +144,30 @@
flags1 = disable_notify
[card]
+type = lineout
+name0 = equals:$droid_card
+profile0= $droid_card_profile
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
+type = lineoutforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
+type = lineoutforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
type = ihfandtvout
name0 = equals:$droid_card
profile0= $droid_card_profile
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
| @@ -18,6 +18,19 @@
flags = refresh_always, module_unload_immediately
[device]
+type = lineoutasfmradio
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+flags = refresh_always
+
+[device]
+type = lineoutasfmradiolp
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20source_output_properties='media.name=fmradio-loopback-source'%20latency_msec=250
+flags = refresh_always, module_unload_immediately
+
+[device]
type = headsetasfmradio
source= droid.input.external@equals:true
ports = droid.input.external@equals:true->$droid_source_input_fmradio
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
| @@ -12,6 +12,10 @@
[Service]
Type=notify
NotifyAccess=all
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=true
+ExecStartPre=-/bin/sh /usr/bin/droid/droid-hal-early-init.sh
ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh %c
Restart=always
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -4,7 +4,6 @@
SUBSYSTEM=="adsp", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="msm_camera", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="mtd", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="block", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="misc", KERNEL=="log_events", SYMLINK+="alog/events"
SUBSYSTEM=="misc", KERNEL=="log_radio", SYMLINK+="alog/radio"
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
@@ -60,3 +59,5 @@
# NOTE: if the comment marked with (1) applies then this will not do anything.
ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/by-name/$env{ID_PART_ENTRY_NAME}"
+SUBSYSTEM=="firmware", ACTION=="add", RUN="/usr/bin/droid/droid-load-firmware.sh"
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-startup.sh
^
|
| @@ -2,13 +2,7 @@
cd /
touch /dev/.coldboot_done
-if [ "$(uname -m | grep -o 64)" == "64" ]; then
- # for 64 bit use the default LD_LIBRARY_PATH, otherwise we get conflicts.
- export LD_LIBRARY_PATH=
-else
- # for 32 bit, this is safe
- export LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib/:/vendor/lib:/system/lib
-fi
+export LD_LIBRARY_PATH=
# Save systemd notify socket name to let droid-init-done.sh pick it up later
echo $NOTIFY_SOCKET > /run/droid-hal/notify-socket-name
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-bullhead-1+hybris.15.1.20190814110517.436f419.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-load-firmware.sh
^
|
| @@ -0,0 +1,32 @@
+#!/bin/sh
+
+FIRMWARE_FOLDERS="/system/etc/firmware/ /odm/firmware/ /vendor/firmware/ /firmware/image/"
+
+log() {
+ logger -p daemon.info -t firmware "$@"
+}
+
+log "Attempting to load firmware $FIRMWARE for $DEVPATH"
+
+if [ -e /sys$DEVPATH/loading ]; then
+ for folder in $FIRMWARE_FOLDERS; do
+ if [ -e "$folder/$FIRMWARE" ]; then
+ log "Loading firmware $folder/$FIRMWARE"
+
+ echo 1 > /sys$DEVPATH/loading
+ cat "$folder/$FIRMWARE" > /sys$DEVPATH/data
+ echo 0 > /sys$DEVPATH/loading
+
+ log "Loaded firmware $FIRMWARE"
+ exit 0
+ fi
+ done
+
+ log "Failed to find firmware $FIRMWARE for $DEVPATH"
+ echo "\-1" > /sys$DEVPATH/loading
+ exit 1
+else
+ log "Failed to find /sys$DEVPATH/loading, could not load $FIRMWARE."
+ exit 1
+fi
+
|
