resolved conflicts for merge of e55f2b81 to lmp-mr1-dev-plus-aosp

Change-Id: If8473c40d1b3da93d1f0f74d24f40633b2209f5e

1 files changed, 85 insertions, 85 deletions

diff --git a/service_contexts b/service_contexts
index 15c9452..796f079 100644
--- a/service_contexts
+++ b/service_contexts
@@ -1,123 +1,123 @@
-accessibility                             u:object_r:system_server_service:s0
-account                                   u:object_r:system_server_service:s0
-activity                                  u:object_r:system_server_service:s0
-alarm                                     u:object_r:system_server_service:s0
+accessibility                             u:object_r:accessibility_service:s0
+account                                   u:object_r:account_service:s0
+activity                                  u:object_r:activity_service:s0
+alarm                                     u:object_r:alarm_service:s0
 android.security.keystore                 u:object_r:keystore_service:s0
-appops                                    u:object_r:system_server_service:s0
-appwidget                                 u:object_r:system_server_service:s0
-assetatlas                                u:object_r:system_server_service:s0
-audio                                     u:object_r:system_server_service:s0
-backup                                    u:object_r:system_server_service:s0
+appops                                    u:object_r:appops_service:s0
+appwidget                                 u:object_r:appwidget_service:s0
+assetatlas                                u:object_r:assetatlas_service:s0
+audio                                     u:object_r:audio_service:s0
+backup                                    u:object_r:backup_service:s0
 batteryproperties                         u:object_r:healthd_service:s0
 batterypropreg                            u:object_r:healthd_service:s0
-batterystats                              u:object_r:system_server_service:s0
-battery                                   u:object_r:system_server_service:s0
-bluetooth_manager                         u:object_r:system_server_service:s0
+batterystats                              u:object_r:batterystats_service:s0
+battery                                   u:object_r:battery_service:s0
+bluetooth_manager                         u:object_r:bluetooth_manager_service:s0
 bluetooth                                 u:object_r:bluetooth_service:s0
-clipboard                                 u:object_r:system_server_service:s0
-com.android.internal.telephony.mms.IMms   u:object_r:system_server_service:s0
-com.android.net.IProxyService             u:object_r:system_server_service:s0
-commontime_management                     u:object_r:system_server_service:s0
+clipboard                                 u:object_r:clipboard_service:s0
+com.android.internal.telephony.mms.IMms   u:object_r:IMms_service:s0
+com.android.net.IProxyService             u:object_r:IProxyService_service:s0
+commontime_management                     u:object_r:commontime_management_service:s0
 common_time.clock                        u:object_r:mediaserver_service:s0
 common_time.config                       u:object_r:mediaserver_service:s0
-connectivity                              u:object_r:system_server_service:s0
-consumer_ir                               u:object_r:system_server_service:s0
-content                                   u:object_r:system_server_service:s0
-country_detector                          u:object_r:system_server_service:s0
-cpuinfo                                   u:object_r:system_server_service:s0
-dbinfo                                    u:object_r:system_server_service:s0
-device_policy                             u:object_r:system_server_service:s0
-devicestoragemonitor                      u:object_r:system_server_service:s0
-diskstats                                 u:object_r:system_server_service:s0
+connectivity                              u:object_r:connectivity_service:s0
+consumer_ir                               u:object_r:consumer_ir_service:s0
+content                                   u:object_r:content_service:s0
+country_detector                          u:object_r:country_detector_service:s0
+cpuinfo                                   u:object_r:cpuinfo_service:s0
+dbinfo                                    u:object_r:dbinfo_service:s0
+device_policy                             u:object_r:device_policy_service:s0
+devicestoragemonitor                      u:object_r:devicestoragemonitor_service:s0
+diskstats                                 u:object_r:diskstats_service:s0
 display.qservice                          u:object_r:surfaceflinger_service:s0
-display                                   u:object_r:system_server_service:s0
-DockObserver                              u:object_r:system_server_service:s0
-dreams                                    u:object_r:system_server_service:s0
+display                                   u:object_r:display_service:s0
+DockObserver                              u:object_r:DockObserver_service:s0
+dreams                                    u:object_r:dreams_service:s0
 drm.drmManager                            u:object_r:drmserver_service:s0
