commit 0cf97d32178b689184866e731c0a4105d8223d80
author Victoria Lease <violets@google.com> Fri Jan 18 18:42:36 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 18 18:43:11 2013 +0000
tree 18e48651b6e3b4924e21154c3e383404dd5d2d1e
parent a239b933f7982ed069ccd284b4eab0fb5e4b6505
parent 79d59f0968ffcb803f615527d52718322af0f89b

Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care." into jb-mr1.1-dev

services/java/com/android/server/ServiceWatcher.java

diff --git a/services/java/com/android/server/ServiceWatcher.java b/services/java/com/android/server/ServiceWatcher.java
index 2e7c6d1..67f926a 100644
--- a/services/java/com/android/server/ServiceWatcher.java
+++ b/services/java/com/android/server/ServiceWatcher.java
@@ -177,7 +177,7 @@
         mVersion = version;
         if (D) Log.d(mTag, "binding " + packageName + " (version " + version + ")");
         mContext.bindService(intent, this, Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND
-                | Context.BIND_ALLOW_OOM_MANAGEMENT | Context.BIND_NOT_VISIBLE, mCurrentUserId);
+                | Context.BIND_NOT_VISIBLE, mCurrentUserId);
     }
 
     public static boolean isSignatureMatch(Signature[] signatures,