diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-08 12:38:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-08 12:38:24 +0000 |
| commit | 6bbda22e1c5604b0866068913c7466fa23d47818 (patch) | |
| tree | 8484dc2de800eb46dfd66f2f2693bf77090a0ac4 /core/java/android/hardware/Camera.java | |
| parent | 2c0971eeec76f5a4b0aee890f4a05d47020da2b6 (diff) | |
| parent | 29eadb328a71f912b0d479860286cd606ed3dc87 (diff) | |
| download | frameworks_base-6bbda22e1c5604b0866068913c7466fa23d47818.zip frameworks_base-6bbda22e1c5604b0866068913c7466fa23d47818.tar.gz frameworks_base-6bbda22e1c5604b0866068913c7466fa23d47818.tar.bz2 | |
am 29eadb32: am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '29eadb328a71f912b0d479860286cd606ed3dc87':
AArch64: Use long for pointers in hardware classes
Diffstat (limited to 'core/java/android/hardware/Camera.java')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 9913e33..6e2a099 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -150,7 +150,7 @@ public class Camera { private static final int CAMERA_MSG_PREVIEW_METADATA = 0x400; private static final int CAMERA_MSG_FOCUS_MOVE = 0x800; - private int mNativeContext; // accessed by native methods + private long mNativeContext; // accessed by native methods private EventHandler mEventHandler; private ShutterCallback mShutterCallback; private PictureCallback mRawImageCallback; |