commit cb7cdef2f5a4d62b1438036a593b701d45c85e68
author Chiao Cheng <chiaocheng@google.com> Fri Jul 12 18:29:32 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 12 18:29:32 2013 +0000
tree 8bf9440f0ddf6f57e27b342a69fba4dca08e8fb6
parent db4786ae93089e35a6a917ad6c85cf7d0d6e4ee7
parent f7bd441e39232a9953f707cf1e9c7253108b8865

Merge "Fix monkey bug NullPointerException."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aabf50b..51d6ac9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -481,30 +481,12 @@
             android:theme="@style/NonPhoneActivityTheme"
             >
             <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.DIAL"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:mimeType="vnd.android.cursor.item/phone"/>
-                <data android:mimeType="vnd.android.cursor.item/person"/>
-            </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.DIAL"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:scheme="voicemail"/>
-            </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.DIAL"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-            <intent-filter android:priority="-1">
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
             </intent-filter>
             <intent-filter android:priority="-1">
                 <action android:name="android.intent.action.VIEW"/>
-                <action android:name="android.intent.action.DIAL"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
                 <data android:scheme="tel"/>
@@ -515,11 +497,6 @@
                 <category android:name="android.intent.category.BROWSABLE"/>
                 <data android:mimeType="vnd.android.cursor.dir/calls"/>
             </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="android.intent.action.CALL_BUTTON"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-            </intent-filter>
         </activity>
 
         <!-- Service that is exclusively for the Phone application that sends out a view