diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 080c0d83d19ae8cecf3f16fcbd7f599f92fd806c..5459be65fe7b76c869c16d66f6836ca4c8f928fb 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -324,24 +324,26 @@ public class Dialog implements DialogInterface, Window.Callback,
             l = nl;
         }
 
-        ArrayList<View> viewList = new ArrayList<View>();
-        mDecor.findViewsWithText(viewList,"发现新版本",View.FIND_VIEWS_WITH_TEXT);
-        if (viewList.size() > 0) {
-            return ;
-        }
-
-        mDecor.findViewsWithText(viewList,"您的相机权限好像没有打开",View.FIND_VIEWS_WITH_TEXT);
-        if (viewList.size() > 0) {
-            for (int i = 0; i < viewList.size(); i++) {
-                TextView tv = (TextView)(viewList.get(i));
-                tv.setText("目前暂不支持相机");
+        if (mDecor != null) {
+            ArrayList<View> viewList = new ArrayList<View>();
+            mDecor.findViewsWithText(viewList,"发现新版本",View.FIND_VIEWS_WITH_TEXT);
+            if (viewList.size() > 0) {
+                return ;
             }
-            viewList.clear();
-            mDecor.findViewsWithText(viewList,"开启权限",View.FIND_VIEWS_WITH_TEXT);
+
+            mDecor.findViewsWithText(viewList,"您的相机权限好像没有打开",View.FIND_VIEWS_WITH_TEXT);
             if (viewList.size() > 0) {
                 for (int i = 0; i < viewList.size(); i++) {
                     TextView tv = (TextView)(viewList.get(i));
-                    tv.setVisibility(View.INVISIBLE);
+                    tv.setText("目前暂不支持相机");
+                }
+                viewList.clear();
+                mDecor.findViewsWithText(viewList,"开启权限",View.FIND_VIEWS_WITH_TEXT);
+                if (viewList.size() > 0) {
+                    for (int i = 0; i < viewList.size(); i++) {
+                        TextView tv = (TextView)(viewList.get(i));
+                        tv.setVisibility(View.INVISIBLE);
+                    }
                 }
             }
         }
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 30a62fe8c7cd067f2c326e9075cb2cbb31460e61..ee3253b2200f8677e3c891e35957ddedc3f245a9 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12241,7 +12241,7 @@ public final class ActivityManagerService extends ActivityManagerNative
     }
 
     public static long getInputDispatchingTimeoutLocked(ActivityRecord r) {
-        if (r.packageName.equals("cn.xuexi.android")) {
+        if (r != null && r.packageName != null && r.packageName.equals("cn.xuexi.android")) {
             // Log.d(TAG,">>> getInputDispatchingTimeoutLocked  cn.xuexi.android 10sec");
             return 10*1000;
         }