I have made the following changes intended for : CE:Adaptation:N950-N9 / 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/7720 Thank You, Juho Hämäläinen [This message was auto-generated] --- Request # 7720: Messages from BOSS: State: review at 2013-01-24T11:45:41 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:Adaptation:N950-N9 / policy-settings-basic-n950 -> CE:Adaptation:N950-N9 / policy-settings-basic-n950 changes files: -------------- --- policy-settings-basic-n950.changes +++ policy-settings-basic-n950.changes @@ -0,0 +1,4 @@ +* Thu Jan 24 2013 Juho Hamalainen <[email protected]> - 0.1.2 +- New version of policy settings. +- Packaged from latest version in github. + old: ---- add-missing-accessory-incompatible.patch add-missing-resource_class_request-4.patch add-missing-snap_button-resource-class-mapping.patch policy-settings-basic-n950-0.1.1.tar.gz new: ---- policy-settings-basic-n950-0.1.2.tar.gz spec files: ----------- --- policy-settings-basic-n950.spec +++ policy-settings-basic-n950.spec @@ -9,16 +9,14 @@ # << macros Summary: Precompiled basic MeeGo policy settings for the N950 -Version: 0.1.1 -Release: 0 +Version: 0.1.2 +Release: 1 Group: System/Resource Policy License: GPLv2 BuildArch: noarch +URL: https://github.com/nemomobile/policy-settings-basic/ 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 -Patch2: add-missing-snap_button-resource-class-mapping.patch Requires: ohm Requires: ohm-plugins-misc Requires: ohm-plugin-videoep @@ -57,14 +55,8 @@ %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{version} -# add-missing-resource_class_request-4.patch -%patch0 -p1 -# add-missing-accessory-incompatible.patch -%patch1 -p1 -# add-missing-snap_button-resource-class-mapping.patch -%patch2 -p1 # >> setup # << setup other changes: -------------- ++++++ policy-settings-basic-n950-0.1.1.tar.gz -> policy-settings-basic-n950-0.1.2.tar.gz --- basic/policy/audio_route.pl +++ basic/policy/audio_route.pl @@ -1,4 +1,4 @@ -:- module(audio_route, [set_audio_routes/1, set_audio_privacy/2, get_route/2]). +:- module(audio_route, [set_audio_routes/1, set_audio_privacy/2, get_route/2, privacy_override/1]). rules([set_audio_routes/1, set_audio_privacy/2]). @@ -83,3 +83,6 @@ fact_exists('com.nokia.policy.audio_route', [type, device], [DeviceType, Where]). +privacy_override(A) :- + fact_exists('com.nokia.policy.privacy_override', [value], [A]), + not(A = default). --- basic/policy/audio_route_rules.pl +++ basic/policy/audio_route_rules.pl @@ -34,7 +34,7 @@ % explicitly demands it via privacy override % invalid_audio_device_choice(call, sink, Device) :- - (implicated_privacy(public) *-> Privacy=private ; Privacy=public), + ((audio_route:privacy_override(public) ; implicated_privacy(public)) *-> Privacy=private ; Privacy=public), audio_device_privacy(Privacy, Device). @@ -115,3 +115,5 @@ invalid_audio_device_choice(_, source, headset) :- not(audio_route:get_route(sink, headset)). + +invalid_audio_device_choice(_, _, incompatible). --- basic/policy/hwconfig.pl +++ basic/policy/hwconfig.pl @@ -5,6 +5,7 @@ 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(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, 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(public , microphone). audio_device_privacy(private, headmike). +accessory(incompatible). accessory(bta2dp). accessory(bthsp). accessory(headset). @@ -79,6 +83,7 @@ video_accessory(tvout). +audio_accessory(incompatible). audio_accessory(bta2dp). audio_accessory(bthsp). audio_accessory(headset). --- basic/policy/policy.dres +++ basic/policy/policy.dres @@ -57,6 +57,7 @@ $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: 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 @@ -210,9 +212,11 @@ # sensors $proximity = { state: 'unknown' } -# misc +# mute state for microphones $mute = { value: 0 } +# override route privacy value to enable public routes during call +$privacy_override = { value: default } # # we always need at least one enforcement point @@ -245,7 +249,7 @@ $video_route = prolog(set_video_routes) audio_route: $audio_device_selectable $audio_output_configuration \ - $resource_owner + $resource_owner $privacy_override $privacy[stage] |= prolog(set_audio_privacy, previous) $audio_route[type] |= prolog(set_audio_routes) $privacy[stage] |= prolog(set_audio_privacy, current) @@ -266,6 +270,14 @@ audio_mute: $mute $audio_mute[device] |= prolog(set_mute) +audio_mute_request: + $mute:value = &mute_state + resolve(all) + +privacy_override_request: + $privacy_override:value = &privacy_override_state + resolve(all) + actions: audio_actions video_actions vibra_actions backlight_actions audio_actions: $audio_mute $audio_cork $volume_limit $context $audio_route \ @@ -324,7 +336,7 @@ &accessory_mode) telephony_request: - #$call_action = prolog(call_request, &call_id, &call_state) + $call_action = prolog(call_request, &call_id, &call_state) telephony_audio_update: --- basic/policy/resource.pl +++ basic/policy/resource.pl @@ -2,10 +2,10 @@ [update_resource_entries/1, update_resource_owner_entries/1, resource_owner/2, resource_owner/3, resource_group/2, granted_resource/2, granted_resource/3, active_resource/3, - force_resource_release/3]). + force_resource_release/3, resource_class_request/4]). rules([update_resource_entries/1, update_resource_owner_entries/1, - force_resource_release/3]). + force_resource_release/3, resource_class_request/4]). /* @@ -447,3 +447,21 @@ GrantedBit is Granted /\ ResourceBit, GrantedBit = ResourceBit, !. + +resource_bits([], A, A). +resource_bits([A|C], B, E) :- + D is A\/B, + resource_bits(C, D, E). + +resource_bits_list(C, D) :- + findall(A, + (resource_classes:resource_bit(B, A), + resource_classes:valid_resource_class(B, C)), + D). + +resource_class_request(Class, M, O, Result) :- + resource_bits_list(Class, BitList), + resource_bits(BitList, 0, BitMask), + Mandatory is M/\BitMask, + Optional is O/\BitMask, + Result=[[resource, [mandatory, Mandatory], [optional, Optional]]]. --- basic/policy/resource_classes.pl +++ basic/policy/resource_classes.pl @@ -235,3 +235,15 @@ valid_resource_class( headset_buttons , event ). valid_resource_class( headset_buttons , background ). valid_resource_class( headset_buttons , nobody ). + +valid_resource_class( snap_button , navigator ). +valid_resource_class( snap_button , call ). +valid_resource_class( snap_button , camera ). +valid_resource_class( snap_button , ringtone ). +valid_resource_class( snap_button , alarm ). +valid_resource_class( snap_button , game ). +valid_resource_class( snap_button , player ). +valid_resource_class( snap_button , implicit ). +valid_resource_class( snap_button , event ). +valid_resource_class( snap_button , background ). +valid_resource_class( snap_button , nobody ). --- configure.in +++ configure.in @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT(policy-settings, 0.1.1) +AC_INIT(policy-settings, 0.1.2) AC_CONFIG_SRCDIR(basic) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AC_CONFIG_HEADERS(dummy.h) ++++++ policy-settings-basic-n950.yaml --- policy-settings-basic-n950.yaml +++ policy-settings-basic-n950.yaml @@ -1,17 +1,14 @@ Name: policy-settings-basic-n950 Summary: Precompiled basic MeeGo policy settings for the N950 -Version: 0.1.1 -Release: 0 +Version: 0.1.2 +Release: 1 Group: System/Resource Policy License: GPLv2 +URL: https://github.com/nemomobile/policy-settings-basic/ Sources: - "%{name}-%{version}.tar.gz" Description: Precompiled basic MeeGo policy settings for the N950. -Patches: - - add-missing-resource_class_request-4.patch - - add-missing-accessory-incompatible.patch - - add-missing-snap_button-resource-class-mapping.patch Requires: - ohm ++++++ deleted files: --- add-missing-accessory-incompatible.patch --- add-missing-resource_class_request-4.patch --- add-missing-snap_button-resource-class-mapping.patch
