commit 70983833c65eaaddd0cec7b9b97b37c90ca54b21
author Andy McFadden <fadden@android.com> Tue Aug 30 15:52:32 2011 -0700
committer Andy McFadden <fadden@android.com> Thu Sep 01 10:39:14 2011 -0700
tree 247f0c688648c7e31dff323438a293986f731c35
parent a2f6c5a4cc79e0cbb92aeb133a1e647937714a7b

Set android:exported on some entries

Explicitly set the visibility of some intents.

Some minor content and formatting tweaks to bring this in line with
the unbundled version of the manifest.

Bug 2761308

Change-Id: Ib24178af68b8cbc599055219cc0571cdba6be4f1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3a1867e..cc73944 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -50,7 +50,8 @@
             android:name="AllInOneActivity"
             android:theme="@style/CalendarTheme.WithActionBar"
             android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -71,7 +72,8 @@
         </activity>
 
         <activity-alias android:name="LaunchActivity"
-            android:targetActivity=".AllInOneActivity">
+            android:targetActivity=".AllInOneActivity"
+            android:exported="true">
         </activity-alias>
 
         <activity android:name="EventInfoActivity"
@@ -87,7 +89,8 @@
         </activity>
 
         <activity-alias android:name="EditEventActivity"
-            android:targetActivity=".event.EditEventActivity">
+            android:targetActivity=".event.EditEventActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.EDIT" />
                 <action android:name="android.intent.action.INSERT" />
@@ -103,10 +106,11 @@
         </activity-alias>
 
         <activity android:name="GoogleCalendarUriIntentFilter" android:label="@string/app_label"
-            android:theme="@android:style/Theme.Light"
+            android:theme="@android:style/Theme.NoDisplay"
             android:configChanges="orientation|keyboardHidden">
 
-            <intent-filter>
+            <intent-filter
+               android:priority="50">
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
@@ -134,7 +138,8 @@
             android:value="com.android.calendar.SearchActivity"/>
 
         <activity android:name="SearchActivity" android:label="@string/search_title"
-            android:launchMode="singleTop" android:theme="@style/CalendarTheme.WithActionBar">
+            android:launchMode="singleTop" android:theme="@style/CalendarTheme.WithActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH"/>
             </intent-filter>
@@ -192,9 +197,11 @@
 
         <service android:name=".widget.CalendarAppWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS"
-            android:exported="false"/>
+            android:exported="false">
+        </service>
 
-        <activity android:name="CalendarTests" android:label="Calendar Tests">
+        <activity android:name="CalendarTests" android:label="Calendar Tests"
+            android:exported="false">
             <intent-filter>
                  <action android:name="android.intent.action.MAIN" />
                  <category android:name="android.intent.category.UNIT_TEST" />