summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* goldfish: Rebrand to LineageOScm-11.0Tim Schumacher2017-07-153-4/+4
| | | | | | Keeping the defconfig name unchanged for now Change-Id: Ib43406065560879900748bcf99745f1aac11e5a2
* Build for goldfish at cm11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Takahashi Hamuzo2014-05-141-1/+1
| | | | Change-Id: Id2b613111a8eb766637285cf2764f6f9cb772a74
* Merge branch 'master' of ↵Chirayu Desai2013-11-295-19/+46
|\ | | | | | | | | | | https://android.googlesource.com/device/generic/goldfish into HEAD Change-Id: I562aec2c45bdbdd656822266cb7c2bc8a1a4ad4b
| * Merge commit '828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEADThe Android Open Source Project2013-11-229-56/+62
| |\
| | * am 2524d396: Update emulator to FUSE-wrap its SD card.Jeff Sharkey2013-10-092-2/+8
| | |\ | | | | | | | | | | | | | | | | * commit '2524d39681566f4eca7afb7950e05ab642978263': Update emulator to FUSE-wrap its SD card.
| | * \ am e8122dff: camera3: Fix stream id typesZhijun He2013-09-091-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'e8122dff1ef2de4d41835265a59d8960e7800fae': camera3: Fix stream id types
| | * \ \ am 3bd0e079: Merge "Return EGL_FALSE if eglChooseConfig failed to find any ↵Jesse Hall2013-08-131-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matching configs" * commit '3bd0e079a9d5321f952c2871fb453775810879f7': Return EGL_FALSE if eglChooseConfig failed to find any matching configs
| * | \ \ \ Merge "Modify the build targets for goldfish from to include aosp*."Elliott Hughes2013-11-211-1/+1
| |\ \ \ \ \
| | * | | | | Modify the build targets for goldfish from to include aosp*.Raghu Gandham2013-11-111-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows egl.cfg to be copied to $(TARGET_OUT)/lib/egl for aosp* build targets. This patch fixes the emulator to boot with "-gpu on" flag. Change-Id: I6c291a4a0fd82242d7f2ac41229be202aa7c71e0
| * | | | | Merge "Delete buffer data when removing it from the SharedGroup namespace"Jesse Hall2013-11-091-14/+36
| |\ \ \ \ \
| | * | | | | Delete buffer data when removing it from the SharedGroup namespaceJesse Hall2013-11-091-14/+36
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating or deleting data associated with a buffer object was clearing the name->data association, but not actually deallocating the data. Thanks to manjian2006 for finding the bug and proposing the fix. Bug: 60468 Change-Id: I477f1e67d33a486419127ac790f32ddbbf566089
| * | | | | Merge "Catch divide by zero case in drawCheckerBoard() function."Xavier Ducrohet2013-11-081-0/+7
| |\ \ \ \ \
| | * | | | | Catch divide by zero case in drawCheckerBoard() function.Douglas Leung2013-10-151-0/+7
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I247bc6b725b29ea0e729114ab67ec1d4c78b0336 Signed-off-by: Douglas Leung <douglas@mips.com>
| * | | | | Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."Nick Kralevich2013-11-071-4/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.Stephen Smalley2013-11-061-4/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The in_qemu boolean is unnecessary with the goldfish-specific rules moved to their own goldfish-specific directory and the restorecon /sys/qemu_trace is obsoleted by the init restorecon of /sys. Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
| * | | | Merge "Return EGL_FALSE if eglChooseConfig failed to find any matching configs"Jesse Hall2013-08-131-0/+2
| |\ \ \ \
| | * | | | Return EGL_FALSE if eglChooseConfig failed to find any matching configsMartin Storsjo2013-08-111-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Technically, we shouldn't have touched *num_config at all in this case, but the remote interface to the host doesn't return a separate boolean return value, only the number of matching configs. This makes sure that callers that only check the return value of eglChooseConfig notice a failure to find configs. Change-Id: I7f660a4a5b8306184608a86c34329d3163ad05ba
* | | | | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-019-56/+62
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | Android 4.4 Release 1.0
| * | | | Update emulator to FUSE-wrap its SD card.Jeff Sharkey2013-10-092-2/+8
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 11150877 Change-Id: Ie5644beb00391270e4ba3120ff399d667c34e02a
| * | | camera3: Fix stream id typesZhijun He2013-09-061-3/+3
| | |/ | |/| | | | | | | | | | Bug: 10604704 Change-Id: I93b7b932f13e7d90d843e74ec8c4e6bae3a2987b
| * | Camera2/3: Implement full-color NV21 output.Eino-Ville Talvala2013-08-052-16/+37
| | | | | | | | | | | | | | | | | | | | | | | | Needed for full CTS compliance, and existing grayscale-only output makes debugging color plane issues on the emulator impossible. Bug: 8949720 Change-Id: Iea9a1a8508b2c05c2fd81bb4d2c729986e1184af
| * | get rid of HAL pixelformats 5551 and 4444Mathias Agopian2013-07-262-12/+0
| | | | | | | | | | | | Change-Id: If69c5cdb02dd8308963165a09b5d7fe3b00077ae
| * | Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by ↵Colin Cross2013-07-191-0/+1
| |\ \ | | | | | | | | | | | | default."
| | * | Added net.dns1 prop for emulator, as Android emulator ignores it by default.Ron Munitz2013-07-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit sets up the system property which is actually used by the Connectivity Service (frameworks/base/services/java/com/android/server/ConnectivityService.java). It fixes an (obsolete?) convention where the dns was affected directly by the interface (i.e. "net.eth0.dns1=10.0.2.3"), which causes the Android Emulator (goldfish) to ignore this value, and effectively have no DNS resolving at all. An immediate fix can be either add reference to net.eth%s.dns%s in the ConnectivityService and possibly on the dhcp code as well which would be bloated, or just stick to the apparant new convention. I chose the latter as a one line fix which gets the job done. Change-Id: Id4364129e9a82c1f48403068a837aca54de07944
| * | | Merge "Camera2/3: Update static metadata"Zhijun He2013-07-184-21/+10
| |\ \ \
| | * | | Camera2/3: Update static metadataZhijun He2013-07-184-21/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I795d30f236a65d610e0801f5c98f1191d18f0a21
| * | | | am 8f9288ea: goldfish: use fstab.goldfishNick Kralevich2013-07-152-2/+8
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| * commit '8f9288eaf10b50d19038f5c7024616e147c64735': goldfish: use fstab.goldfish
| | * | goldfish: use fstab.goldfishNick Kralevich2013-07-122-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't rely on init.rc to mount our filesystems for us. Do it ourselves from fstab.goldfish. Change-Id: I80ba51f34e8d34b24bc7b14f527ac507d2d819e1
| * | | am bf34d172: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-270-0/+0
| |\| | | | | | | | | | | | | | * commit 'bf34d1722ea1ebdf779837611220b5269bd35968':
| | * | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-270-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I7dd794334041b286e59df0c1e84ba2026176c2f9
| * | | | am 2c84e47e: am 07a4c8b4: Camera3: Fix default AE modeEino-Ville Talvala2013-06-261-2/+2
| |\| | | | | |_|/ | |/| | | | | | | | | | * commit '2c84e47e3d0085b1222de94013c75c0328b02492': Camera3: Fix default AE mode
| | * | am 07a4c8b4: Camera3: Fix default AE modeEino-Ville Talvala2013-06-261-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '07a4c8b42f561c05893e98f3d9feb7dc5f35a0ae': Camera3: Fix default AE mode
| * | | | Make software VP9 video decoder available to MediaCodec.hkuang2013-06-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires the changes in frameworks/av Change-Id: I2ea2ee5ec9372a809e9f0313da776c2f6e4adbf3
| * | | | am edb073ef: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release ↵The Android Open Source Project2013-06-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit 'edb073efd3c4cee5595f5692b22a69a1e3bc89fe': Flush QemuPipeStream when needed
| | | \ \
| | | \ \
| | *-. \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-060-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie82b1c1ca10b0d4e25b06ec917e23a3703177d5b
| | | * | | | Flush QemuPipeStream when neededPetar Jovanovic2013-06-052-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under some circumstances, close color buffer messages in the command stream do not reach the host as the size of the undelivered commands is small. This results in refcounts of ColorBuffer never dropping to zero and color buffers not being freed. The patch calls flush at the end of rcCloseColorBuffer_enc(). In addition, the stream is flushed before it is deleted in the destructor of QemuPipeStream, since it may also have important messages. bug: 9278661 Change-Id: I46f20af8e0c272ec8d831d62f57cb2f22c7b28a7
| * | | | | | am ce4f740c: am 1b87456f: Flush QemuPipeStream when neededPetar Jovanovic2013-06-052-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ce4f740ce0a376c6d2942d8fb99acec2c3a864ad': Flush QemuPipeStream when needed
| | * | | | | am 1b87456f: Flush QemuPipeStream when neededPetar Jovanovic2013-06-052-0/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1b87456faa939b8a76a54336818131fb72b85ca6': Flush QemuPipeStream when needed
| * | | | | | | am 8bf2a8ae: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8bf2a8aea4a8a6f597bed67b8c6f63d1df5f2a27':
| | * | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | Change-Id: I5c03a5dc530bc9225622761ce1fe0e4e1c574de2
| * | | | | | | am 87ce3426: am 30717de9: camera3: Make front cameras limited mode, back ↵Igor Murashkin2013-05-242-0/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cameras full mode * commit '87ce3426077d16b6bd5b613bcacb209edfc35481': camera3: Make front cameras limited mode, back cameras full mode
| | * | | | | | am 30717de9: camera3: Make front cameras limited mode, back cameras full modeIgor Murashkin2013-05-242-0/+17
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30717de92454be87aa55ac91d2b94a7872a0fcfb': camera3: Make front cameras limited mode, back cameras full mode
| * | | | | | | | am e58de6ad: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e58de6adc10487e85b4005bf560d2e183d7286ca':
| | * | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic490e3e5cfff08ff3e464af2b14b7c9105f9537a
| * | | | | | | | | am 475ee270: am fd098c5a: Merge "Increase apn resource files version"Robert Greenwalt2013-05-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '475ee270d3bb4972c4fc60dd71b9fa46e60875a5': Increase apn resource files version
| | * | | | | | | | am fd098c5a: Merge "Increase apn resource files version"Robert Greenwalt2013-05-130-0/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd098c5a1c6b15dec5f6d546f82aa9992148a641': Increase apn resource files version
| | | * \ \ \ \ \ \ \ Merge "Increase apn resource files version"Robert Greenwalt2013-05-132-2/+2
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Increase apn resource files versionAntonio Marín Cerezuela2013-05-132-2/+2
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of Change id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819 Change-Id: Ib8e7370ebc99c1518e6d9337621e64966c128a0b APN database version have been upgraded to 8. Source apns files should be updated as well. Change-Id: Iaa63fabf922d222a184849fd8cc72e86dc3d9efa
| * | | | | | | | | | am 13baa8bd: am 7cb87e43: Merge "Gralloc/Camera3: Support new ↵Eino-Ville Talvala2013-05-094-17/+183
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAL_PIXEL_FORMAT_YCbCr_420_888 format" into jb-mr2-dev * commit '13baa8bdcae4e0a13c21ddf22336a07a4c2eaa09': Gralloc/Camera3: Support new HAL_PIXEL_FORMAT_YCbCr_420_888 format
| | * | | | | | | | | am 7cb87e43: Merge "Gralloc/Camera3: Support new ↵Eino-Ville Talvala2013-05-094-17/+183
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAL_PIXEL_FORMAT_YCbCr_420_888 format" into jb-mr2-dev * commit '7cb87e43550cae1e051530994a2c30e89a268862': Gralloc/Camera3: Support new HAL_PIXEL_FORMAT_YCbCr_420_888 format