From 9d1d51cb87c7668adffb15e4c6149fb019545e23 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Thu, 1 Jun 2017 13:56:25 +0300
Subject: [PATCH] Revert "Fix aidl on free version"

This reverts commit fff2abb0dd50fd667ef936cfb55771e7f31b174a.
---
 OsmAnd/AndroidManifest-free.xml    | 5 -----
 OsmAnd/AndroidManifest-freedev.xml | 4 ----
 OsmAnd/AndroidManifest.xml         | 5 +----
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/OsmAnd/AndroidManifest-free.xml b/OsmAnd/AndroidManifest-free.xml
index a8b092a714..2602c8c8f5 100644
--- a/OsmAnd/AndroidManifest-free.xml
+++ b/OsmAnd/AndroidManifest-free.xml
@@ -12,11 +12,6 @@
             tools:replace="android:process"
             android:process="net.osmand"/>
 
-        <service
-            android:name="net.osmand.aidl.OsmandAidlService"
-            tools:replace="android:process"
-            android:process="net.osmand"/>
-
         <provider
             android:name="android.support.v4.content.FileProvider"
             tools:replace="android:authorities"
diff --git a/OsmAnd/AndroidManifest-freedev.xml b/OsmAnd/AndroidManifest-freedev.xml
index 150b39a3ac..bc527a3eed 100644
--- a/OsmAnd/AndroidManifest-freedev.xml
+++ b/OsmAnd/AndroidManifest-freedev.xml
@@ -9,10 +9,6 @@
             android:name="net.osmand.plus.NavigationService"
             android:process="net.osmand.dev"
             tools:replace="android:process"/>
-        <service
-            android:name="net.osmand.aidl.OsmandAidlService"
-            tools:replace="android:process"
-            android:process="net.osmand.dev"/>
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="net.osmand.dev.fileprovider"
diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index dfd51204fa..e89c821d80 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -714,10 +714,7 @@
 			</intent-filter>
 		</service>
 
-		<service
-			android:process="net.osmand.plus"
-			android:name="net.osmand.aidl.OsmandAidlService"
-            android:exported="true">
+		<service android:name="net.osmand.aidl.OsmandAidlService" android:exported="true" >
 			<intent-filter>
 				<action android:name="net.osmand.aidl.OsmandAidlService"/>
 				<category android:name="android.intent.category.DEFAULT"/>