diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java
index a400d90c64c5afe446e30c1d785030cc4e6e791f..b0389373a00d45c23c34b7d034517fb20a431e53 100644
--- a/core/java/android/widget/Toast.java
+++ b/core/java/android/widget/Toast.java
@@ -115,6 +115,12 @@ public class Toast {
             throw new RuntimeException("setView must have been called");
         }
 
+        /* fixed WelcomeGuiteActivity quit abort in iShenZhen with whitelist .Start */
+        if (mContext.getOpPackageName().equals("com.pingan.smt")) {
+            return;
+        }
+        /* fixed WelcomeGuiteActivity quit abort in iShenZhen with whitelist .End */
+
         INotificationManager service = getService();
         String pkg = mContext.getOpPackageName();
         TN tn = mTN;
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index f6c68753f1377071161db508882954f720b21630..eee114c92327871f942b779bd3e27c988d506f0b 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -3481,6 +3481,14 @@ final class ActivityStack {
             return false;
         }
 
+        /* fixed WelcomeGuiteActivity quit abort in iShenZhen with whitelist .Start */
+        String whitelistActivity = "com.pingan.smt/.activity.WelcomeGuideActivity";
+        if (r.shortComponentName.startsWith(whitelistActivity)) {
+            Slog.w(TAG, "whitelist activity finish request for " + r);
+            return false;
+        }
+        /* fixed WelcomeGuiteActivity quit abort in iShenZhen with whitelist .End */
+
         r.makeFinishingLocked();
         final TaskRecord task = r.task;
         EventLog.writeEvent(EventLogTags.AM_FINISH_ACTIVITY,
@@ -5244,7 +5252,7 @@ final class ActivityStack {
 
         String[] whitelist = {
                 "com.tencent.minihd.qq/com.tencent.mobileqq.activity.SplashActivity",
-                "com.tencent.mm/.ui.LauncherUI"
+                "com.tencent.mm"
         };
 
         for (String componentName : whitelist) {