diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index ecad13dc783c..e5b417917105 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -3374,7 +3374,7 @@ public boolean setProcessMemoryTrimLevel(String process, int userId, int level)
     public List<RunningAppProcessInfo> getRunningAppProcesses() {
         try {
             List<RunningAppProcessInfo> res = getService().getRunningAppProcesses();
-            if (GmsCompat.isPlayServices()) {
+            if (GmsCompat.isEnabled()) {
                 res = GmsHooks.addRecentlyBoundPids(mContext, res);
             }
             return res;
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index 95dfd98b61aa..56a12377b9a1 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -1142,7 +1142,7 @@ private boolean execTransact(int code, long dataObj, long replyObj,
         // At that point, the parcel request headers haven't been parsed so we do not know what
         // WorkSource the caller has set. Use calling uid as the default.
         final int callingUid = Binder.getCallingUid();
-        if (GmsCompat.isPlayServices()) {
+        if (GmsCompat.isEnabled()) {
             if (callingUid >= Process.FIRST_APPLICATION_UID && callingUid != mPreviousUid) {
                 // harmless race
                 mPreviousUid = callingUid;