Merge tag 'android-6.0.0_r26' into cm-13.0

Android 6.0.0 release 26

Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda

1 files changed, 0 insertions, 31 deletions

diff --git a/services/audioflinger/SchedulingPolicyService.h b/services/audioflinger/SchedulingPolicyService.h
deleted file mode 100644
index a9870d4..0000000
--- a/services/audioflinger/SchedulingPolicyService.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROID_SCHEDULING_POLICY_SERVICE_H
-#define _ANDROID_SCHEDULING_POLICY_SERVICE_H
-
-namespace android {
-
-// Request elevated priority for thread tid, whose thread group leader must be pid.
-// The priority parameter is currently restricted to either 1 or 2.
-// The asynchronous parameter should be 'true' to return immediately,
-// after the request is enqueued but not necessarily executed.
-// The default value 'false' means to return after request has been enqueued and executed.
-int requestPriority(pid_t pid, pid_t tid, int32_t prio, bool asynchronous = false);
-
-}   // namespace android
-
-#endif  // _ANDROID_SCHEDULING_POLICY_SERVICE_H