From 92450e86495630b24a50ac75753d016747d740e8 Mon Sep 17 00:00:00 2001
From: hanyuhang <hanyuhang2@huawei.com>
Date: Fri, 21 Aug 2020 15:48:56 +0800
Subject: [PATCH] Activity.java:default reject CAMERA permission currently
 Dialog.java:while list for cn.xuexi.android and com.hexin.plat.android skip
 update dialog for cn.xuexi.andriod modify camera permission dialog for
 com.hexin.plat.android

---
 core/java/android/app/Activity.java |  3 +++
 core/java/android/app/Dialog.java   | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 7d5b5017..4f14d8c2 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -865,6 +865,9 @@ public class Activity extends ContextThemeWrapper
             // CALENDAR
             put("android.permission.READ_CALENDAR", 0);
             put("android.permission.WRITE_CALENDAR", 0);
+
+            // CAMERA
+            put("android.permission.CAMERA", -1);
         }
     };
 
diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 6e2c464e..080c0d83 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -61,7 +61,12 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityEvent;
 
+import android.widget.TextView;
+
 import java.lang.ref.WeakReference;
+import java.util.List;
+import java.util.ArrayList;
+
 
 /**
  * Base class for Dialogs.
@@ -319,6 +324,28 @@ 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("目前暂不支持相机");
+            }
+            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);
+                }
+            }
+        }
+
         mWindowManager.addView(mDecor, l);
         mShowing = true;
 
-- 
Gitee