diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:53:13 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:53:20 +0300 |
| commit | 5cdc15a7b82b7adfd4c5cae85ffb4327593dd076 (patch) | |
| tree | 342fa9523f5400f4ecbcf6fde169021fabaff500 /src/doppelganger/schedulingpolicyservice.cpp | |
| parent | 9627172876cd2a387d44b5a9a6ce0a3867ebc730 (diff) | |
| parent | 5c160b6fe916e5605eaa1fd8394b62527ff9f997 (diff) | |
Merge branch 'stable' into releaseQtEE_v3.0.0
* stable: (25 commits)
Add notes about Quick Compiler failures
doc: Updated versions and supported platforms
doc: Updated links to Qt EE known issues and product page
Doc: Warn the user that his Nexus will be wiped.
doc: move adb connection change info to customization
Build wifi also on eLinux
Don't show Wi-Fi group box on iMX6-eAndroid
Fix class names for WebEngine
Doc: add note about webengine's widget apis
Doc: add change log for version 3.0.0
doc: include sabre sd documentation
Doc: Add setup instructions for Nexus 7 (2013)
Set initial "backend ready" state.
Port QtWifi to eLinux
Add a note about webengine and emulator
Doc: Update version
Doc: Add table with all possible MACHINE values
Doc: QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS replaces QT_QPA_GENERIC_PLUGINS
Doc: Use precise naming for Boundary Devices i.MX6
Add PowerManager service.
...
Change-Id: I2762dfe023d461b677d7ed748c33444145d35175
Diffstat (limited to 'src/doppelganger/schedulingpolicyservice.cpp')
| -rw-r--r-- | src/doppelganger/schedulingpolicyservice.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/doppelganger/schedulingpolicyservice.cpp b/src/doppelganger/schedulingpolicyservice.cpp index a7a3f17..365e97a 100644 --- a/src/doppelganger/schedulingpolicyservice.cpp +++ b/src/doppelganger/schedulingpolicyservice.cpp @@ -49,7 +49,7 @@ status_t SchedulingPolicyService::onTransact(uint32_t code, const Parcel &data, int32_t pid = data.readInt32(); int32_t tid = data.readInt32(); int32_t prio = data.readInt32(); - int res = requestPriority(pid, tid, prio); + int res = requestPriority_helper(pid, tid, prio); reply->writeNoException(); reply->writeInt32(res); return NO_ERROR; @@ -59,7 +59,16 @@ status_t SchedulingPolicyService::onTransact(uint32_t code, const Parcel &data, } } +#if Q_ANDROID_VERSION_MAJOR == 4 && Q_ANDROID_VERSION_MINOR < 3 int SchedulingPolicyService::requestPriority(int32_t pid, int32_t tid, int32_t prio) +#else +int SchedulingPolicyService::requestPriority(int32_t pid, int32_t tid, int32_t prio, bool) +#endif +{ + return requestPriority_helper(pid, tid, prio); +} + +int SchedulingPolicyService::requestPriority_helper(int32_t pid, int32_t tid, int32_t prio) { if (prio < PRIORITY_MIN || prio > PRIORITY_MAX) return PERMISSION_DENIED; |