a better isolation of my changes

app/src/main/AndroidManifest.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.torproject.android"
-    android:installLocation="auto"
+      android:versionName="15.2.0-RC-8-multi"
       android:versionCode="15208000"
-    android:versionName="15.2.0-RC-8-multi">
+        android:installLocation="auto"
-
+      >
-    <uses-sdk
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
-        android:minSdkVersion="16"
-        android:targetSdkVersion="23" />
     <!-- 
  <permission android:name="org.torproject.android.MANAGE_TOR" 
      android:label="@string/permission_manage_tor_label" 
@@ -17,14 +15,13 @@
 	<uses-permission android:name="org.torproject.android.MANAGE_TOR"/>
 	-->
 
-    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
 
-    <android:uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <android:uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".OrbotApp"
@@ -41,70 +38,75 @@
             android:name=".OrbotMainActivity"
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
           </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-
                 <data android:scheme="bridge" />
             </intent-filter>
+
          <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <action android:name="org.torproject.android.REQUEST_HS_PORT" />
             </intent-filter>
              <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <action android:name="org.torproject.android.START_TOR" />
             </intent-filter>
+
         </activity>
 
-        <!--         This is for ensuring the background service still runs when/if the app is swiped away -->
+        <!-- 
+        This is for ensuring the background service still runs when/if the app is swiped away
+         -->
       	<activity
 			android:name=".service.util.DummyActivity"
-            android:allowTaskReparenting="true"
+			android:theme="@android:style/Theme.Translucent"
-            android:alwaysRetainTaskState="false"
-            android:clearTaskOnLaunch="true"
 			android:enabled="true"
-            android:excludeFromRecents="true"
+			android:allowTaskReparenting="true"
-            android:finishOnTaskLaunch="true"
 			android:noHistory="true"
+			android:excludeFromRecents="true"
+			android:alwaysRetainTaskState="false"
 			android:stateNotNeeded="true"
-            android:theme="@android:style/Theme.Translucent" />
+			android:clearTaskOnLaunch="true"
+			android:finishOnTaskLaunch="true"
+
+			/>
+
       	<activity
-            android:name=".vpn.VPNEnableActivity"
+			android:name=".vpn.VPNEnableActivity" android:label="@string/app_name" android:exported="false"
-            android:exported="false"
+			/>
-            android:label="@string/app_name" />
+
-        <activity
+
-            android:name=".ui.PromoAppsActivity"
+      	<activity android:name="org.torproject.android.ui.PromoAppsActivity" android:exported="false"/>
-            android:exported="false" />
+
-        <activity
+
-            android:name=".settings.SettingsPreferences"
+      	<activity android:name=".settings.SettingsPreferences"  android:label="@string/app_name"/>
-            android:label="@string/app_name" />
+        <activity android:name=".ui.AppManager"  android:label="@string/app_name"
-        <activity
+			android:theme="@style/Theme.AppCompat"
-            android:name=".ui.AppManager"
+			/>
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat" />
 
         <service
             android:name=".service.TorService"
             android:enabled="true"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:stopWithTask="false" />
+            android:stopWithTask="false" >
+        </service>
+
+
 		<service
 			android:name=".service.vpn.TorVpnService"
 			android:enabled="true"
-            android:permission="android.permission.BIND_VPN_SERVICE">
+			android:permission="android.permission.BIND_VPN_SERVICE" >
 			<intent-filter>
-                <action android:name="android.net.VpnService" />
+				<action android:name="android.net.VpnService"/>
 			</intent-filter>
 		</service>
 
@@ -115,23 +117,21 @@
                  <action android:name="org.torproject.android.intent.action.START" />
              </intent-filter>
         </receiver>
-        <receiver
+
-            android:name=".OnBootReceiver"
+   	<receiver android:name=".OnBootReceiver"
-            android:enabled="true"
+   	    android:enabled="true" android:exported="true"
-            android:exported="true">
+
+   	    >
 			<intent-filter>
 				<action	android:name="android.intent.action.BOOT_COMPLETED" />
-
 				  <category android:name="android.intent.category.HOME" />
 			</intent-filter>
 			<intent-filter>
 				<action android:name="android.intent.action.QUICKBOOT_POWERON" />
-
 				  <category android:name="android.intent.category.HOME" />
 			</intent-filter>
 			<intent-filter>
-                <action android:name="android.intent.action.MEDIA_MOUNTED" />
+				<action android:name="android.intent.action.MEDIA_MOUNTED"/>
-
 				  <category android:name="android.intent.category.HOME" />
 			</intent-filter>
 		</receiver>
@@ -159,6 +159,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/hidden_services_paths"/>
         </provider>
-    </application>
 
+</application>
 </manifest>