summaryrefslogtreecommitdiffstats
path: root/cmds/bootanimation
Commit message (Collapse)AuthorAgeFilesLines
* Track removal of refcounts from FileMap.Narayan Kamath2015-02-232-3/+3
| | | | | | Use delete instead of release. Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
* kill HAVE_PTHREADS.Yabin Cui2015-01-261-10/+2
| | | | | Bug: 19083585 Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
* Fix class vs. struct mismatchBernhard Rosenkränzer2014-11-242-3/+4
| | | | | | | | Don't refer to classes as structs and view versa -- causes warnings in clang (in code built with -Werror) Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* Fix format strings mismatching the parameters passed to themBernhard Rosenkränzer2014-11-201-3/+3
| | | | | Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* Frameworks/base: Turn on -Wall -Werror in cmdsAndreas Gampe2014-11-074-19/+23
| | | | | | Fix small warnings, turn on -Wall -Werror. Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
* Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-225-38/+484
|\ | | | | | | Change-Id: I7063b7b52e9c09a57eb6bf3b4ffa3716d58ebf43
| * bootanimation: Tweak parameters for pcm_open for playing boot sounds.Mike Lockwood2014-10-071-0/+3
| | | | | | | | | | | | Set start_threshold and avail_min to 1/4th period size and stop_threshold to INT_MAX Change-Id: I0a3aac18533709daa86a024cdd6a32086410723a
| * Add support for playing audio during bootanimationMike Lockwood2014-10-035-18/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bootanimation daemon will play 16 bit WAV files contained in bootanimation.zip For this to work, the bootanimation.zip must contain an audio_conf.txt file, which contains parameters to be used for the tinyalsa pcm_open call as well as mixer parameters to set before attempting to play the sound. If the bootanimation finds an audio_conf.txt file, then it will look for a file named "audio.wav" in each of the part subdirectories. If audio.wav is found, it will play that WAV file starting at the beginning of that part. The code for this is based on the tinyplay utility in tinyalsa. The audio_conf.txt and must begin with the following header: card=<ALSA card number> device=<ALSA device number> period_size=<period size> period_count=<period count> This header is followed by zero or more mixer settings, each with the format: mixer "<name>" = <value list> Since mixer names can contain spaces, the name must be enclosed in double quotes. The values in the value list can be integers, booleans (represented by 0 or 1) or strings for enum values. Finally I should mention that this change is not the right approach. Instead of going straight to ALSA we should be using the mediaserver instead. But mediaserver isn't ready in time due to interactions with the system server, and there isn't time to fix this for the current release. We need to fix that for the next one. Bug: 17674304 Change-Id: Ic391ade61c941d0a24f4d64fe005ac9375a23fa9
| * bootanimation: allow animation to specify background colorJesse Hall2014-09-252-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | Some OEMs want to have a bootanimation (or parts of it) displayed on a color other than black. They currently just use full-screen frames for that, which wastes lots of memory and bandwidth. This change allows each part of the animation to specify a background color that will be applied outside of the frame images; if unspecified the background will be black as it is now. Bug: 16635599 Change-Id: Ibf008fc75c5aad891c86ba9e4ec0879b7a61b8bd
| * SkBitmap::Config is deprecated, use SkColorTypeMike Reed2014-07-071-10/+10
| | | | | | | | Change-Id: Ida181d2aac760072cf2d01409edac37699dea216
| * am 516130cc: am dbbf431b: am d0f7f418: Merge "Freeing frame map"Narayan Kamath2014-04-302-6/+10
| |\ | | | | | | | | | | | | * commit '516130ccb1841afb6ef154c28269d91594925429': Freeing frame map
| * | Allow custom wallpaper and boot animation.Jeff Sharkey2014-04-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new "ro.config.wallpaper" and "ro.config.wallpaper_component" properties which may be defined outside of the bundled framework resources. Falls back to bundled resources when properties are undefined. Also look for boot animation under OEM partition. Bug: 13340779 Change-Id: Ibdc9935dbdaae3319bf63b40573de0503d82ae67
| * | am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: ↵Colin Cross2014-03-201-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | build 32-bit if 64-bit gl libraries are not available" * commit 'a3633c25033b576ae160ea86194e4f7f20d82fe2': bootanimation: build 32-bit if 64-bit gl libraries are not available
| * | | FramebufferNativeWindow.h is obsoleteAndy McFadden2014-03-051-1/+0
| | | | | | | | | | | | | | | | Change-Id: I3c645af7247a520e28d337e567f326375558519a
| * | | Fix includes so that they no longer rely on the global Skia includes ↵Derek Sollenberger2014-02-272-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directories. bug:13225538 Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
| * | | am fc800d40: am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] ↵Nick Kralevich2013-12-161-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop user loadable bootanimation.zip abiltiy." * commit 'fc800d407d695926ba07299c4e27d1e06284098f': [bootanimation] Drop user loadable bootanimation.zip abiltiy.
| * \ \ \ am 411954ae: am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set ↵Nick Kralevich2013-12-111-3/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service.bootanim.exit" * commit '411954aef072574676462f579847a01af0aed728': Don't try to set service.bootanim.exit
| * | | | | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-112-41/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us share zip archive processing code with both the runtime (Art, dalvik) and critical java code (StrictJarFile). This change also moves several utility methods to ZipUtils and dedups code across several zip inflation methods. One of the side effects of this change is that several processing loops are now O(n) instead of O(n^2). bug: 10193060 (cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df) Change-Id: I86a2c528575d4a3ca86b94be068dcdc3c17c2ed6
| * | | | | Call SkBitmap::config() instead of ::getConfig()Leon Scroggins III2013-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getConfig() has been deprecated. Change-Id: I32066256ab82ac4760c752c80856d1b56d291fae
| * | | | | am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-291-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f592378a1ea7f31d57253dc202f42707ef4da36': Fix a variety of small publicly-reported bugs.
* | | | | | | Include <time.h> for clock_nanosleep.Elliott Hughes2014-10-211-4/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Change-Id: If3098fa03003bce5d06d60e9129c10cce3c850bb
* | | | | | Freeing frame mapMykola Kondratenko2014-04-302-6/+10
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileMap memory is never released until application exit Release it now as the texture is already loaded and the memory used for the packed resource can be released. Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
* | | | | bootanimation: build 32-bit if 64-bit gl libraries are not availableColin Cross2014-03-191-0/+3
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Set LOCAL_32_BIT_ONLY if TARGET_32_BIT_SURFACEFLINGER is set. Change-Id: I76396cc9fe3fe45d1e98a44bf911d6e70922555a
* | | | [bootanimation] Drop user loadable bootanimation.zip abiltiy.Robert Craig2013-12-161-4/+0
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A prior change removed the ability of the shell to push to /data/local. Because of this, the bootanimation code no longer supports users loading custom bootanimation.zip files. This patch drops the access attempt from the code. Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | Don't try to set service.bootanim.exitNick Kralevich2013-12-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init has never allowed the bootanimation code to set service.bootanim.exit, and has always generated the dmesg error message <3>[ 17.644615] init: sys_prop: permission denied uid:1003 name:service.bootanim.exit Since setting this property has no effect and never worked, delete the code which tries to do it. Change-Id: Idacc5467d85479a8cf974702af8895011be585ea
* | | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-092-41/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us share zip archive processing code with both the runtime (Art, dalvik) and critical java code (StrictJarFile). This change also moves several utility methods to ZipUtils and dedups code across several zip inflation methods. One of the side effects of this change is that several processing loops are now O(n) instead of O(n^2). bug: 10193060 Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
* | | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-221-1/+1
|\ \ \ | |/ / | | / | |/ |/| Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
| * Changes needed to support Skia at r10377.Derek Sollenberger2013-08-011-1/+1
| | | | | | | | Change-Id: Id1e1c8c5938ee1a33c6fa3caabd2c28e89243eb4
* | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-291-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp. https://code.google.com/p/android/issues/detail?id=61556 Missing fclose in core/jni/android_os_Debug.cpp. https://code.google.com/p/android/issues/detail?id=61546 Bad loop guards in core/jni/android_util_Process.cpp. https://code.google.com/p/android/issues/detail?id=61557 Assignment to wrong variable in libs/androidfw/AssetManager.cpp. https://code.google.com/p/android/issues/detail?id=61560 Missing delete[]s in libs/androidfw/ObbFile.cpp. https://code.google.com/p/android/issues/detail?id=61549 Leaks on error in tools/aapt/Images.cpp. https://code.google.com/p/android/issues/detail?id=61552 Two missing fclose calls in tools/aapt/Resource.cpp. https://code.google.com/p/android/issues/detail?id=61553 Missing fclose in tools/aidl/aidl.cpp. https://code.google.com/p/android/issues/detail?id=61554 Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
* Add liblogYing Wang2013-04-091-0/+1
| | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* Use new surface flinger API.Jeff Brown2012-08-271-3/+6
| | | | Change-Id: Ic888577408a59a36481a48010e19c5e77c24e211
* update to new getDisplayInfo APIMathias Agopian2012-07-251-1/+1
| | | | Change-Id: I8051b4f9f23d3ef4791176de1bbcfafacae7d579
* Exit boot animation cleanly.Kevin Hester2012-06-192-5/+38
| | | | | | | | | | | | | | | The desc.txt file can now mark parts as 'must finish cleanly' by using 'c' as the part line prefix rather than 'p'. If so indicated, if the bootanimation is asked to quit it will do so only after waiting to finish that part. I considered either making init.c service killing smarter or promoting bootanim to be a bindable service with a requestExit method. However, these changes are probably too big/risky given our ship date. So I used a property as a mailbox between SurfaceFlinger and bootanim. Bug: 6679877 Change-Id: I1f8dd9e7da1ea80a483b31fa14c4a5645922d774
* make the boot animation 32-bits to avoid bandingMathias Agopian2012-06-111-1/+1
| | | | | | Bug: 6611693 Change-Id: Id31b711ea755c89240eaea26f6403a031cd939e4
* fix BootAnimation timingMathias Agopian2012-05-121-3/+16
| | | | | | | | | | We were including the delay of the previous frame when calculating the delay needed between a frame and the next. This caused a bad jitter in the animation timing. We also now use clock_nanosleep(). Change-Id: Iebb8cca4d57fe2f11d83b23a736e03db7a7d2006
* am f4b6628e: BootAnimation: fix bug to delay the appropriate amount of time ↵Travis Geiselbrecht2012-04-241-1/+1
|\ | | | | | | | | | | | | per frame * commit 'f4b6628e5084bf317eab5326c51cbecb8fabdc45': BootAnimation: fix bug to delay the appropriate amount of time per frame
| * BootAnimation: fix bug to delay the appropriate amount of time per frameTravis Geiselbrecht2012-04-241-1/+1
| | | | | | | | Change-Id: I300b67a97a9a685cec59df12d8d605c2b0b49180
* | fix libgui header locationMathias Agopian2012-02-273-8/+5
| | | | | | | | Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
* | frameworks/base refactoringMathias Agopian2012-02-201-0/+1
| | | | | | | | | | | | create the new libandroidfw from parts of libui and libutils Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
* | frameworks/base refactoring.Mathias Agopian2012-02-172-3/+3
| | | | | | | | | | | | step 2: move libutils headers to their new home: androidfw Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-2/+2
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-1/+1
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-3/+3
|/ | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* boot animation is dithered and scaledMathias Agopian2011-11-101-3/+10
| | | | | | | | | disable dithering which shouldn't have been enabled in the first place because the frames are typically scaled. we still use a 16-bits texture format to preserve memory. Bug: 5600948 Change-Id: Ib4d6e133df4375d0d735cd4325b6e589bbc5dafe
* boot animation doesn't use EGLUtils anymoreMathias Agopian2011-08-151-2/+4
| | | | Change-Id: I0767ac2a5ab814382b41c85bd5b0786c7a025255
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-7/+0
| | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* SF transactions are now O(1) wrt IPC instead of O(N).Mathias Agopian2011-06-291-2/+3
| | | | Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
* unify SurfaceTexture and SurfaceMathias Agopian2011-06-131-3/+0
| | | | | | | Add the concept of synchronous dequeueBuffer in SurfaceTexture Implement {Surface|SurfaceTextureClient}::setSwapInterval() Add SurfaceTexture logging fix onFrameAvailable
* clear boot-animation background with black (not transparent) pixelsMathias Agopian2011-05-061-0/+2
| | | | Change-Id: I2fcf9f303e8324cefaa2d96f1c46647f70980bb2
* Get rid of the "pid" parameter from createSurfaceMathias Agopian2011-04-201-1/+1
| | | | Change-Id: I28635e3f803e6abe965d79998e305f54a202465d