-dropbox                                   u:object_r:system_server_service:s0
-ethernet                                  u:object_r:system_server_service:s0
-fingerprint                               u:object_r:system_server_service:s0
-gfxinfo                                   u:object_r:system_server_service:s0
-hardware                                  u:object_r:system_server_service:s0
-hdmi_control                              u:object_r:system_server_service:s0
+dropbox                                   u:object_r:dropbox_service:s0
+ethernet                                  u:object_r:ethernet_service:s0
+fingerprint                               u:object_r:fingerprint_service:s0
+gfxinfo                                   u:object_r:gfxinfo_service:s0
+hardware                                  u:object_r:hardware_service:s0
+hdmi_control                              u:object_r:hdmi_control_service:s0
 inputflinger                              u:object_r:inputflinger_service:s0
-input_method                              u:object_r:system_server_service:s0
-input                                     u:object_r:system_server_service:s0
+input_method                              u:object_r:input_method_service:s0
+input                                     u:object_r:input_service:s0
 iphonesubinfo_msim                        u:object_r:radio_service:s0
 iphonesubinfo2                            u:object_r:radio_service:s0
 iphonesubinfo                             u:object_r:radio_service:s0
 ims                                       u:object_r:radio_service:s0
-imms                                      u:object_r:system_server_service:s0
+imms                                      u:object_r:imms_service:s0
 isms_msim                                 u:object_r:radio_service:s0
 isms2                                     u:object_r:radio_service:s0
 isms                                      u:object_r:radio_service:s0
 isub                                      u:object_r:radio_service:s0
-jobscheduler                              u:object_r:system_server_service:s0
-launcherapps                              u:object_r:system_server_service:s0
-location                                  u:object_r:system_server_service:s0
-lock_settings                             u:object_r:system_server_service:s0
+jobscheduler                              u:object_r:jobscheduler_service:s0
+launcherapps                              u:object_r:launcherapps_service:s0
+location                                  u:object_r:location_service:s0
+lock_settings                             u:object_r:lock_settings_service:s0
 media.audio_flinger                       u:object_r:mediaserver_service:s0
 media.audio_policy                        u:object_r:mediaserver_service:s0
 media.camera                              u:object_r:mediaserver_service:s0
 media.log                                 u:object_r:mediaserver_service:s0
 media.player                              u:object_r:mediaserver_service:s0
 media.sound_trigger_hw                    u:object_r:mediaserver_service:s0
-media_projection                          u:object_r:system_server_service:s0
-media_router                              u:object_r:system_server_service:s0
-media_session                             u:object_r:system_server_service:s0
-meminfo                                   u:object_r:system_server_service:s0
-mount                                     u:object_r:system_server_service:s0
-netpolicy                                 u:object_r:system_server_service:s0
-netstats                                  u:object_r:system_server_service:s0
-network_management                        u:object_r:system_server_service:s0
-network_score                             u:object_r:system_server_service:s0
+media_projection                          u:object_r:media_projection_service:s0
+media_router                              u:object_r:media_router_service:s0
+media_session                             u:object_r:media_session_service:s0
+meminfo                                   u:object_r:meminfo_service:s0
+midi                                      u:object_r:midi_service:s0
+mount                                     u:object_r:mount_service:s0
+netpolicy                                 u:object_r:netpolicy_service:s0
+netstats                                  u:object_r:netstats_service:s0
+network_management                        u:object_r:network_management_service:s0
+network_score                             u:object_r:network_score_service:s0
 nfc                                       u:object_r:nfc_service:s0
-notification                              u:object_r:system_server_service:s0
-package                                   u:object_r:system_server_service:s0
-permission                                u:object_r:system_server_service:s0
-persistent_data_block                     u:object_r:system_server_service:s0
+notification                              u:object_r:notification_service:s0
+package                                   u:object_r:package_service:s0
+permission                                u:object_r:permission_service:s0
+persistent_data_block                     u:object_r:persistent_data_block_service:s0
 phone_msim                                u:object_r:radio_service:s0
 phone1                                    u:object_r:radio_service:s0
 phone2                                    u:object_r:radio_service:s0
 phone                                     u:object_r:radio_service:s0
