summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * Initialize local variables to avoid data leakNaveen Leekha2015-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c ) For b/23696300 Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
| * | | | | | | Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-devAravind Akella2015-10-141-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Set DATA_INJECTION mode flag for sensors.Aravind Akella2015-09-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24001171 Change-Id: I70133546c68fb478b2c2062f05a4164a36cd9e4b
| * | | | | | | | egl: Remove window disconnect before calling driver eglDestroySurfaceJesse Hall2015-10-141-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally added for b/14445579. An in-development app was attempting to render to a window as an EGLSurface, then tear that down, change some window properties, and create a new EGLSurface. The second eglCreateWindowSurface failed because the window was already connected. This change went in, but it turned out the real problem was that the app still (unintentionally) had the surface current. After the app bug was fixed, nobody revisited whether this change was actually needed. Turns out it wasn't needed. After an EGLSurface is both destroyed *AND* not current (basically refcount==0), we were already disconnecting the window in ~egl_surface_t(). Apart from being unnecessary and redundant, disconnecting the window here is wrong for two reasons: (a) The surface may still be in use after eglDestroySurface, if it was still current. Rendering is undefined in that case, but disconnecting the window leads to more catastrophic results than necessary. (b) It's being called before calling the driver's eglDestroySurface. The driver will almost definitely have a buffer dequeued that it needs to cancel, and by disconnecting first we turn that into an error that they don't have a graceful way to deal with. Bug: 24524053 Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42
| * | | | | | | | Merge "add number constraint for samples per MotionEvent" into mnc-dr-devAdam Lesinski2015-10-122-1/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add number constraint for samples per MotionEventFlanker2015-10-122-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23905002 Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603 Signed-off-by: Adam Lesinski <adamlesinski@google.com>
| * | | | | | | | | Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-devPuneet Kumar2015-10-085-27/+58
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Inputflinger: hook up key event replacement processingDmitry Torokhov2015-09-295-27/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add handling of "replacement" key events in InputReader and EventHub by consulting device's character key map (if exists) for presence of replacement key code for given get code and meta state combination, before passing it to InputDispatcher. This enables defining special keys, such as ESC, on keyboards lacking enough physical keys, via combination of normal keys and modifiers, for example AltR + 1 => ESC. Bug: 24504154 Change-Id: I7e36104808bedcf724436c1fbb63d37c35cca8af
| * | | | | | | | | | Merge "Allow defining replacement key events in keymap" into mnc-dr-devPuneet Kumar2015-10-084-13/+115
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Allow defining replacement key events in keymapDmitry Torokhov2015-09-294-13/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently keyboard maps allow to assign character sequences to key events and allow specifying a so-called "fallback" key events that are re-injected into input stream if target application indicates that it was not able to handle the original key event. Unfortunately there is no way to perform substitution before handing the event to applicationis. This change adds a new keymap keyword "replace" that allows users query "replacement" actions for key (if any), with the intent that such replacement happens early in the event handling process. Bug: 24504154 Change-Id: I3e6a2476c856524171df00ad22ff56f2018c1278
* | | | | | | | | | | libbinder: allow devices to disable ashmem size trackingforkbomb2015-12-042-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The addition of ashmem size tracking can lead to parcel objects overwriting other values on the stack in old binary blobs. Change-Id: Ida52cec851a6f9d5a57c8f9130a5875c03dcb094
* | | | | | | | | | | libgui: Don't assign handle to NULL after free is commonCaio Schnepper2015-11-252-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reportedly Mali and PowerVR GPUs are crashing when setting handle to NULL So we will set a flag for the devices that might need this aswell Set BOARD_EGL_NEEDS_HANDLE_VALUE=true in BoardConfig.mk to use Change-Id: I6c967f62dc6adced7583d7b2045d11cf5b25fc80
* | | | | | | | | | | libgui: Don't assign handle to NULL after freeCaio Schnepper2015-11-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts c784dfc39fa1471b0f653206970ac9a256269256 for exynos4 devices with Mali 400 GPUs, which causes a fatal signal (SIGSEGV) and death of the graphics subsystem Change-Id: I6dbf8f8664fca01baf63fece7c64016609fe3e1c
* | | | | | | | | | | Merge branch 'LA.BF64.1.2.2_rb4.7' of ↵Steve Kondik2015-11-167-6/+117
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://codeaurora.org/platform/frameworks/native into cm-13.0 Change-Id: Ib29f744a0f7baac5d5ad8a7e9c5c14303b6aeec1
| * \ \ \ \ \ \ \ \ \ \ Merge "native: add ambient temperature & relative humidity sensor features"Linux Build Service Account2015-11-062-0/+72
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | native: add ambient temperature & relative humidity sensor featuresSatya Durga Srinivasu Prabhala2015-11-042-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding ambient temperature & relative humidity hardware sensor features as they are missing and causing CTS failures. Change-Id: I4f07db8e77cb77c5b2c1bb7ed80a26f68c91c23e
| * | | | | | | | | | | | sf: vds: Avoid HWC for certain scenariosManoj Kumar AVM2015-11-023-3/+28
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reserve HWC for VDS for WFD use case. During WFD usecase, sink usage will contain GRALLOC_USAGE_PRIVATE_WFD flag. When HWC is avoided, all virtual displays are composed using GLES. This means that GLES composes directly into the sink buffer and signals the consumer. Furthermore, it is expected that any color conversion will be handled on the consumer side. CRs-Fixed: 908380 Change-Id: I93ff54c79ece788b6caf3f4172835d8ac1362f62
| * | | | | | | | | | | SurfaceFlinger: Disable rotation animation on Secondary displaysArun Kumar K.R2015-10-262-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add support to set animating layer for HWCLayers - After hwc_prepare, dont override the compType of a layer to HWC_FRAMEBUFFER if its for non-primary displays Change-Id: Iac462778ce5fb9016290846146e62f80dcfafd5c CRs-fixed: 922304
* | | | | | | | | | | | sf : Apply user defined panel orientation to blur layerRamakant Singh2015-11-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blur layer need to capture screen shot to create to blur effect. Hence need to take care any user defined orientation as well. Change-Id: I1c0478810d12661edf2586293bbed342a5b4dc7e
* | | | | | | | | | | | Revert "surfaceflinger: Consolidate display orientation compensation hooks"Steve Kondik2015-11-103-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is completely breaking graphics. This reverts commit f8e2372ad7c6ab5ba0363352607f5ded918add01. Change-Id: I1d694f4228199891a191ce3fb924cec71a6100f0
* | | | | | | | | | | | surfaceflinger: Consolidate display orientation compensation hooksRicardo Cerqueira2015-11-103-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dedupe rotation calculation code and make rotation a statically available property in the DisplayDevice Change-Id: Ic517ab0d2c05026cd6fa46d664aab7926be17b62
* | | | | | | | | | | | surfaceflinger: odd hw rotation (90/270) patch for swapping width/heightHashcode2015-11-101-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch works in addition to the following commit re-implementing ro.sf.hwrotation: https://github.com/CyanogenMod/android_frameworks_native/commit/7d283431efffc4402cb1a6cacf5da64729c883bb When using values of 90 and 270 for ro.sf.hwrotation the LCD width and height also need to be swapped to display properly. Change-Id: I2874fdb8f8d8b855df6d62d338c9a22360491973 NOTE: This patch does not fix the initial startup of bootanimation
* | | | | | | | | | | | SurfaceFlinger: Native changes to add blur effectByunghun Jeon2015-11-0827-25/+955
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native changes to add blur-behind and blur mask effect Change-Id: I54faf82d750e8299de6d261f6a893ab26d08df84 SurfaceFlinger: Adding template for LayerBlur files Change-Id: I444009113b7bdd6c5284863fd1f56358e67d9fe6 SurfaceFlinger: Featurize libuiblur module for OSS build Change-Id: Ifdc176e699434125d17b111c044b8ba954cf717c
* | | | | | | | | | | | sensorservice: Don't replace HAL orientation sensorEthan Chen2015-11-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Previously HAL orientation sensor would always be replaced if the HAL did not provide a rotation vector sensor as well. Practically no HAL does, so the virtual sensor would always replace it. * Add the virtual sensor only if the HAL does not provide it. Change-Id: I50ad2cd6c60b53eddc4c6854997ec2e3dbff0d1a
* | | | | | | | | | | | installd: Consider bundled app dir as a valid apk pathSteve Kondik2015-11-074-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92db56f21bf91e0816b63faffcfbb270ca2d8fca
* | | | | | | | | | | | sensorservice: Register orientation sensor if HAL doesn't provide itArne Coucheron2015-11-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * In KitKat and on most Samsung devices, the orientation sensor is not getting registered, and makes the compass non-working in a lot of apps. This patch enables the sensor for such devices. Change-Id: I0ebba72ec4aa2cfa02c21a6daff0c356c6793fd0 (cherry picked from commit 98fa6f1152da759ef3eaf36cb16e0aaf2013376a)
* | | | | | | | | | | | sensorservice: Fix init sequence for pre-1.1 API sensor HALsRicardo Cerqueira2015-11-071-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sensors API introduced a new flush() method that older binaries won't have. For those, replace the firstFlush invocation with a setDelay call since a lot of implementations interpreted that as the initialization step. We also don't want any kind of call to flush() to happen when it isn't there, since it'll either hit a random OEM extension or a memory address we really don't want to execute. Change-Id: I26ce923fe385751fed7d1c483a53c074249f0620 sensorservice: Set the rate for pre-1.1 HALs _after_ activation We want to be sure these are applied in the same sequence they used to be... Change-Id: Ied2ba08ed3c4bed3a80bac6ab5471fcea9ba2c09
* | | | | | | | | | | | Fix boot animation rotation problem when ro.sf.hwrotation is set to 90 or 270Clyde Tan2015-11-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ad3c83e23ce38280818ec5283d173d50c889531
* | | | | | | | | | | | surfaceflinger: Reimplement hwrotationRicardo Cerqueira2015-11-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia26bb36b5b6de132af49c272c4472ad2703afbda
* | | | | | | | | | | | surfaceflinger: Set max acquired buffer countNaseer Ahmed2015-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If triple framebuffers are enabled, the number of acquired buffers isn't increased by default. Set the count to one less than the max buffers to make sure all three buffers come into play. Change-Id: I8fae1b5564fbea598e415a86b0a21c3449c92d87
* | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0537-399/+4117
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: include/android/input.h Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
| * \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-10-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Installd: Take boot status as dexopt parameterAndreas Gampe2015-09-223-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expect the boot status explicitly as a parameter so that we do not have to rely on dev.bootcomplete, which isn't meaningfully set when the device needs the decryption screen on boot. Bug: 23898216 Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
| | | | * | | | | | | | | Installd: Allow different behavior before bootcompleteAndreas Gampe2015-09-161-12/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check dev.bootcomplete in dex2oat(). Use the information for two changes. Only switch to the background when we're post bootcomplete. This will ensure better utilization after upgrades. Add a second dex2oat-threads property that is used pre bootcomplete. A separation of these phases allows using less cores when the device is up, freeing up resources for other purposes, e.g., avoid jank. The precedence during boot is the boot property, or the image property if the former doesn't exist, or the default property as a fallback. Bug: 23898216 Bug: 24004256 Change-Id: I5063f3fc4b437cbe88c4e94584e01c1c78eccc4d
| | | | * | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-150-0/+0
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-080-0/+0
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-060-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-310-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-290-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / | | | | | | | |/| / / / / / / / / / | | | | | | | | |/ / / / / / / / /
| | | | | | | | * | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-260-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-120-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|/ / / / / / / | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | * | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-080-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-060-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-040-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | * | | | | | | | Revert "Bug fix in SensorManager."Narayan Kamath2015-07-292-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 869eb2089ec8a6286b944bfcff57e4cbe0c7e207. Change-Id: I4fb865e3b18bbb011fa4e4b4732336930c3a45ae
| | | | | | | | | | | | | | * | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-290-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \