From: tmfang <tmfang@google.com>
Date: Mon, 30 Jul 2018 05:49:43 +0000 (+0800)
Subject: Fix some crash cases when we launch AlertDialog
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ade2f1976ad148e4e722cb99a3487fd55361f31;p=android-x86%2Fpackages-apps-Settings.git

Fix some crash cases when we launch AlertDialog

AlertDialog needs to use App.Compat theme.

Change-Id: Icef2f5b5cf2d614f98fd1d793e88c6a7349b1380
Fixes: 111888332
Test: robo
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a275be0b75..ccdc2dc083 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1917,7 +1917,7 @@
         <activity android:name=".bluetooth.BluetoothPairingDialog"
                   android:excludeFromRecents="true"
                   android:windowSoftInputMode="stateVisible|adjustResize"
-                  android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
+                  android:theme="@style/Theme.AlertDialog">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1964,7 +1964,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.DUMP"
-                  android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
+                  android:theme="@style/Theme.AlertDialog">
             <intent-filter>
                 <action android:name="android.settings.SHOW_REMOTE_BUGREPORT_DIALOG" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2660,7 +2660,7 @@
         </activity>
 
         <activity android:name=".sim.SimPreferenceDialog"
-            android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
+            android:theme="@style/Theme.AlertDialog"
             android:excludeFromRecents="true" />
 
         <activity
@@ -2690,7 +2690,7 @@
         </activity>
 
         <activity android:name=".sim.SimDialogActivity"
-                android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
+                android:theme="@style/Theme.AlertDialog"
                 android:label="@string/sim_settings_title"
                 android:excludeFromRecents="true">
             <intent-filter>