diff options
| author | Victoria Lease <violets@google.com> | 2013-01-16 12:51:04 -0800 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2013-01-16 17:37:21 -0800 |
| commit | 79d59f0968ffcb803f615527d52718322af0f89b (patch) | |
| tree | c854d9fad38475ac2a8b48be9dfd74a13cdac321 /services | |
| parent | 4a0f95cffbb9925e95c216aea41f3450885d4061 (diff) | |
| download | frameworks_base-79d59f0968ffcb803f615527d52718322af0f89b.zip frameworks_base-79d59f0968ffcb803f615527d52718322af0f89b.tar.gz frameworks_base-79d59f0968ffcb803f615527d52718322af0f89b.tar.bz2 | |
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03
Conflicts:
services/java/com/android/server/ServiceWatcher.java
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ServiceWatcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
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, |