summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement missing safelyRun() on ThreadedRendererJohn Reck2014-02-116-2/+37
| | | | Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
* Merge "Refactor HardwareLayer"John Reck2014-02-1122-758/+757
|\
| * Refactor HardwareLayerJohn Reck2014-02-1022-758/+757
| | | | | | | | | | | | | | Defer all the things! Groundwork to allow hardware layers to work in a renderthread world Change-Id: Ib3aa47525f393083621254a743dbaa6352f933bd
* | am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in ↵Narayan Kamath2014-02-116-90/+113
|\ \ | | | | | | | | | | | | | | | | | | GLES_JNI/EGL classes" * commit '86fb9904ad5760cb957782b45e96054c01fe4200': Use long to store pointers in GLES_JNI/EGL classes
| * \ am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL ↵Narayan Kamath2014-02-116-90/+113
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | classes" * commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb': Use long to store pointers in GLES_JNI/EGL classes
| | * \ am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes"Narayan Kamath2014-02-116-90/+113
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '3aeb629d8251699237e3d067be4fb44ba206626c': Use long to store pointers in GLES_JNI/EGL classes
| | | * \ Merge "Use long to store pointers in GLES_JNI/EGL classes"Narayan Kamath2014-02-116-90/+113
| | | |\ \
| | | | * | Use long to store pointers in GLES_JNI/EGL classesAshok Bhat2014-01-316-90/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43b32f2a85c07b3f59c57e28e3d03e8d1cabcd8b Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '43c9516a29563131e04ee797562130e2c4f9d54e': Fix in MediaMuxer's JNI code
| * | | | | am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc': Fix in MediaMuxer's JNI code
| | * | | | am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"Narayan Kamath2014-02-111-2/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '7b7726b7982063034667c6a6076cc0b390ede8ce': Fix in MediaMuxer's JNI code
| | | * | | Merge "Fix in MediaMuxer's JNI code"Narayan Kamath2014-02-111-2/+2
| | | |\ \ \
| | | | * | | Fix in MediaMuxer's JNI codeAshok Bhat2014-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android_media_MediaMuxer_native_setup should return jlong. It was incorrectly returning jint. Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | am a9d171bd: am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ↵Narayan Kamath2014-02-112-19/+19
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConsumerIrService" * commit 'a9d171bd5bab29feaef409489ed23d3c490285ce': Use long to store pointers in ConsumerIrService
| * | | | | | am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ↵Narayan Kamath2014-02-112-19/+19
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConsumerIrService" * commit '5c770dfba2846ee173d147fd974f8e9f073c1534': Use long to store pointers in ConsumerIrService
| | * | | | | am b823bd45: Merge "Use long to store pointers in ConsumerIrService"Narayan Kamath2014-02-112-19/+19
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b823bd45600fc339ae2e618d5fe506ace74ada4a': Use long to store pointers in ConsumerIrService
| | | * | | | Merge "Use long to store pointers in ConsumerIrService"Narayan Kamath2014-02-112-19/+19
| | | |\ \ \ \
| | | | * | | | Use long to store pointers in ConsumerIrServiceAshok Bhat2014-02-072-19/+19
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4e6562b7dc09f87ad80b1e862b614a370d37feb5 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in ↵Narayan Kamath2014-02-114-53/+53
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EmojiFactory and PdfDocument" * commit 'd350af9695018e81f85600fb7dd906003cbaf62e': Use long for pointers in EmojiFactory and PdfDocument
| * | | | | | am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and ↵Narayan Kamath2014-02-114-53/+53
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PdfDocument" * commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659': Use long for pointers in EmojiFactory and PdfDocument
| | * | | | | am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"Narayan Kamath2014-02-114-53/+53
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f44a3f1e00e38b09f70efed3eaf771871435e478': Use long for pointers in EmojiFactory and PdfDocument
| | | * | | | Merge "Use long for pointers in EmojiFactory and PdfDocument"Narayan Kamath2014-02-114-53/+53
| | | |\ \ \ \
| | | | * | | | Use long for pointers in EmojiFactory and PdfDocumentAshok Bhat2014-01-314-53/+53
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I275c9ce390dd9e01f772e2044c74cebdb0701de6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | am deefd1fd: am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic ↵Narayan Kamath2014-02-111-4/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hash_type instead of hash_t" * commit 'deefd1fdeaf0b538a13219517f8795fdde198e21': Fix TinyHashMap to use generic hash_type instead of hash_t
| * | | | | | am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type ↵Narayan Kamath2014-02-111-4/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of hash_t" * commit '5f7c0b1d80f883fa15f88e0e4d508576a36a45de': Fix TinyHashMap to use generic hash_type instead of hash_t
| | * | | | | am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"Narayan Kamath2014-02-111-4/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '6d8b21a84c92904a966d77f3c6c0282e92c2b077': Fix TinyHashMap to use generic hash_type instead of hash_t
| | | * | | | Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"Narayan Kamath2014-02-111-4/+2
| | | |\ \ \ \
| | | | * | | | Fix TinyHashMap to use generic hash_type instead of hash_tAshok Bhat2014-02-071-4/+2
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TinyHashMap used hash_t(key) to generate hashcode. This would not work for 64-bit pointers as hash_t is declared as an uint32_t. Replaced the hash_t(key) call to more generic android::hash_type(key). This function is a template function declared in TypeHelpers.h and has a version available for all data types including pointers. Change-Id: I612cf18b49ca7c30b63f9d6938df68fed7d80d08 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | Fix build.Narayan Kamath2014-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | com.android.server.SystemServer was no longer imported on master. Change-Id: Ie712aa28940953952aa7a99cbb22f74129649249
* | | | | | | am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a ↵Jeff Brown2014-02-1119-197/+177
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context." into klp-modular-dev * commit '25df673b849de374cf1de40250dfd8a48b7ac28b': Make SystemService constructor take a Context.
| * | | | | | am 1b51c9cb: Merge "Make SystemService constructor take a Context." into ↵Jeff Brown2014-02-1119-197/+177
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '1b51c9cb96fe2a0818289857a016521eed1ec183': Make SystemService constructor take a Context.
| | * \ \ \ \ \ Merge "Make SystemService constructor take a Context." into klp-modular-devJeff Brown2014-02-1119-197/+177
| | |\ \ \ \ \ \
| | | * | | | | | Make SystemService constructor take a Context.Jeff Brown2014-02-1019-197/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change simplifies the process of initializing a SystemService by folding the onCreate() step back into the constructor. It removes some ambuiguity about what work should happen in the constructor and should make it possible for services to retain most of their final fields after refactoring into the new pattern. Change-Id: I25f41af0321bc01898658ab44b369f9c5d16800b
* | | | | | | | | am 2d6b55aa: am 312ba86b: Change task removal sequenceCraig Mautner2014-02-112-11/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d6b55aaa9dd03f7d934f7a192989513b1087357': Change task removal sequence
| * | | | | | | | am 312ba86b: Change task removal sequenceCraig Mautner2014-02-112-11/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '312ba86b476fa1d83864a7d465135cc9a4e94ad8': Change task removal sequence
| | * | | | | | | Change task removal sequenceCraig Mautner2014-02-102-11/+11
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove task after removing activity. Removing the task before removing the activity led to problems when the task was still needed. - In WindowManager wait for activity manager to remove the task. Previously was automatically removing the task when the last activity was removed. Fixes bug 12957434. Change-Id: I7f6b1f09a2e2a845f177f337769075c9376f8bdb
* | | | | | | | Merge "Maybe fix issue #12957738: SecurityException in..."Dianne Hackborn2014-02-111-15/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Maybe fix issue #12957738: SecurityException in...Dianne Hackborn2014-02-101-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...Multiple Processes: uid 10069 does not have android.permission.UPDATE_DEVICE_STATS. Change-Id: Ibabb5b09d52412df8bebdc85a584f89e175b1ec5
* | | | | | | | | am 27f2d46a: (-s ours) am eaf82374: am 38d799fc: Merge "Generic object based ↵Tim Murray2014-02-100-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data copy." * commit '27f2d46a24e840ac5682635dddd0e28dd66172ad': Generic object based data copy.
| * | | | | | | | am eaf82374: am 38d799fc: Merge "Generic object based data copy."Tim Murray2014-02-101-234/+247
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'eaf82374186bd7084826f1cd258c82a3c6a4bf29': Generic object based data copy.
| | * | | | | | | am 38d799fc: Merge "Generic object based data copy."Tim Murray2014-02-101-234/+247
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '38d799fc7a272c3c6ff7b9bc7b7f9239b45bf98c': Generic object based data copy.
| | | * | | | | | Merge "Generic object based data copy."Tim Murray2014-02-101-234/+247
| | | |\ \ \ \ \ \
| | | | * | | | | | Generic object based data copy.Jason Sams2014-02-101-234/+247
| | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change consolidates the copy paths to Object based. The runtime now uses reflection to identify the type of array present. This adds support for long/double and reduces the amount of code present. We could also support arrays of vectors or objects in the future with this mechanism. Change-Id: I2297c1c01fbe6a64c375d6368f25d7db781ea788
* | | | | | | | | Merge "Revert "Move inputservice over to frameworks/native""Michael Wright2014-02-1021-14/+17147
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Revert "Move inputservice over to frameworks/native"Michael Wright2014-02-1021-14/+17147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 89e5c7ebb37fabc4368e87e17a502db62598bd61.
* | | | | | | | | Merge "Move inputservice over to frameworks/native"Michael Wright2014-02-1021-17147/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Move inputservice over to frameworks/nativeMichael Wright2014-02-1021-17147/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all of the pieces except the PointerController and SpriteController over to frameworks/native in preparation for inputflinger. Those two need to stay in frameworks/base for now because they depend on Skia currently. In the long run they should be merged into either the InputManager or the WindowManager rather than as a part of the inputservice / inputflinger. Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
* | | | | | | | | Merge "Remove SkRegion dependency from libinput"Michael Wright2014-02-104-11/+28
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Remove SkRegion dependency from libinputMichael Wright2014-02-104-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets us one step closer to removing our dependency on Skia, which is at least one of the things blocking us from moving the input system out of f/b. Change-Id: I755e6267996c93fe700f1056327386923287575a
* | | | | | | | | am 675d44ad: am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors ↵Colin Cross2014-02-102-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inside ALOGV" * commit '675d44ad2355eb4404e286f2c337196297d1e26f': frameworks/base: fix errors inside ALOGV
generated by cgit v1.1 at 2025-01-25 14:01:20 +0000