diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-08 12:19:40 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-01-08 12:19:40 +0000 |
commit | 3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85 (patch) | |
tree | 0c3435280cae88b73cd227a7a94e62ddfc61b097 /services/core/java/com/android/server/lights | |
parent | 080d1bdd7f80ce4d68a99f5c3433bfc5f70d2e4b (diff) | |
parent | 92ae034756f9564b36ac0f8b44e800da63af07fc (diff) | |
download | frameworks_base-3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85.zip frameworks_base-3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85.tar.gz frameworks_base-3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85.tar.bz2 |
resolved conflicts for merge of 92ae0347 to klp-modular-dev
Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
Diffstat (limited to 'services/core/java/com/android/server/lights')
-rw-r--r-- | services/core/java/com/android/server/lights/LightsService.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java index d814785..62dc090 100644 --- a/services/core/java/com/android/server/lights/LightsService.java +++ b/services/core/java/com/android/server/lights/LightsService.java @@ -195,11 +195,11 @@ public class LightsService extends SystemService { } }; - private static native int init_native(); - private static native void finalize_native(int ptr); + private static native long init_native(); + private static native void finalize_native(long ptr); - static native void setLight_native(int ptr, int light, int color, int mode, + static native void setLight_native(long ptr, int light, int color, int mode, int onMS, int offMS, int brightnessMode); - int mNativePointer; + private long mNativePointer; } |