summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Check for the presence of accel and magnetometer sensors before ↵Chenjie Luo2015-07-221-2/+8
|\ | | | | | | adding AOSP fusion sensors." into mnc-dev
| * Check for the presence of accel and magnetometer sensors before adding AOSP ↵Aravind Akella2015-07-201-2/+8
| | | | | | | | | | | | | | fusion sensors. Bug: 22502485 Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
* | Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into ↵Lajos Molnar2015-07-211-10/+18
|\ \ | | | | | | | | | mnc-dev
| * | omx: fix structure sizes to be the same on 32 and 64-bit buildsLajos Molnar2015-07-211-10/+18
| |/ | | | | | | | | Bug: 22512621 Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
* | Only restorecon_data once for all users.Jeff Sharkey2015-07-201-4/+4
|/ | | | | | | | | | restorecon_data already iterates across all found users internally, so we don't need to call it for each UID moved. In fact, this was a bug that caused data for the owner to be relabeled when moving apps back to internal storage. Bug: 21813384 Change-Id: I5ba76d4f30d129365864c8a25b665f344b99a6b4
* BufferQueueConsumer: signal onFrameReleased on dropped framesLajos Molnar2015-07-171-129/+142
| | | | | Bug: 22552826 Change-Id: I9bdfeb8c68f403301af90d4b494f0ae7166a767c
* Installd: Add a swap override flagAndreas Gampe2015-07-161-7/+36
| | | | | | | | Add dalvik.vm.dex2oat-swap system property to override a default decision. Bug: 20658562 Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
* Merge "Cancel touches as well as pointer gestures." into mnc-devMichael Wright2015-07-142-5/+33
|\
| * Cancel touches as well as pointer gestures.Michael Wright2015-07-132-5/+33
| | | | | | | | | | Bug: 19264992 Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
* | Merge "Rename wakelock held internally by SensorService." into mnc-devAravind Akella2015-07-131-2/+2
|\ \ | |/ |/|
| * Rename wakelock held internally by SensorService.Aravind Akella2015-07-101-2/+2
| | | | | | | | | | Bug: 22076400 Change-Id: I62129549b0681f200f40da01f53140245309ed88
* | DO NOT MERGE ANYWHERE. reset back to 570052f with history.Qiwen Zhao2015-07-090-0/+0
|\ \ | |/ |/|
| * Merge "Cancel touches as well as pointer gestures." into mnc-devMichael Wright2015-07-0925-310/+4102
| |\ |/ /
| * Cancel touches as well as pointer gestures.Michael Wright2015-07-092-5/+33
| | | | | | | | | | Bug: 19264992 Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
| * am 00078817: am 59a33a01: (-s ours) am dbc2d87a: Merge "Installd: Fix ↵Narayan Kamath2015-07-010-0/+0
| |\ | | | | | | | | | | | | | | | | | | delete_code_cache() clearing the wrong cache dir" * commit '000788178c411e2c6e5ee99f25cffe6662c5ee66': Installd: Fix delete_code_cache() clearing the wrong cache dir
| | * am 59a33a01: (-s ours) am dbc2d87a: Merge "Installd: Fix delete_code_cache() ↵Narayan Kamath2015-07-010-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | clearing the wrong cache dir" * commit '59a33a012d64d21fb73cac527ef25db8a0478d23': Installd: Fix delete_code_cache() clearing the wrong cache dir
| | | * am dbc2d87a: Merge "Installd: Fix delete_code_cache() clearing the wrong ↵Narayan Kamath2015-07-011-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache dir" * commit 'dbc2d87a74987db84f6cb3cf1eed9ae7ca450ce7': Installd: Fix delete_code_cache() clearing the wrong cache dir
| | | | * Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"Narayan Kamath2015-07-011-1/+1
| | | | |\
| | | | | * Installd: Fix delete_code_cache() clearing the wrong cache dirHao Li2015-07-011-1/+1
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo in delete_code_cache() introduced by commit c03de09, which causes the function to empty /data/data/<package_name>/cache/ rather than /data/data/<package_name>/code_cache/. The following CTS test case should now pass: com.android.cts.appsecurity.SplitTests#testClearCodeCache Change-Id: I2d9452d70ed39b3ea29ad65fb35e788c2fef5100 Signed-off-by: Hao Li <hao.i.li@intel.com> Signed-off-by: Yu Ning <yu.ning@intel.com>
| * | | | am b5d6ec7c: am e59cb43e: Fix writeByteArray/writeInt32Array size on x64Chad Brubaker2015-06-301-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'b5d6ec7cff06e6cbeeb238bea535c54a67e94d49': Fix writeByteArray/writeInt32Array size on x64
| | * | | am e59cb43e: Fix writeByteArray/writeInt32Array size on x64Chad Brubaker2015-06-301-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e59cb43edad0eff28a81b18c3c4484442ff680dd': Fix writeByteArray/writeInt32Array size on x64
| * | \ \ \ am 6a25a287: am 806334aa: am 1998615f: Merge "sf: Initialize EventThread ↵Dan Stoza2015-06-301-9/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before creating HWC" * commit '6a25a2872852f23058268adcec61600460fcdfb6': sf: Initialize EventThread before creating HWC
| | * | | | am 806334aa: am 1998615f: Merge "sf: Initialize EventThread before creating HWC"Dan Stoza2015-06-301-9/+9
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '806334aacd089d1c419ed77021a2b1bb4f7644ef': sf: Initialize EventThread before creating HWC
| | | * | | am 1998615f: Merge "sf: Initialize EventThread before creating HWC"Dan Stoza2015-06-301-9/+9
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | * commit '1998615f8b5becc6d2bb309a4a1686fe24c71bbc': sf: Initialize EventThread before creating HWC
| | | | * | Merge "sf: Initialize EventThread before creating HWC"Dan Stoza2015-06-301-9/+9
| | | | |\ \
| | | | | * | sf: Initialize EventThread before creating HWCSaurabh Shah2015-06-171-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once HWC is created, it could use any of the provided hooks, which could lead to a crash if the EventThread (handler) isn't initialized prior to creating HWC. Change-Id: I5ea35fe9bcb150fb74aae1295b798bd787ad6cee
| * | | | | | am b5b21d18: am fe608c5e: Merge "Fix directory path of codecache." into mnc-devDaichi Hirono2015-06-301-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b5b21d1837ba2039293feb283117e8ee441ec2a8': Fix directory path of codecache.
| | * | | | | am fe608c5e: Merge "Fix directory path of codecache." into mnc-devDaichi Hirono2015-06-301-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe608c5e3c75714e4aa6c31e048f4a15e4951411': Fix directory path of codecache.
| * | \ \ \ \ \ am fd0fdaf7: am 3643c88f: Merge "Send cancelation events to monitors when ↵Michael Wright2015-06-292-1/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | injection fails." into mnc-dev * commit 'fd0fdaf73b1e8fbf643152f532f500be70f11a26': Send cancelation events to monitors when injection fails.
| | * | | | | | am 3643c88f: Merge "Send cancelation events to monitors when injection ↵Michael Wright2015-06-292-1/+16
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails." into mnc-dev * commit '3643c88f7b557e241d65c4857eaf49e28e7c03a2': Send cancelation events to monitors when injection fails.
| * | \ \ \ \ \ \ am c28e8663: am 9c8efe6d: am dd749506: Merge "Fix async_stop"John Reck2015-06-290-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c28e8663dd4a14a7af7bd6a59cc0b490e31c778a': Fix async_stop
| | * | | | | | | am 9c8efe6d: am dd749506: Merge "Fix async_stop"John Reck2015-06-290-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '9c8efe6dfddc9a4800283952caacdaf9b898c43d': Fix async_stop
| | | * | | | | | am dd749506: Merge "Fix async_stop"John Reck2015-06-291-1/+1
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0': Fix async_stop
| | | | * | | | | Merge "Fix async_stop"John Reck2015-06-291-1/+1
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | | * | | | Fix async_stopJohn Reck2015-06-291-1/+1
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41 (cherry picked from commit 2c237ee1d5961b9d11618e0c5a97b3bb7fb694b2)
| * | | | | | | am 488986f4: am f413de05: Merge "libgui: Fix handling of rotated surface ↵Dan Stoza2015-06-262-18/+52
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | damage" into mnc-dev * commit '488986f4ad7a92b04fdfd761ae07785019d2a9d3': libgui: Fix handling of rotated surface damage
| | * | | | | | am f413de05: Merge "libgui: Fix handling of rotated surface damage" into mnc-devDan Stoza2015-06-262-18/+52
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f413de05cfb9a1b84b73c8e6c306d4142130c5f7': libgui: Fix handling of rotated surface damage
| * | \ \ \ \ \ \ am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" ↵Lajos Molnar2015-06-262-0/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '3875698f8d47af86e024817889e4107392d20439': omx: add OMX_IndexParamConsumerUsageBits
| | * | | | | | | am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-devLajos Molnar2015-06-262-0/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e74f1557c7030a6c988d8e4cd940c933c4237ac8': omx: add OMX_IndexParamConsumerUsageBits
| * | \ \ \ \ \ \ \ am 2f105552: (-s ours) am 562d470d: am 209ea40e: (-s ours) am 9e415d71: DO ↵Anthony Hugh2015-06-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE: Introduce stem keycodes for Wear * commit '2f105552ef33a4cd4be199ac895041dc6ea628d4': DO NOT MERGE: Introduce stem keycodes for Wear
| | * | | | | | | | am 562d470d: am 209ea40e: (-s ours) am 9e415d71: DO NOT MERGE: Introduce ↵Anthony Hugh2015-06-260-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stem keycodes for Wear * commit '562d470d2ca9ac159ab20fbac32bb0d8ca7b029e': DO NOT MERGE: Introduce stem keycodes for Wear
| * | \ \ \ \ \ \ \ \ am 79439299: am 28381e45: am d2fb7a6e: am 8728c390: am 2c4f5fde: am ↵Adam Lesinski2015-06-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created * commit '794392999ecf1dae9b335aab3dd4b4627a6d07c7': Verify that the native handle was created
| | * | | | | | | | | am 28381e45: am d2fb7a6e: am 8728c390: am 2c4f5fde: am 861c3f56: am ↵Adam Lesinski2015-06-260-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9004e7f5: am 4ff0cb44: Verify that the native handle was created * commit '28381e45de69a861d6b0d9e9cc9e8e1607a9a18f': Verify that the native handle was created
| * | | | | | | | | | | Introduce stem keycodes for WearAnthony Hugh2015-06-242-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds four new stem keycodes for Android Wear. These keycodes are intended to represent the various hardware buttons around the watch. There is one primary stem key that will be used for power/settings and three generic stem keys that will be customizable. BUG: 21903503 Change-Id: I60f87f027fa4d4b19933d96b4110019805b30895
| * | | | | | | | | | | am e6045537: am 7a1b5d5d: Merge "Fix crash in SensorService. Ignore devices ↵Aravind Akella2015-06-241-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with no sensors." into mnc-dev * commit 'e6045537bbce4c4f98e6a1149187bbcdaff57bcd': Fix crash in SensorService. Ignore devices with no sensors.
| | * | | | | | | | | | am 7a1b5d5d: Merge "Fix crash in SensorService. Ignore devices with no ↵Aravind Akella2015-06-241-0/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensors." into mnc-dev * commit '7a1b5d5dec10f05ec29e7251ada440b47a34c6aa': Fix crash in SensorService. Ignore devices with no sensors.
| * | \ \ \ \ \ \ \ \ \ \ am c8c0992a: am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag ↵Dan Stoza2015-06-235-14/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes" into mnc-dev * commit 'c8c0992ace7733c983e87e8e7154d844a54e5741': libgui/SF: Propagate SECURE Layer flag changes
| | * | | | | | | | | | | am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-devDan Stoza2015-06-235-14/+16
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0638a4fac7250e260c0102c770090cb7eefca936': libgui/SF: Propagate SECURE Layer flag changes
| * | \ \ \ \ \ \ \ \ \ \ \ am 7d3ad695: Merge commit \'71997c1a\' into manualmergeMichael Wright2015-06-232-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d3ad695304a1f24026227e630add6edd76fd0d6': Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
| | * | | | | | | | | | | | Merge commit '71997c1a' into manualmergeMichael Wright2015-06-232-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
generated by cgit v1.1 at 2025-01-10 13:05:29 +0000