summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Fix: Minimal Ring Unlock" into gingerbreadSteve Kondik2011-12-041-2/+4
|\ \ \ \
| * | | | Fix: Minimal Ring UnlockAndrew Sutherland2011-11-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current mimimal style simply hides the 2 outer rings but they are still functional. This patch disables them when the mimimal style is active. Change-Id: I0c8569134cacca8bd2b0b39a5f6a6d2c3443633f
* | | | | Merge "Don't wait indefinitely for camera frames." into gingerbreadSteve Kondik2011-12-041-1/+16
|\ \ \ \ \
| * | | | | Don't wait indefinitely for camera frames.Danny Baumann2011-11-141-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are multiple reasons why camera frame delivery can stop, the most obvious of which is a buggy camera HAL. In order to not block indefinitely in case that happens, use a timeout when waiting for frames and propagate error if timeout occurs. Change-Id: I5e462b88300cce00cecdef0406064aab1b0b8780
* | | | | | Merge "es_ES: Add missing translations" into gingerbreadSteve Kondik2011-12-041-17/+24
|\ \ \ \ \ \
| * | | | | | es_ES: Add missing translationsdjMesias2011-12-021-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, the infamous 'Copy all' has been found to translate to spanish language
* | | | | | | Merge "framework/base: add missing Simplified Chinese translations" into ↵Steve Kondik2011-12-041-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | framework/base: add missing Simplified Chinese translationsJohn Hsing2011-12-021-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * translate a lonely string->copyAll Change-Id: I3e41de301ce0da563ee63b1f5a6f57ec3a62f080
* | | | | | | Merge "Revert "libstagefright: Fix to handle corrupted .m4a clips"" into ↵Steve Kondik2011-12-042-9/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | | Revert "libstagefright: Fix to handle corrupted .m4a clips"nadlabak2011-11-242-9/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4474aafe8fb90484060cdf7065038fc8846c726b. revert reason: breaks some Gameloft games - hang during launch when sound engine is being initialized
* | | | | | | Merge "prevent NPE in getNextCalendarAlarm (again)" into gingerbreadSteve Kondik2011-12-041-10/+11
|\ \ \ \ \ \ \
| * | | | | | | prevent NPE in getNextCalendarAlarm (again)nadlabak2011-11-241-10/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I0182435679e46b85578ec74ca18e229e42c08116
* | | | | | | Merge "Revert "framework/base: Fix for Camera shutter sound heard twice"" ↵Steve Kondik2011-12-041-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| * | | | | | | Revert "framework/base: Fix for Camera shutter sound heard twice"nadlabak2011-11-241-4/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 38ce282c58c7010b8569dab32b2828a5cdef35e3. revert reason: breaks playback position in MortPlayer Audio Book, DogCattcher and other media players
* | | | | | | Merge "Refactor lockscreen status views" into gingerbreadSteve Kondik2011-12-043-102/+152
|\ \ \ \ \ \ \
| * | | | | | | Refactor lockscreen status viewsDavid Morgan2011-11-143-102/+152
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain separate TextViews for the charging, alarm, and calendar status. Instead of using complex logic to set and show/hide statuses, use simple visible/gone logic. This also allows the next alarm and calendar event to be shown at the same time. Change-Id: I3b4c05f80d18c7d012ab73e39857f42ca82a2e88
* | | | | | | Merge "Zygote: remove one of the 2 reuid() errors when uid is already set" ↵Steve Kondik2011-12-041-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| * | | | | | | Zygote: remove one of the 2 reuid() errors when uid is already setTanguy Pruvot2011-11-241-1/+7
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I236c67d25ddb12a1e6097eb6b9dee96bcba4e054
* | | | | | | Merge "Make button brightness override actually work." into gingerbreadSteve Kondik2011-12-041-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Make button brightness override actually work.Danny Baumann2011-11-211-2/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, an application could set a button brightness override, but the value which was set was only ever used for determining whether there is an override and was never set to the light device.
* | | | | | | Merge "Updated Swedish translations" into gingerbreadSteve Kondik2011-12-041-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Updated Swedish translationsPatrik Kullman2011-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bd7213649e951e58a60258ecd367a91d3c5805d
* | | | | | | Revert "frameworks/base: surfaceflinger: Use vertical quads for 90/270 ↵Steve Kondik2011-11-303-338/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation" This reverts commit f7382855f1d3c5d9dbd3e5191f7336e47736ef04.
* | | | | | | Revert "frameworks/base: surfaceflinger: Increase min texture width limit"Steve Kondik2011-11-302-4/+2
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | This reverts commit 8c556d9f4d2e561fb2ab730498dafc94b0e8679c.
* | | | | | Merge "Prevent sleep of death caused by framework NPE" into gingerbreadDiogo Ferreira2011-11-251-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Prevent sleep of death caused by framework NPEEmilio López2011-11-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E/InputManager-JNI( 1591): An exception was thrown by callback 'interceptKeyBeforeQueueing'. E/InputManager-JNI( 1591): java.lang.NullPointerException E/InputManager-JNI( 1591): at com.android.internal.policy.impl.PhoneWindowManager.interceptKeyBeforeQueueing(PhoneWindowManager.java:2225) E/InputManager-JNI( 1591): at com.android.internal.policy.impl.CmPhoneWindowManager.interceptKeyBeforeQueueing(CmPhoneWindowManager.java:188) E/InputManager-JNI( 1591): at com.android.server.WindowManagerService$InputMonitor.interceptKeyBeforeQueueing(WindowManagerService.java:5327) E/InputManager-JNI( 1591): at com.android.server.InputManager$Callbacks.interceptKeyBeforeQueueing(InputManager.java:384) E/InputManager-JNI( 1591): at dalvik.system.NativeStart.run(Native Method) The issue was reportedly seen when running Rockbox and then locking the screen. Change-Id: I8dd60b63605ecaa157378acd0fa3b1c300f0de37
* | | | | | Fix phone signal icon hidingDalingrin2011-11-171-2/+4
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | setVisibility needs to be done after setIcon This fixes an issue in commit: 2ce85e989e66da91dc3c082fbe9bdf030fbd20f5 Change-Id: I2812729c06c6048ee55d472c1fb14ce2d53980a7
* | | | | RingSelector: cosmeticAndrew Sutherland2011-11-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove my name from the source. oops Change-Id: Ibd350a674276a0a65cde04354626036c13fd8231
* | | | | Lockscreen : Middle ring fixDanesh Mondegarian2011-11-141-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Due to simulataneous merges, the new checks were not put in place. Hence unlocking with middle ring caused bootloops due to selectedringid being -1 Change-Id: Id545bd665422eedea1d54f02bed6174b89d5d7cd
* | | | Revert "mediaserver: wait before instantiating services"Steve Kondik2011-11-131-20/+0
| | | | | | | | | | | | | | | | This reverts commit 91101bd5d7b3be0131e5f1a288992fee9fd1db2b.
* | | | platform/frameworks/base: Call stopRecording first then start beepSignalSrinivasan Kannan2011-11-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Prioritize stopRecording call to avoid recording stop beep from being recorded onto file. Change-Id: I8a36c8511b94a8de3d3ce4b67213d07154b9a88c
* | | | Camera: Initialize the camera shutter sounds asynchronously.Kiran Kumar H N2011-11-132-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of the camera initialization, the shutter sounds(for both snapshot and recording) are loaded. This takes around 70ms. Since the launch is not dependent on this, the sounds can be loaded asynchronously. Hence moving them to a seperate thread. Change-Id: Id0309febf0742cadc3bcca71b0f19064547b6bda
* | | | Fix a couple of nasty heap corruption bugs.Danny Baumann2011-11-132-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When replacing the buffer pointer with another one, the allocated length wasn't updated. As the TI encoder relies of those being matched up (it e.g. does a memset(pBuffer, 0, nAllocLen) at certain places), this could lead to random memory being overwritten (or to a segfault when reaching the end of the mapping) - When replacing the buffer, the old buffer wasn't saved and restored before calling freeBuffer. This led to a different address passed to free() than was returned by malloc(), could lead to all kinds of weird, undefined behaviour. Change-Id: I5e37c66d9c9405e209e5d8df3ea52d378cf44490
* | | | libstagefright: OMAP_COMPAT flag to allow use of omap3 codec tableTanguy Pruvot2011-11-136-28/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require TARGET_USE_OMAP_COMPAT:=true or -DOMAP_COMPAT global cflag Note: Defy, Droid 2, Droid X and Cliq 2 use these codecs and are not compatible with OMAP_ENHANCEMENT Change-Id: I13a01acf600caf50d954f8c0f833a220d314bf56
* | | | libstagefright: Remove channel count check during AAC configurationSriranjan Srikantam2011-11-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AAC format configuration in stagefright has CHECK to verify if channel count value is not equal to 1 or 2, in which case it would result in mediaserver crash. - It is observed that on parsing the codec specific information of ESDS atom in few AAC clips, mpeg4 extractor gives channel count value as zero and results in crash because of above check. Though we will be able to detect the correct channel count later from the AAC bitstream. - OMX component will be able to detect the correct channel count value and can reconfigure the port settings if the channel count value is wrongly set and this check is not required in OMX client code of stagefright. Hence removing this check to avoid mediaserver crash and allow playing these clips which generate wrong channel count value. Change-Id: Idb28d3805746191e8556bfba217a87f530327aa8 CRs-Fixed: 271979
* | | | Merge "frameworks/base: Reset views to opaque when possible" into gingerbreadSteve Kondik2011-11-145-3/+100
|\ \ \ \
| * | | | frameworks/base: Reset views to opaque when possibleLucas Crowthers2011-11-125-3/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the last transparent requesting child leaves a parent reset the parent view's transparent region to empty in order to avoid extra uncessary blanking and composition steps. This version works without API or requiring CTS changes. Change-Id: Ia349f6d857ab197ececd4f1c3816fbc4c0301fde
* | | | | Merge "Remove redundant compositionComplete for every threadLoop iteration" ↵Steve Kondik2011-11-141-2/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into gingerbread
| * | | | | Remove redundant compositionComplete for every threadLoop iterationKobi Cohen Arazi2011-11-121-2/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hw.compositionComplete is invoking glFinish which in turn might need to unnecessary talk with GPU and hurt power perfs. Change-Id: If232a1d8ee5d00dc3a019501e78cd5034a04c3c6 Conflicts: services/surfaceflinger/SurfaceFlinger.cpp
* | | | | gsm: Show localized SPN only when it matches system locale (1/2)Ladios Jonquil2011-11-133-12/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds child tag <spn locale="LOCALE">SPN</spn> to <spnOverride/> of SPN overrides list (/system/etc/spn-conf.xml). LOCALE takes the format of java.util.Locale (e.g.: en en_US). For example of the xml file, see the new revision in part 2 - http://review.cyanogenmod.com/10038 SPN override used to be assigned only on SIM ready. Now it is updated on every system locale change. It's applied when: * There is a <spn> entry of the carrier whose locale= attribute matches the current system locale. * No <spn> entry of the carrier that matches, but <spnOverride>'s spn= attribute (as the default SPN) is provided. Otherwise, meaning no locale= matches and spn= is also omitted, the SPN that read from SIM card would be applied. Change-Id: Ib488219f8e8d8cd0962136d0a581c88ecb8458c4
* | | | | Merge "Monitor device storage directly in /data/data" into gingerbreadSteve Kondik2011-11-141-3/+3
|\ \ \ \ \
| * | | | | Monitor device storage directly in /data/dataJosh Stone2011-10-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DeviceStorageMonitorService watches over /data, and when things get full, starts deleting app cached files. The app caches are actually under /data/data, which on DINC is its own mount. This means the monitor did not notice when app cache grew too big, as it only saw the size of /data proper. This patch makes the monitor look at /data/data instead. For DINC, this means it can properly manage app cache, but it won't notice if the upper /data partition is getting full. That's not as common as /data/data filling up though. For the Samsung devices that mount a /datadata and then symlink to /data/data, it should also work, as statfs dereferences links first. For all other devices with only /data, reading statfs on /data/data still yields the total/free sizes of the /data partition. Change-Id: I8bf2c173ac27240dd28e2e3f46eac9f197042380
* | | | | | Merge "gsm/statusbar: Correct CarrierLabel display logic" into gingerbreadSteve Kondik2011-11-143-25/+24
|\ \ \ \ \ \
| * | | | | | gsm/statusbar: Correct CarrierLabel display logicLadios Jonquil2011-11-143-25/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What's wrong: * "(No service)|SPN" is shown on lockscreen/statusbar. * The "(No service)" string won't update on locale change. What's changed: statusbar: * As per lockscreen, the "(No service)" string should be shown only when showPlmn is true, and plmn is null. gsm: * Run updateSpnDisplay() when ServiceState has not changed (equals() is true), but has deregistered (getState() values are different). * When plmn is null (no service): - Set the display rule to show plmn only. - Allow updateSpnDisplay() to send the intent on locale change. Change-Id: Ieab5c93a560c7fbe6a69e2db151d840a30fdbeb4
* | | | | | | Merge "TextView: remove an invalid class from preloaded table" into gingerbreadSteve Kondik2011-11-141-1/+0
|\ \ \ \ \ \ \
| * | | | | | | TextView: remove an invalid class from preloaded tableTanguy Pruvot2011-11-121-1/+0
| | | | | | | |
* | | | | | | | Merge "Add missing Simplified Chinese translations." into gingerbreadSteve Kondik2011-11-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing Simplified Chinese translations.John Hsing2011-11-121-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0466b07e7ae880551e54143dfc6f486ffb54f19a
* | | | | | | | Merge "res: Add string reboot_download for SGS2" into gingerbreadSteve Kondik2011-11-142-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | res: Add string reboot_download for SGS2Ladios Jonquil2011-11-112-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I633c2e4d23aaee9cf0921e7e6c8a0e29838e9d1e