-power                                     u:object_r:system_server_service:s0
-print                                     u:object_r:system_server_service:s0
-procstats                                 u:object_r:system_server_service:s0
+power                                     u:object_r:power_service:s0
+print                                     u:object_r:print_service:s0
+procstats                                 u:object_r:procstats_service:s0
 radio.phonesubinfo                        u:object_r:radio_service:s0
 radio.phone                               u:object_r:radio_service:s0
 radio.sms                                 u:object_r:radio_service:s0
-restrictions                              u:object_r:system_server_service:s0
-rttmanager                                u:object_r:system_server_service:s0
-samplingprofiler                          u:object_r:system_server_service:s0
-scheduling_policy                         u:object_r:system_server_service:s0
-search                                    u:object_r:system_server_service:s0
-sensorservice                             u:object_r:system_server_service:s0
-serial                                    u:object_r:system_server_service:s0
-servicediscovery                          u:object_r:system_server_service:s0
+restrictions                              u:object_r:restrictions_service:s0
+rttmanager                                u:object_r:rttmanager_service:s0
+samplingprofiler                          u:object_r:samplingprofiler_service:s0
+scheduling_policy                         u:object_r:scheduling_policy_service:s0
+search                                    u:object_r:search_service:s0
+sensorservice                             u:object_r:sensorservice_service:s0
+serial                                    u:object_r:serial_service:s0
+servicediscovery                          u:object_r:servicediscovery_service:s0
 simphonebook_msim                         u:object_r:radio_service:s0
 simphonebook2                             u:object_r:radio_service:s0
 simphonebook                              u:object_r:radio_service:s0
 sip                                       u:object_r:radio_service:s0
-statusbar                                 u:object_r:system_server_service:s0
+statusbar                                 u:object_r:statusbar_service:s0
 SurfaceFlinger                            u:object_r:surfaceflinger_service:s0
-task                                      u:object_r:system_server_service:s0
+task                                      u:object_r:task_service:s0
 telecom                                   u:object_r:system_server_service:s0
-telephony.registry                        u:object_r:system_server_service:s0
-textservices                              u:object_r:system_server_service:s0
-trust                                     u:object_r:system_server_service:s0
-tv_input                                  u:object_r:system_server_service:s0
-uimode                                    u:object_r:system_server_service:s0
-updatelock                                u:object_r:system_server_service:s0
-usagestats                                u:object_r:system_server_service:s0
-usb                                       u:object_r:system_server_service:s0
-user                                      u:object_r:system_server_service:s0
-vibrator                                  u:object_r:system_server_service:s0
-voiceinteraction                          u:object_r:system_server_service:s0
-wallpaper                                 u:object_r:system_server_service:s0
-webviewupdate                             u:object_r:system_server_service:s0
-wifip2p                                   u:object_r:system_server_service:s0
-wifiscanner                               u:object_r:system_server_service:s0
-wifi                                      u:object_r:system_server_service:s0
-window                                    u:object_r:system_server_service:s0
-
+telephony.registry                        u:object_r:registry_service:s0
+textservices                              u:object_r:textservices_service:s0
+trust                                     u:object_r:trust_service:s0
+tv_input                                  u:object_r:tv_input_service:s0
+uimode                                    u:object_r:uimode_service:s0
+updatelock                                u:object_r:updatelock_service:s0
+usagestats                                u:object_r:usagestats_service:s0
+usb                                       u:object_r:usb_service:s0
+user                                      u:object_r:user_service:s0
+vibrator                                  u:object_r:vibrator_service:s0
+voiceinteraction                          u:object_r:voiceinteraction_service:s0
+wallpaper                                 u:object_r:wallpaper_service:s0
+webviewupdate                             u:object_r:webviewupdate_service:s0
+wifip2p                                   u:object_r:wifip2p_service:s0
+wifiscanner                               u:object_r:wifiscanner_service:s0
+wifi                                      u:object_r:wifi_service:s0
+window                                    u:object_r:window_service:s0
 *                                         u:object_r:default_android_service:s0