Merge "Revert "Temporary Threshold for Binder Proxy Tracking""

2018-02-08 08:42:17 +00:00
parent ec826cd788 c6eedfa64f
commit 64a75c0f3f
1 changed files with 0 additions and 2 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -14802,8 +14802,6 @@ public class ActivityManagerService extends IActivityManager.Stub
            mUserController.sendUserSwitchBroadcasts(-1, currentUserId);

            BinderInternal.nSetBinderProxyCountEnabled(true);
-            //STOPSHIP: Temporary BinderProxy Threshold for b/71353150
-            BinderInternal.nSetBinderProxyCountWatermarks(1500, 1200);
            BinderInternal.setBinderProxyCountCallback(
                    new BinderInternal.BinderProxyLimitListener() {
                        @Override