From f3c8b18c2eeee8b913e2535ecc8bb8a67d32399c Mon Sep 17 00:00:00 2001 From: zhdguy Date: Wed, 8 Jul 2020 14:29:38 +0800 Subject: [PATCH 1/2] wm: modify wechat windows display horizontally. The whitelist "com.tencent.mm/.ui.LauncherUI" only ensure wechat starting alone with horizontal direction, but can not ensure the third app start wechat with horizontal direction. --- services/core/java/com/android/server/am/ActivityStack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index f6c68753..107beb67 100755 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -5244,7 +5244,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) { -- Gitee From 520762330f79dddad2e30b19f922849b6b416c30 Mon Sep 17 00:00:00 2001 From: zhdguy Date: Wed, 8 Jul 2020 14:43:11 +0800 Subject: [PATCH 2/2] activity: fixed the window quit abort in iShenZhen when start the iShenZhen app to WelcomeActivity, if move or maximize WelcomeActivity window, then the window with quit unexpectly. --- core/java/android/widget/Toast.java | 6 ++++++ .../core/java/com/android/server/am/ActivityStack.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java index a400d90c..b0389373 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 107beb67..eee114c9 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, -- Gitee