From 79d59f0968ffcb803f615527d52718322af0f89b Mon Sep 17 00:00:00 2001 From: Victoria Lease Date: Wed, 16 Jan 2013 12:51:04 -0800 Subject: DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care. Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03 Conflicts: services/java/com/android/server/ServiceWatcher.java --- services/java/com/android/server/ServiceWatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services') 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 @@ public class ServiceWatcher implements ServiceConnection { 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, -- cgit v1.1