resolved conflicts for merge of 92ae0347 to klp-modular-dev

Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f

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;
 }