Merge "Fix the wrong package name to return the wrong resources."

core/java/com/android/internal/app/SuspendedAppActivity.java

@@ -193,7 +193,7 @@ public class SuspendedAppActivity extends AlertActivity
             try {
                 mSuspendingAppResources = createContextAsUser(
                         UserHandle.of(mUserId), /* flags */ 0).getPackageManager()
-                        .getResourcesForApplication(mSuspendedPackage);
+                        .getResourcesForApplication(mSuspendingPackage);
             } catch (PackageManager.NameNotFoundException ne) {
                 Slog.e(TAG, "Could not find resources for " + mSuspendingPackage, ne);
             }

core/java/com/android/internal/app/TEST_MAPPING

@@ -1,4 +1,10 @@
 {
+  "presubmit": [
+    {
+      "name": "CtsSuspendAppsTestCases",
+      "file_patterns": ["(/|^)SuspendedAppActivity\\.java"]
+    }
+  ],
   "postsubmit": [
     {
       "name": "FrameworksCoreTests",
@@ -17,4 +23,4 @@
       ]
     }
   ]
-}
+}