Conley Owens
95c58935ca
Merge "Scolling using arrow keys with padding"
2011-04-29 10:00:26 -07:00
Conley Owens
83aef76602
Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"
2011-04-29 10:00:20 -07:00
Conley Owens
e85e4d4ed2
Merge "Fixed to draw texture when loadTexture() is called at first time"
2011-04-29 10:00:12 -07:00
Conley Owens
f157b20d1f
Merge "Fixing wrong Japanese phone formatter."
2011-04-29 10:00:06 -07:00
Conley Owens
1d78460d93
Merge "Fix memory leak of SkMovie class"
2011-04-29 10:00:00 -07:00
Conley Owens
ae9331ec90
Merge "Implement support for ALT and SHIFT modifiers"
2011-04-29 09:59:55 -07:00
Conley Owens
3f9f649a96
Merge "Fix startSearch condition on Dialog, because pressing search key 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"
2011-04-29 09:59:48 -07:00
Conley Owens
5324becece
Merge "modify the device to enable to get the state as slide-open/slide-close."
2011-04-29 09:59:42 -07:00
Conley Owens
615537fc62
Merge "Adding missing breaks in BnSurfaceComposer::onTransact"
2011-04-29 09:59:36 -07:00
Conley Owens
56b79aa816
Merge "Fixed to call computeVisibleRegions() when transparent value changed"
2011-04-29 09:59:30 -07:00
Conley Owens
1f824b15fe
Merge "frameworks/base: acquire lock on am only when needed"
2011-04-29 09:59:22 -07:00
Conley Owens
239c5e0e99
Merge "Adding a sanity test in the while loop in readHistory()"
2011-04-29 09:56:58 -07:00
Conley Owens
816fdf4bb3
Merge "Improved conversion accuracy of exif geotag data"
2011-04-29 09:48:10 -07:00
Conley Owens
c41ff27578
Merge "Fixes broken image link in "Tools -> Traceview" documentation page."
2011-04-29 09:48:04 -07:00
Conley Owens
ea98367cd4
Merge "Added null check on return value for getKeyDispatcherState()"
2011-04-28 15:07:00 -07:00
Conley Owens
05945dfc30
Merge "Eliminating dead logic - bitmap state simply cannot be null here."
2011-04-28 14:57:14 -07:00
Conley Owens
a0d4f794fd
Merge "Removing unnecessary computation."
2011-04-28 14:57:11 -07:00
Conley Owens
92add643a1
Merge "Using robust equality check."
2011-04-28 14:57:08 -07:00
Conley Owens
9b6bfdf632
Merge "We don't need these local references."
2011-04-28 14:56:59 -07:00
Conley Owens
a19466e5d0
Merge "Eliminating dead code with no other effect than consuming battery life."
2011-04-28 14:56:55 -07:00
Conley Owens
65c7f2b723
am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit '8fff7805ab1ccde8321697116ed3dd2fae5340ed':
Remove duplicate '=' in exception message
2011-04-28 11:57:48 -07:00
Conley Owens
ae45dfa68a
Merge "Remove duplicate '=' in exception message"
2011-04-28 11:46:39 -07:00
Conley Owens
537ce60c3c
am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard
2011-04-27 13:53:46 -07:00
Conley Owens
0581488aa6
am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 13:53:37 -07:00
Conley Owens
697922855c
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:48:45 -07:00
Conley Owens
aff77c78f7
Merge "Auto hide virtual keyboard"
2011-04-27 13:20:16 -07:00
Conley Owens
1a43e04fd7
Merge "onDetachedFromWindow is called before onAttachedToWindow"
2011-04-27 13:14:57 -07:00
Conley Owens
61b1dd24a9
Merge changes I0ab47e2f,Ib8016996
...
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:06:46 -07:00
Conley Owens
a97b487178
am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage
2011-04-27 12:43:19 -07:00
Conley Owens
4dc780e366
Merge "Add lock before calling initEglImage"
2011-04-27 12:28:05 -07:00
Conley Owens
ff13c6559c
Ignore fix for startup NPE as file is deleted.
...
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
2011-04-27 12:09:35 -07:00
Conley Owens
9deec6fe2a
Merge "Fix for startup NPE."
2011-04-27 11:40:46 -07:00
Conley Owens
7f4b15761b
am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
...
* commit '17ba30b549a847f3aab854173a9484851f694453':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 15:46:32 -07:00
Conley Owens
2d904f106b
Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
2011-04-26 14:36:48 -07:00
Kenny Root
b5e7f05190
am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
...
* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
libutils: Fix an improper const-cast in RefBase
2011-04-26 11:32:22 -07:00
Kenny Root
c364113a1b
Merge "libutils: Fix an improper const-cast in RefBase"
2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
a89e25181f
am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 00:39:44 -07:00
Jean-Baptiste Queru
26603203b6
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
2011-04-25 13:33:37 -07:00
Josh Stone
e6b21626a5
libutils: Fix an improper const-cast in RefBase
...
Under Fedora 15 Beta, gcc 4.6.0 warns:
frameworks/base/libs/utils/RefBase.cpp: In member function
‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]
trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.
Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
2011-04-22 11:13:35 -07:00
Jaikumar Ganesh
1aaeddba56
am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"
...
* commit 'c34c88b948cb60c057bd2145df9f1b2091f3c894':
Unable to push files to Windows 7
2011-04-19 15:57:24 -07:00
Jaikumar Ganesh
d13def39d3
am ec1a8f7a: Merge "Unable to push files to Windows 7"
...
* commit 'ec1a8f7aa7e71e292ef813b1e886a9e26e3635af':
Unable to push files to Windows 7
2011-04-19 15:28:26 -07:00
Jaikumar Ganesh
7b55adc715
Merge "Unable to push files to Windows 7"
2011-04-19 14:48:08 -07:00
Andreas Huber
e0f13c86b1
am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
...
* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
2011-04-18 15:39:09 -07:00
Kobi Cohen Arazi
0d11baf889
Add lock before calling initEglImage
...
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)
2011-04-15 10:38:33 -07:00
Eric Fischer
b7b75cbe6d
am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
2011-04-12 13:02:15 -07:00
Kenny Root
8a1a615176
am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."
...
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
Runtime resource overlay, iteration 1.
2011-04-11 15:33:19 -07:00
Kenny Root
d59b5d0087
Merge "Runtime resource overlay, iteration 1."
2011-04-11 10:07:15 -07:00
Brad Fitzpatrick
99887e9630
am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
...
* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
audioflinger: Enable ARMv5TE optimized resampler
2011-04-07 09:08:58 -07:00
Brad Fitzpatrick
fb3f51702d
Merge "audioflinger: Enable ARMv5TE optimized resampler"
2011-04-07 08:57:00 -07:00
Xavier Ducrohet
44ce4d4454
am 59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to 0 scale.
...
* commit '59aad78eae14939c169876b2f632d005f382cf7d':
LayoutLib: don't render when shader's local matrix is set to 0 scale.
2011-04-06 19:08:11 -07:00