← Back to branch summary

~cemil-azizoglu/mir/add-create-module-context-fn

« back to all changes in this revision

Viewing changes to 3rd_party/android-input/android/frameworks/base/services/input/Input.cpp

  • Committer: Cemil Azizoglu
  • Date: 2015-08-25 15:41:49 UTC
  • mfrom: (2795.2.83 development-branch)
  • Revision ID: cemil.azizoglu@canonical.com-20150825154149-tds8l20j20f1fdkm
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
3rd_party/android-input/android/frameworks/base/services/input/Input.cpp
127
127
        int32_t scanCode,
128
128
        int32_t metaState,
129
129
        int32_t repeatCount,
 
130
        uint64_t mac,
130
131
        std::chrono::nanoseconds downTime,
131
132
        std::chrono::nanoseconds eventTime) {
132
133
    InputEvent::initialize(deviceId, source);
136
137
    mScanCode = scanCode;
137
138
    mMetaState = metaState;
138
139
    mRepeatCount = repeatCount;
 
140
    mMac = mac;
139
141
    mDownTime = downTime;
140
142
    mEventTime = eventTime;
141
143
}
148
150
    mScanCode = from.mScanCode;
149
151
    mMetaState = from.mMetaState;
150
152
    mRepeatCount = from.mRepeatCount;
 
153
    mMac = from.mMac;
151
154
    mDownTime = from.mDownTime;
152
155
    mEventTime = from.mEventTime;
153
156
}
291
294
        float yOffset,
292
295
        float xPrecision,
293
296
        float yPrecision,
 
297
        uint64_t mac,
294
298
        std::chrono::nanoseconds downTime,
295
299
        std::chrono::nanoseconds eventTime,
296
300
        size_t pointerCount,
306
310
    mYOffset = yOffset;
307
311
    mXPrecision = xPrecision;
308
312
    mYPrecision = yPrecision;
 
313
    mMac = mac;
309
314
    mDownTime = downTime;
310
315
    mPointerProperties.clear();
311
316
    mPointerProperties.appendArray(pointerProperties, pointerCount);
325
330
    mYOffset = other->mYOffset;
326
331
    mXPrecision = other->mXPrecision;
327
332
    mYPrecision = other->mYPrecision;
 
333
    mMac = other->mMac;
328
334
    mDownTime = other->mDownTime;
329
335
    mPointerProperties = other->mPointerProperties;
330
336