diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index e4880b0f6a43b817c18585a1492c23b9249b8058..7f2384ff26bd79c094e5deaf93ab888b58e0c486 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -2749,7 +2749,9 @@ public class Activity extends ContextThemeWrapper
         }
 
         if (!mFragments.getFragmentManager().popBackStackImmediate()) {
-            finishAfterTransition();
+            if (!mActivityTransitionState.startExitBackTransition(this)) {
+                finishAndRemoveTask();
+            }
         }
     }
 
@@ -5531,13 +5533,8 @@ public class Activity extends ContextThemeWrapper
      *         back) true is returned, else false.
      */
     public boolean moveTaskToBack(boolean nonRoot) {
-        try {
-            return ActivityManagerNative.getDefault().moveActivityTaskToBack(
-                    mToken, nonRoot);
-        } catch (RemoteException e) {
-            // Empty
-        }
-        return false;
+        this.onBackPressed();
+        return true;
     }
 
     /**
diff --git a/core/java/com/android/internal/widget/DecorCaptionView.java b/core/java/com/android/internal/widget/DecorCaptionView.java
index acec60b2ee7ccc5b430843bbbb592f9dc4c39c61..0c8f1898373f6ed68a4d5b407ca2858d7d4c4b35 100644
--- a/core/java/com/android/internal/widget/DecorCaptionView.java
+++ b/core/java/com/android/internal/widget/DecorCaptionView.java
@@ -121,7 +121,6 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener,
 
     static {
         propertyMap = new HashMap<>();
-        propertyMap.put("QQ音乐", WindowProperty.HIDE_BACK);
         propertyMap.put("喜马拉雅", WindowProperty.HIDE_MAXIMIZE);
         propertyMap.put("i深圳", WindowProperty.HIDE_MAXIMIZE);
     }