Merge "Grant CAP_WAKE_ALARM to the Bluetooth process for any user"

2016-01-28 00:52:41 +00:00
parent 6ebdbfa549 2956beeec9
commit 26fdbc1833
1 changed files with 1 additions and 1 deletions
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -608,7 +608,7 @@ static jint com_android_internal_os_Zygote_nativeForkAndSpecialize(
    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);
    }