Merge "fix filter for listeners that are not the rocket" into nyc-dev

am: 2e35847a8f

* commit '2e35847a8f9557b59198fc053524eee0b965aab8':
  fix filter for listeners that are not the rocket

Change-Id: I00092556795bb085060508cb18f62fbeecf42d09
This commit is contained in:
Chris Wren
2016-05-12 21:08:56 +00:00
committed by android-build-merger

View File

@@ -868,7 +868,7 @@ abstract public class ManagedServices {
return false; return false;
} }
if (this.userid == UserHandle.USER_ALL) return true; if (this.userid == UserHandle.USER_ALL) return true;
if (this.userid == UserHandle.USER_SYSTEM) return true; if (this.isSystem) return true;
if (nid == UserHandle.USER_ALL || nid == this.userid) return true; if (nid == UserHandle.USER_ALL || nid == this.userid) return true;
return supportsProfiles() && mUserProfiles.isCurrentProfile(nid); return supportsProfiles() && mUserProfiles.isCurrentProfile(nid);
} }