commit dc84cff34f020e4768e99fa08749bbe0b87a2233
author Pavlin Radoslavov <pavlin@google.com> Thu Jan 28 02:12:42 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 28 02:12:42 2016 +0000
tree d878d3675352f9cdad8508f7cdc5a5bca2c2fb06
parent ab00e4e38c113e2e0b60cde5d210e39683c75040
parent 26fdbc18337a8e9d16e18255e39ce7a16e83d57b

Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"
am: 26fdbc1833

* commit '26fdbc18337a8e9d16e18255e39ce7a16e83d57b':
  Grant CAP_WAKE_ALARM to the Bluetooth process for any user

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 041e693..4194aa4 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -608,7 +608,7 @@
     jlong capabilities = 0;
 
     // Grant CAP_WAKE_ALARM to the Bluetooth process.
-    if (uid == AID_BLUETOOTH) {
+    if (multiuser_get_app_id(uid) == AID_BLUETOOTH) {
       capabilities |= (1LL << CAP_WAKE_ALARM);
     }