Merge "Relax isUserRunning check and allow in-profile calls" into nyc-mr1-dev

diff --combined services/core/java/com/android/server/am/ActivityManagerService.java
index 65d5575,5fa5f5c..90e2a5b
--- 1/services/core/java/com/android/server/am/ActivityManagerService.java
--- 2/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@@ -12709,7 -12709,6 +12709,7 @@@ public final class ActivityManagerServi
                          return;
                      }
                      if (pr.hasTopUi != hasTopUi) {
 +                        Slog.i(TAG, "Setting hasTopUi=" + hasTopUi + " for pid=" + pid);
                          pr.hasTopUi = hasTopUi;
                          changed = true;
                      }
@@@ -19204,14 -19203,10 +19204,14 @@@
              // facilitate this, here we need to determine whether or not it
              // is currently showing UI.
              app.systemNoUi = true;
 -            if (app == TOP_APP || app.hasTopUi) {
 +            if (app == TOP_APP) {
                  app.systemNoUi = false;
                  app.curSchedGroup = ProcessList.SCHED_GROUP_TOP_APP;
                  app.adjType = "pers-top-activity";
 +            } else if (app.hasTopUi) {
 +                app.systemNoUi = false;
 +                app.curSchedGroup = ProcessList.SCHED_GROUP_TOP_APP;
 +                app.adjType = "pers-top-ui";
              } else if (activitiesSize > 0) {
                  for (int j = 0; j < activitiesSize; j++) {
                      final ActivityRecord r = app.activities.get(j);
@@@ -19237,7 -19232,7 +19237,7 @@@
          int procState;
          boolean foregroundActivities = false;
          BroadcastQueue queue;
 -        if (app == TOP_APP || app.hasTopUi) {
 +        if (app == TOP_APP) {
              // The last app on the list is the foreground app.
              adj = ProcessList.FOREGROUND_APP_ADJ;
              schedGroup = ProcessList.SCHED_GROUP_TOP_APP;
@@@ -21553,8 -21548,9 +21553,9 @@@
  
      @Override
      public boolean isUserRunning(int userId, int flags) {
-         if (userId != UserHandle.getCallingUserId() && checkCallingPermission(
-                 INTERACT_ACROSS_USERS) != PackageManager.PERMISSION_GRANTED) {
+         if (!mUserController.isSameProfileGroup(userId, UserHandle.getCallingUserId())
+                 && checkCallingPermission(INTERACT_ACROSS_USERS)
+                     != PackageManager.PERMISSION_GRANTED) {
              String msg = "Permission Denial: isUserRunning() from pid="
                      + Binder.getCallingPid()
                      + ", uid=" + Binder.getCallingUid()