I have made the following changes intended for : CE:MW:Shared / policy-settings-basic-n950
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5859 Thank You, Juho Hämäläinen [This message was auto-generated] --- Request # 5859: Messages from BOSS: State: review at 2012-08-17T08:56:09 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:jhamalai:branches:CE:MW:Shared / policy-settings-basic-n950 -> CE:MW:Shared / policy-settings-basic-n950 changes files: -------------- --- policy-settings-basic-n950.changes +++ policy-settings-basic-n950.changes @@ -0,0 +1,3 @@ +* Fri Aug 17 2012 Juho Hämäläinen <[email protected]> - 0.1.1 +- Fixes NEMO#332: Add missing accessory 'incompatible'. + new: ---- add-missing-accessory-incompatible.patch spec files: ----------- --- policy-settings-basic-n950.spec +++ policy-settings-basic-n950.spec @@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.gz Source100: policy-settings-basic-n950.yaml Patch0: add-missing-resource_class_request-4.patch +Patch1: add-missing-accessory-incompatible.patch Requires: ohm Requires: ohm-plugins-misc Requires: ohm-plugin-resolver @@ -52,6 +53,8 @@ # add-missing-resource_class_request-4.patch %patch0 -p1 +# add-missing-accessory-incompatible.patch +%patch1 -p1 # >> setup # << setup other changes: -------------- ++++++ add-missing-accessory-incompatible.patch (new) --- add-missing-accessory-incompatible.patch +++ add-missing-accessory-incompatible.patch @@ -0,0 +1,88 @@ +From b8dce65d2b41cacb102bd2b9025dfceedf4af7cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= <[email protected]> +Date: Thu, 16 Aug 2012 16:43:02 +0300 +Subject: [PATCH 2/2] Add missing accessory 'incompatible'. Fixes NEMO#332 + +--- + basic/policy/audio_route_rules.pl | 2 ++ + basic/policy/hwconfig.pl | 5 +++++ + basic/policy/policy.dres | 2 ++ + 3 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/basic/policy/audio_route_rules.pl b/basic/policy/audio_route_rules.pl +index 0c33638..b9744b8 100644 +--- a/basic/policy/audio_route_rules.pl ++++ b/basic/policy/audio_route_rules.pl +@@ -115,3 +115,5 @@ invalid_audio_device_choice(_, source, tvoutandbthsp) :- + + invalid_audio_device_choice(_, source, headset) :- + not(audio_route:get_route(sink, headset)). ++ ++invalid_audio_device_choice(_, _, incompatible). +diff --git a/basic/policy/hwconfig.pl b/basic/policy/hwconfig.pl +index 66fabca..1720ad2 100644 +--- a/basic/policy/hwconfig.pl ++++ b/basic/policy/hwconfig.pl +@@ -5,6 +5,7 @@ video_device(tvout). + audio_device_type(sink). + audio_device_type(source). + ++audio_device(incompatible). + audio_device(tvoutandbta2dp). + audio_device(tvoutandbthsp). + audio_device(ihfandbthsp). +@@ -26,6 +27,7 @@ audio_device(ihf). + audio_device(null). + + ++audio_device_type(sink , incompatible). + audio_device_type(sink , tvoutandbta2dp). + audio_device_type(sink , tvoutandbthsp). + audio_device_type(sink , ihfandbthsp). +@@ -49,6 +51,7 @@ audio_device_type(source, headset). + audio_device_type(source, headmike). + audio_device_type(source, microphone). + ++audio_device_privavy(private, incompatible). + audio_device_privacy(private, tvoutandbta2dp). + audio_device_privacy(private, tvoutandbthsp). + audio_device_privacy(private, ihfandbthsp). +@@ -69,6 +72,7 @@ audio_device_privacy(private, microphone). + audio_device_privacy(public , microphone). + audio_device_privacy(private, headmike). + ++accessory(incompatible). + accessory(bta2dp). + accessory(bthsp). + accessory(headset). +@@ -79,6 +83,7 @@ accessory(hac). + + video_accessory(tvout). + ++audio_accessory(incompatible). + audio_accessory(bta2dp). + audio_accessory(bthsp). + audio_accessory(headset). +diff --git a/basic/policy/policy.dres b/basic/policy/policy.dres +index e7e507d..02adeab 100644 +--- a/basic/policy/policy.dres ++++ b/basic/policy/policy.dres +@@ -57,6 +57,7 @@ $audio_device_accessible += { name: headphone , driver: 1, connected: 0 } + $audio_device_accessible += { name: headset , driver: 1, connected: 0 } + $audio_device_accessible += { name: bthsp , driver: 0, connected: 0 } + $audio_device_accessible += { name: bta2dp , driver: 0, connected: 0 } ++$audio_device_accessible += { name: incompatible , driver: 0, connected: 0 } + + $audio_device_selectable = { name: null , selectable: 1 } + $audio_device_selectable += { name: ihf , selectable: 1 } +@@ -77,6 +78,7 @@ $audio_device_selectable += { name: ihfandheadphone , selectable: 0 } + $audio_device_selectable += { name: ihfandbthsp , selectable: 0 } + $audio_device_selectable += { name: tvoutandbthsp , selectable: 0 } + $audio_device_selectable += { name: tvoutandbta2dp , selectable: 0 } ++$audio_device_selectable += { name: incompatible , selectable: 0 } + + + # audio modes for ECI detection +-- +1.7.0.4 + ++++++ policy-settings-basic-n950.yaml --- policy-settings-basic-n950.yaml +++ policy-settings-basic-n950.yaml @@ -10,6 +10,7 @@ Patches: - add-missing-resource_class_request-4.patch + - add-missing-accessory-incompatible.patch Requires: - ohm
