summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
|\
| * Fixing wrong Japanese phone formatter.Keiji Ariyama2011-03-111-3/+5
| | | | | | | | | | | | | | | | http://code.google.com/p/android/issues/detail?id=15383 Adding rules that Japanese number start with 050 and 060. Change-Id: Id324d7ecfb18b348230a3903b356647045700d80
* | Merge "Fix memory leak of SkMovie class"Conley Owens2011-04-292-0/+16
|\ \
| * | Fix memory leak of SkMovie classKimiyoshi Kusaka2011-03-282-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Movie class doesn't have finalize method. So memory leak of SkMovie class of native Skia occurs when Movie class is released. I add finalize method to Movie class (Movie.java) and jni destructor method to SkMovie class (Movie.cpp). Change-Id: I4dae9dd95f128cbfade50bef978b219ba99321dd
* | | Merge "Implement support for ALT and SHIFT modifiers"Conley Owens2011-04-291-0/+22
|\ \ \
| * | | Implement support for ALT and SHIFT modifiersJohan Redestig2011-03-081-0/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec for keymaps and keboard input at http://source.android.com/porting/keymaps_keyboard_input.html mentions the stand alone ALT and SHIFT modifiers: SHIFT: While pressed, the shift key modifier is set ALT: While pressed, the alt key modifier is set This commit implements support for these. Change-Id: I5854ef3df541740cc3443b474a9c41183eb7561c Ex: key 305 BACK ALT
* | | Merge "Fix startSearch condition on Dialog, because pressing search key ↵Conley Owens2011-04-291-1/+1
|\ \ \ | | | | | | | | | | | | causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown"
| * | | Fix startSearch condition on Dialog, because pressing search key causes ANR ↵lge-aosp2011-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown Change-Id: I9c24d83ca3b7c20976bb7daebeff7fd694ce3a2f
* | | | Merge "modify the device to enable to get the state as slide-open/slide-close."Conley Owens2011-04-291-6/+6
|\ \ \ \
| * | | | modify the device to enable to get the state as slide-open/slide-close.nao2011-03-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modify is for the devices which have a slidable H/W keyboard with backlight. For example of current issues: - Backlight of H/W keyboard doesn't turn on when the device starts up with slide-open. - Home screen doesn't display with proper orientation when the device starts up with slide-open. Change-Id: I6a6a18d0b09d0ba484ca992c9fb34f24de9bf21b
* | | | | Merge "Adding missing breaks in BnSurfaceComposer::onTransact"Conley Owens2011-04-290-0/+0
|\ \ \ \ \
| * | | | | Adding missing breaks in BnSurfaceComposer::onTransactFredrik Lanker2011-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie369e10f96059f940e73a3d9e7c4756465b4260c
* | | | | | Merge "Fixed to call computeVisibleRegions() when transparent value changed"Conley Owens2011-04-291-0/+3
|\ \ \ \ \ \
| * | | | | | Fixed to call computeVisibleRegions() when transparent value changedIchitaro Kohara2011-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When some Surfaces are overlapping and one of them changed to transparent or opaque, the back Surfaces should appear or disappear. This patch calls SurfaceFlinger::computeVisibleRegions() to re-calculate region of each Surface to implement the behavior. Change-Id: Iffb1caf1b4ce28dff252e114fe5b9b07d9c84a6f
* | | | | | | Merge "frameworks/base: acquire lock on am only when needed"Conley Owens2011-04-291-4/+11
|\ \ \ \ \ \ \
| * | | | | | | frameworks/base: acquire lock on am only when neededVairavan Srinivasan2011-02-151-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appendDropBoxProcessHeaders acquires a lock on am while accessing ProcessRecord (even if it is null). Watchdog thread ends up invoking this function (with a null ProcessRecord) to add the stack file to dropbox. This function would block if and when the watchdog thread is invoked due to unavailability of lock on am resulting in a deadlock. This would prevent watchdog from killing system_server. Change-Id: Ieb34b767779cb587e0c5f536b9b7ba44fb9a28d9
* | | | | | | | Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Adding a sanity test in the while loop in readHistory()Per Andersson2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a sanity test in the while loop in readHistory() which is useful in case the file read (batterystats.bin), is corrupt. The file can get corrupt (missing end of file marker -1) if writeHistory fails for some reason. Without this change readHistory will continue looping untill an OutOfMemory is thrown. Change-Id: I3418d258e7cb99aa2f9d934c9449a19806499ce4
* | | | | | | | | Merge "Improved conversion accuracy of exif geotag data"Conley Owens2011-04-291-13/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improved conversion accuracy of exif geotag dataOscar Rydhe2011-01-171-13/+19
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed degrees and minutes of geotag data into double to avoid data loss during cast. Also improved error handling if geotag data can't be parsed. Change-Id: I864843c7fc699fe81e6acba801fe46d10a01925b
* | | | | | | | | Merge "Fixes broken image link in "Tools -> Traceview" documentation page."Conley Owens2011-04-291-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes broken image link in "Tools -> Traceview" documentation page.Keiji Ariyama2011-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0728fdbd91f166d5dd30c23430edc532dc937541
* | | | | | | | | | Merge "Added null check on return value for getKeyDispatcherState()"Conley Owens2011-04-281-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added null check on return value for getKeyDispatcherState()Per Andersson2011-04-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result from getKeyDispatcherState() was used without checking if it returned null, which resulted in a NullPointerException. Change-Id: I4b55ad44d5c08b7f729dbbdbcaed0e978a430258
* | | | | | | | | | | Merge "Eliminating dead logic - bitmap state simply cannot be null here."Conley Owens2011-04-281-3/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Eliminating dead logic - bitmap state simply cannot be null here.Jozef BABJAK2011-04-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33fdf650b06242efa22ca30b3f7252f6854b42f6
* | | | | | | | | | | | Merge "Removing unnecessary computation."Conley Owens2011-04-281-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removing unnecessary computation.Jozef BABJAK2011-03-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id201e56fa60baa64204cd204169d119f7b4db3d7
* | | | | | | | | | | | | Merge "Using robust equality check."Conley Owens2011-04-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Using robust equality check.Jozef BABJAK2011-03-171-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie30684c472bfa38d0432f855f7075c34709958d5
* | | | | | | | | | | | | Merge "We don't need these local references."Conley Owens2011-04-281-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | We don't need these local references.Jozef BABJAK2011-03-171-4/+4
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I227c88eb4eb5d2842124e1c944cc18d5b28cccc1
* | | | | | | | | | | | | Merge "Eliminating dead code with no other effect than consuming battery life."Conley Owens2011-04-281-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Eliminating dead code with no other effect than consuming battery life.Jozef BABJAK2011-03-171-3/+0
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4376902a4e9c301ff16f74137d86eeaff901bbb7
* | | | | | | | | | | | | am 8fff7805: Merge "Remove duplicate \'=\' in exception message"Conley Owens2011-04-281-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8fff7805ab1ccde8321697116ed3dd2fae5340ed': Remove duplicate '=' in exception message
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove duplicate '=' in exception message"Conley Owens2011-04-281-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Remove duplicate '=' in exception messageBernhard Reutner-Fischer2011-04-281-3/+4
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate '=' in IllegalArgumentException of MyAdapter::getItem() Change-Id: I151a1432a9f54c8d42bae295f3967b0be2223026
* | | | | | | | | | | | | am 13b21e60: Merge "Auto hide virtual keyboard"Conley Owens2011-04-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13b21e608e47382cb94a0aeac13b24ac97f355d2': Auto hide virtual keyboard
| * | | | | | | | | | | | Merge "Auto hide virtual keyboard"Conley Owens2011-04-271-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Auto hide virtual keyboardMattias Petersson2011-04-131-0/+4
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the virtual keyboard was not hidden when switching between applications. An example of this was when launching the browser from the Google Search widget: 1) Tap the Google Search widget and enter some text, e.g. "google" 2) Select one search items, e.g. "google maps" 3) Browser opens. Press back button. 4) Select an item again, e.g. "google maps" - Keyboard does not close. When switching application, the virtual keyboard needs to find a new Z position (window index) among the other windows. Normally it is placed on top of the first window that is visible and can get focus (canBeImeTarget()). With a new application being launched, there is an exception: a special "starting window" is placed on top of the Activity window while the application is starting up. Since this window should not get input, we need to look below that window. When doing this, the previous implementation assumed that the first window below always was focusable. If it wasn't, the input method was placed above the "starting window", which caused confusion that led to the keyboard not being closed automatically. In the case of the Browser, it sometimes has a "fake TitleBar" window that can not get focus and that is placed above the Activity window. With this fix, we now keep looking through the windows below the "starting window" until we find a window that can receive input. Change-Id: I1117846eb0f57603e64329bd955e28182f98f226
* | | | | | | | | | | | | am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-276-2/+190
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a538b4a206c54ef763dab4da00990a8991425e77': onDetachedFromWindow is called before onAttachedToWindow
| * | | | | | | | | | | | Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-276-2/+190
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | onDetachedFromWindow is called before onAttachedToWindowMartin Wallgren2011-04-136-2/+190
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple threads are adding messages about the current state of the views to the main looper. This can cause onDetachedFromWindow to be posted on the looper before onAttachedToWindow. This change will make sure to only dispatch onDetachedFromWindow if we have previously dispatched onAttachToWindow. Change-Id: Ibc7cbcafb098bc000d2ef5480d2110d3fff4d55a
* | | | | | | | | | | | | am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a4d96e7ee682167861434cba05531f04642bf97': Remove errant tag terminator Normalize output of XMLtree content
| * | | | | | | | | | | | Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-272-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove errant tag terminator Normalize output of XMLtree content
| | * | | | | | | | | | | | Remove errant tag terminatorShachar Shemesh2011-04-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Element android.widget.QuickContactBadge had two closing markers. Change-Id: I0ab47e2fc999b4cf09fa10a7f5df58090816e315
| | * | | | | | | | | | | | Normalize output of XMLtree contentShachar Shemesh2011-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the output from aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Previous patch left out handling of XML element content. Change-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a
* | | | | | | | | | | | | | am 86d1d747: Merge "Add lock before calling initEglImage"Conley Owens2011-04-271-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696': Add lock before calling initEglImage
| * | | | | | | | | | | | | Merge "Add lock before calling initEglImage"Conley Owens2011-04-271-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add lock before calling initEglImageKobi Cohen Arazi2011-04-151-2/+10
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without that lock, there is a chance of race condition where while composing a specific index, requestBuf with the same index can be executed and touch the same data that is being used in initEglImage. (e.g. dirty flag in texture)