[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea.spec
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20180301072908.be29738.tar.bz2/droid-configs-device/sparse/etc/lowi.conf
^
|
-(symlink to /system/etc/lowi.conf)
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20180301072908.be29738.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
@@ -1,35 +0,0 @@
-# To enable PulseAudio fmradio device configuration make a symlink from
-# this file to fmradio.conf in sparse/etc/pulse/xpolicy.conf.d
-# If input fm port is different from default add
-# sparse/etc/pulse/xpolicy.conf.d/xvars.conf with input port name
-# used in your device.
-
-[device]
-type = headphoneasfmradio
-source= droid.input.external@equals:true
-ports = droid.input.external@equals:true->$droid_source_input_fmradio
-flags = refresh_always
-
-[device]
-type = headphoneasfmradiolp
-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'%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
-flags = refresh_always
-
-[device]
-type = headsetasfmradiolp
-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'%20latency_msec=250
-flags = refresh_always, module_unload_immediately
-
-[stream]
-property = media.name@equals:"fmradio-loopback"
-group = player
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20180301072908.be29738.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/usbaudio.conf.disabled
^
|
@@ -1,19 +0,0 @@
-# To enable USB-OTG audio add a file
-# sparse/etc/udev/rules.d/99-pulseaudio-ignore-builtin-card.rules with contents
-#
-# KERNEL=="<CARD-HERE>", SUBSYSTEM=="sound", ATTR{id}=="<DEVICE-ID-HERE>", ENV{PULSE_IGNORE}="1"
-#
-# where you can determine <CARD-HERE> (usually card0) and <DEVICE-ID-HERE> with
-# $ udevadm info -a /dev/snd/by-path/*
-#
-# and in sparse/etc/pulse/xpolicy.conf.d make a symlink from this file to usbaudio.conf
-
-[device]
-type = usbaudio
-sink = startswith:"alsa_output."
-flags = refresh_always
-
-[device]
-type = usbmic
-source= startswith:"alsa_input."
-flags = refresh_always
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-thea-1+master.20180301072908.be29738.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/modes/usbaudio/mainvolume
^
|
-(symlink to ../../algs/mainvolume/lineout)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -135,9 +135,9 @@
Requires: ohm-plugin-ruleengine
Requires: ohm-plugin-profile
Requires: ohm-plugin-route
-Requires: pulseaudio-modules-nemo-common >= 11.1.24
-Requires: pulseaudio-policy-enforcement >= 11.1.35
-Requires: policy-settings-common >= 0.7.3
+Requires: pulseaudio-modules-nemo-common >= 4.0.11
+Requires: pulseaudio-policy-enforcement >= 4.0.8
+Requires: policy-settings-common >= 0.2.7
Obsoletes: ohm-config <= 1.1.15
# ohm-configs-default should not be installed ever, thus no version
# specification defined here.
@@ -172,12 +172,12 @@
%package pulseaudio-settings
Summary: PulseAudio settings for %{rpm_device} hw
Provides: droid-config-pulseaudio-settings
-Requires: pulseaudio >= 11.1
-Requires: pulseaudio-modules-nemo-parameters >= 11.1.24
-Requires: pulseaudio-modules-nemo-stream-restore >= 11.1.24
-Requires: pulseaudio-modules-nemo-mainvolume >= 11.1.24
-Requires: pulseaudio-modules-droid >= 11.1.66
-Requires: pulseaudio-policy-enforcement >= 11.1.35
+Requires: pulseaudio >= 4.0
+Requires: pulseaudio-modules-nemo-parameters >= 4.0.11
+Requires: pulseaudio-modules-nemo-stream-restore >= 4.0.11
+Requires: pulseaudio-modules-nemo-mainvolume >= 4.0.11
+Requires: pulseaudio-modules-droid >= 4.0.6
+Requires: pulseaudio-policy-enforcement >= 6.0.20
Provides: pulseaudio-settings
%description pulseaudio-settings
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/kickstart/pack_package-droid-updater
^
|
@@ -2,7 +2,7 @@
DEVICE=@DEVICE@
-VERSION_FILE=./os-release
+VERSION_FILE=./sailfish-release
source $VERSION_FILE
# Locate rootfs tar.bz2 archive.
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/kickstart/post_nochroot/hybris
^
|
@@ -1,8 +1 @@
-cp $INSTALL_ROOT/etc/os-release $IMG_OUT_DIR
-ls -l $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini &> /dev/null
-if [ "$?" == "0" ]; then
- for CFILE in $(ls -1 $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini); do
- CUSTOMER_TMP+=${CUSTOMER_TMP:+ }$(grep -i "^name[ ]*=" $CFILE | sed 's/^.*=[ \t]*//')
- done
- echo "SAILFISH_CUSTOMER=\""$(echo ${CUSTOMER_TMP} | sed 's![/ ()]\+!_!g')"\"" >> $IMG_OUT_DIR/os-release
-fi
+cp $INSTALL_ROOT/etc/sailfish-release $IMG_OUT_DIR
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
@@ -11,7 +11,6 @@
- openssh-server
- vim-enhanced
- zypper
-- strace
# jolla-rnd-device will enable usb-moded even when UI is not yet
# brought up (useful during development, available since update10)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
@@ -2,11 +2,10 @@
Name: jolla-configuration-@DEVICE@
Requires:
- pattern:jolla-hw-adaptation-@DEVICE@
-
-- patterns-sailfish-applications
-- patterns-sailfish-ui
+- pattern:jolla-sailfish-applications
+- pattern:jolla-ui-wayland
# For devices with cellular modem. Those without one, please comment out:
-- patterns-sailfish-cellular-apps
+- pattern:jolla-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
@@ -9,7 +9,7 @@
- droid-config-@DEVICE@-policy-settings
- droid-config-@DEVICE@-preinit-plugin
- droid-config-@DEVICE@-flashing
-- droid-config-@DEVICE@-bluez5
+- droid-config-@DEVICE@-bluez4
- droid-hal-version-@DEVICE@
# Hybris packages
@@ -21,8 +21,8 @@
- hybris-libsensorfw-qt5
# Vibra
-- ngfd-plugin-native-vibrator
-- qt5-feedback-haptics-native-vibrator
+- ngfd-plugin-droid-vibrator
+- qt5-feedback-haptics-droid-vibrator
# Needed for /dev/touchscreen symlink
- qt5-plugin-generic-evdev
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
@@ -30,10 +30,12 @@
### Automatically restore the volume of streams
# 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
-.else
- .include /etc/pulse/bluez4_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
@@ -44,28 +46,24 @@
load-module module-null-sink sink_name=sink.null rate=48000
-### If droid-card needs other arguments than the default, have the new
-### load-module line in /etc/pulse/arm_droid_card_custom.pa
-.ifexists /etc/pulse/arm_droid_card_custom.pa
- .include /etc/pulse/arm_droid_card_custom.pa
-.else
- load-module module-droid-card rate=48000
-.endif
+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
- .nofail
- load-module module-droid-glue
- .fail
+.nofail
+load-module module-droid-glue
+.fail
.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-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
-load-module module-role-ducking trigger_roles=notification,warning ducking_roles=x-maemo volume=-12dB
+load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
### Load several protocols
.ifexists module-esound-protocol-unix.so
@@ -117,7 +115,8 @@
load-module module-dbus-protocol
.endif
-### Move orphan streams to placeholder sinks or sources so that playback doesn't get
-### interrupted. Policy enforcement module then moves the streams to new appropriate
-### sinks or sources.
load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
+
+### Make some devices default
+set-default-sink sink.primary
+set-default-source source.primary
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
@@ -1,45 +1,3 @@
-# -------- xpolicy.conf --------------------------------------------------------
-#
-# Files are read in following order,
-# 1) xpolicy.conf
-# 2) xpolicy.conf.d/*.conf, in descending order
-#
-# Variables can be defined anywhere, and they affect all the conf files. Variables
-# are updated if same variable is defined later on (for example variables in
-# xpolicy.conf.d/xvars.conf are applied most likely latest and are the active
-# ones). Variables can be used to replace any string configuration value
-# (NOT match types, etc.). For example following stream definition is valid:
-#
-# [stream]
-# property = $property_name@equals:$property_value
-# group = $group_name
-#
-# or for context definition following property action is valid:
-# set-property = sink-name@equals:$sink, property:$string, value@constant:$value
-#
-# Other sections than [variable] can also be defined in any conf file, and already
-# defined ones will be overridden by later definition.
-#
-
-
-# -------- Variable section ----------------------------------------------------
-
-# Defaults. To override define variables with new values
-# in xpolicy.conf.d directory (for example xpolicy.conf.d/xvars.conf).
-[variable]
-# sinks, sources and ports
-droid_source_input_microphone = input-builtin_mic
-droid_source_input_backmicrophone = input-back_mic
-droid_source_input_fmradio = input-fm_tuner
-droid_sink_port_change_delay = delayed_port_change
-delay_time = 150
-# cards and profiles
-droid_card = droid_card.primary
-droid_card_profile = default
-# bluetooth sco
-droid_sco_output = output-bluetooth_sco
-droid_sco_input = input-bluetooth_sco_headset
-
# -------- Group section -------------------------------------------------------
[group]
@@ -51,102 +9,122 @@
[group]
name = background
flags = limit_volume, cork_stream
-sink = droid.output.media_latency@equals:"true"
-source = droid.input.builtin@equals:"true"
+sink = sink.primary
+source = source.primary
[group]
name = systemsound
flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = droid.output.media_latency@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = btnotify
-flags = set_sink, limit_volume, cork_stream, mute_by_route, dynamic_sink
-sink = startswith:"bluez_sink"
+flags = set_sink, limit_volume, cork_stream, mute_by_route
+sink = sink.primaryandbluez
+source = sink.null.monitor
[group]
name = feedbacksound
flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = droid.output.low_latency@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = inputsound
flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = droid.output.low_latency@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = event
flags = set_sink, limit_volume, cork_stream, mute_by_route
-sink = droid.output.media_latency@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = alarm
-flags = set_sink, limit_volume, mute_by_route, cork_stream, media_notify
-sink = droid.output.media_latency@equals:"true"
+flags = set_sink, limit_volume, cork_stream
+sink = sink.primary
+source = sink.null.monitor
[group]
name = flash
flags = limit_volume, cork_stream
+sink = sink.primary
+source = source.primary
[group]
name = player
flags = route_audio, limit_volume, cork_stream
+sink = sink.primary
+source = source.primary
[group]
name = game
flags = route_audio, limit_volume, cork_stream
+sink = sink.primary
+source = source.primary
[group]
name = voiceui
flags = set_sink, limit_volume, cork_stream
-sink = droid.output.low_latency@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = ringtone
-flags = set_sink, limit_volume, mute_by_route, cork_stream, media_notify
-sink = droid.output.media_latency@equals:"true"
+flags = limit_volume, mute_by_route, cork_stream, media_notify
+sink = sink.primary
+source = source.null.monitor
[group]
name = camera
flags = set_sink, set_source, limit_volume, cork_stream
-sink = droid.output.media_latency@equals:"true"
-source = droid.input.builtin@equals:"true"
+sink = sink.primary
+source = source.primary
[group]
name = videoeditor
flags = route_audio, limit_volume, cork_stream
+sink = sink.primary
+source = source.primary
[group]
name = ipcall
flags = set_sink, set_source, limit_volume, cork_stream
-sink = droid.output.low_latency@equals:"true"
-source = droid.input.builtin@equals:"true"
+sink = sink.primary
+source = source.primary
[group]
name = call
flags = set_sink, set_source
-sink = droid.output.low_latency@equals:"true"
-source = droid.input.builtin@equals:"true"
+sink = sink.primary
+source = source.primary
[group]
name = navigator
flags = set_sink, set_source
-sink = droid.output.media_latency@equals:"true"
-source = droid.input.builtin@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = cstone
flags = route_audio, set_source, limit_volume
+sink = sink.primary
+source = sink.null.monitor
[group]
name = alwayson
flags = set_sink, limit_volume, cork_stream
-sink = droid.output.media_latency@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = nonsilent
flags = set_sink, limit_volume, cork_stream
-sink = droid.output.media_latency@equals:"true"
+sink = sink.primary
+source = sink.null.monitor
[group]
name = internal
@@ -157,23 +135,27 @@
[group]
name = outgoing
flags = route_audio
+sink = sink.primary
+source = sink.null.monitor
[group]
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
@@ -2,119 +2,119 @@
[card]
type = ihfandheadset
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = ringtone
[card]
type = ihfandheadphone
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = ringtone
[card]
type = headset
-name = equals:$droid_card
-profile = $droid_card_profile
+name = equals:droid_card.primary
+profile = primary-primary
[card]
type = headsetforcall
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = voicecall
[card]
type = headsetforalien
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = communication
[card]
type = headphone
-name = equals:$droid_card
-profile = $droid_card_profile
+name = equals:droid_card.primary
+profile = primary-primary
[card]
type = headphoneforcall
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = voicecall
[card]
type = headphoneforalien
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = communication
[card]
type = ihfandtvout
-name = equals:$droid_card
-profile = $droid_card_profile
+name = equals:droid_card.primary
+profile = primary-primary
[card]
type = earpiece
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = voicecall
[card]
type = earpieceforcall
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = voicecall
[card]
type = earpieceforalien
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = communication
[card]
type = ihfforcall
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = voicecall
[card]
type = ihf
-name = equals:$droid_card
-profile = $droid_card_profile
+name = equals:droid_card.primary
+profile = primary-primary
[card]
type = ihfforalien
-name = equals:$droid_card
+name = equals:droid_card.primary
profile = communication
[card]
type = bthsp
name0 = startswith:"bluez_card"
profile0 = hsp
-name1 = equals:$droid_card
+name1 = equals:droid_card.primary
profile1 = voicecall
[card]
type = bthspforcall
name0 = startswith:"bluez_card"
profile0 = hsp
-name1 = equals:$droid_card
+name1 = equals:droid_card.primary
profile1 = voicecall
[card]
type = bthspforalien
name0 = startswith:"bluez_card"
profile0 = hsp
-name1 = equals:$droid_card
+name1 = equals:droid_card.primary
profile1 = communication
[card]
type = bthfp
name0 = startswith:"bluez_card"
profile0 = hsp
-name1 = equals:$droid_card
+name1 = equals:droid_card.primary
profile1 = voicecall
[card]
type = bthfpforcall
name0 = startswith:"bluez_card"
profile0 = hsp
-name1 = equals:$droid_card
+name1 = equals:droid_card.primary
profile1 = voicecall
[card]
type = bthfpforalien
name0 = startswith:"bluez_card"
profile0 = hsp
-name1 = equals:$droid_card
+name1 = equals:droid_card.primary
profile1 = communication
[card]
@@ -127,14 +127,14 @@
type = bta2dp
name0 = startswith:"bluez_card"
profile0 = a2dp
-name1 = equals:$droid_card
-profile1 = $droid_card_profile
+name1 = equals:droid_card.primary
+profile1 = primary-primary
[card]
type = bta2dpforalien
name0 = startswith:"bluez_card"
profile0 = a2dp
-name1 = equals:$droid_card
+name1 = equals:droid_card.primary
profile1 = communication
# -------- Context rule section ------------------------------------------------
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-thea-1+master.20180301080017.2b141e0.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
@@ -6,73 +6,74 @@
profile = a2dp
flags = disable_notify
+
[card]
type = bta2dp
name0 = startswith:"bluez_card"
profile0 = a2dp_sink
-name1 = equals:$droid_card
-profile1 = $droid_card_profile
+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
+name1 = equals:droid_card.primary
profile1 = communication
flags1 = disable_notify
[card]
type = bthsp
name0 = startswith:"bluez_card"
-profile0 = headset_head_unit
-name1 = equals:$droid_card
-profile1 = $droid_card_profile
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
+profile1 = primary-primary
flags1 = disable_notify
[card]
type = bthspforcall
name0 = startswith:"bluez_card"
-profile0 = headset_head_unit
-name1 = equals:$droid_card
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
profile1 = voicecall
flags1 = disable_notify
[card]
type = bthspforalien
name0 = startswith:"bluez_card"
-profile0 = headset_head_unit
-name1 = equals:$droid_card
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
profile1 = communication
flags1 = disable_notify
[card]
type = bthfp
name0 = startswith:"bluez_card"
-profile0 = headset_head_unit
-name1 = equals:$droid_card
-profile1 = $droid_card_profile
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
+profile1 = primary-primary
flags1 = disable_notify
[card]
type = bthfpforcall
name0 = startswith:"bluez_card"
-profile0 = headset_head_unit
-name1 = equals:$droid_card
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
profile1 = voicecall
flags1 = disable_notify
[card]
type = bthfpforalien
name0 = startswith:"bluez_card"
-profile0 = headset_head_unit
-name1 = equals:$droid_card
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
profile1 = communication
flags1 = disable_notify
[card]
type = ihfandheadset
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= ringtone
name1 = startswith:"bluez_card"
profile1 = off
@@ -80,7 +81,7 @@
[card]
type = ihfandheadphone
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= ringtone
name1 = startswith:"bluez_card"
profile1 = off
@@ -88,15 +89,15 @@
[card]
type = headset
-name0 = equals:$droid_card
-profile0= $droid_card_profile
+name0 = equals:droid_card.primary
+profile0= primary-primary
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
[card]
type = headsetforcall
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= voicecall
name1 = startswith:"bluez_card"
profile1 = off
@@ -104,7 +105,7 @@
[card]
type = headsetforalien
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= communication
name1 = startswith:"bluez_card"
profile1 = off
@@ -112,15 +113,15 @@
[card]
type = headphone
-name0 = equals:$droid_card
-profile0= $droid_card_profile
+name0 = equals:droid_card.primary
+profile0= primary-primary
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
[card]
type = headphoneforcall
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= voicecall
name1 = startswith:"bluez_card"
profile1 = off
@@ -128,7 +129,7 @@
[card]
type = headphoneforalien
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= communication
name1 = startswith:"bluez_card"
profile1 = off
@@ -136,15 +137,15 @@
[card]
type = ihfandtvout
-name0 = equals:$droid_card
-profile0= $droid_card_profile
+name0 = equals:droid_card.primary
+profile0= primary-primary
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
[card]
type = earpiece
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= voicecall
name1 = startswith:"bluez_card"
profile1 = off
@@ -152,7 +153,7 @@
[card]
type = earpieceforcall
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= voicecall
name1 = startswith:"bluez_card"
profile1 = off
@@ -160,7 +161,7 @@
[card]
type = earpieceforalien
-name0 = equals:$droid_card
+name0 = equals:droid_card.primary
profile0= communication
name1 = startswith:"bluez_card"
profile1 = off
@@ -168,7 +169,7 @@
[card]
type = ihfforcall
-name0 = equals:$droid_card
|