Conley Owens
d66a92e687
am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
...
* commit 'da882181245fdf3eca827680d656cd298c9c318f':
Eliminating dead code with no other effect than consuming battery life.
2011-04-28 23:52:21 -07:00
Conley Owens
da88218124
Merge "Eliminating dead code with no other effect than consuming battery life."
2011-04-28 14:56:55 -07:00
Conley Owens
893812b2ee
am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
...
* commit 'e6e3322a3baef4cce7d382a7890718a805c4bd3b':
Remove duplicate '=' in exception message
2011-04-28 12:00:53 -07:00
Conley Owens
e6e3322a3b
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
8fff7805ab
Merge "Remove duplicate '=' in exception message"
2011-04-28 11:46:39 -07:00
Bernhard Reutner-Fischer
c1a9b03a35
Remove duplicate '=' in exception message
...
Remove duplicate '=' in IllegalArgumentException of MyAdapter::getItem()
Change-Id: I151a1432a9f54c8d42bae295f3967b0be2223026
2011-04-28 20:06:44 +02:00
Eric Fischer
1d10447631
am a4e7353d: Import revised translations. DO NOT MERGE
...
* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
Import revised translations. DO NOT MERGE
2011-04-27 15:30:36 -07:00
Conley Owens
264254b273
am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
Auto hide virtual keyboard
2011-04-27 14:53:26 -07:00
Conley Owens
5e3562a5a5
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 14:53:15 -07:00
Conley Owens
8279c193d1
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 14:53:10 -07:00
Conley Owens
a6590e7fee
am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard
2011-04-27 13:53:46 -07:00
Conley Owens
cfe7b9fcfa
am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 13:53:37 -07:00
Eric Fischer
a4e7353d33
Import revised translations. DO NOT MERGE
...
Change-Id: I36de477855f825da9a3626becd1927c31639e23d
2011-04-27 13:50:09 -07:00
Conley Owens
779fa1515d
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
13b21e608e
Merge "Auto hide virtual keyboard"
2011-04-27 13:20:16 -07:00
Conley Owens
a538b4a206
Merge "onDetachedFromWindow is called before onAttachedToWindow"
2011-04-27 13:14:57 -07:00
Conley Owens
4a4d96e7ee
Merge changes I0ab47e2f,Ib8016996
...
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:06:46 -07:00
Conley Owens
ac505b86b4
am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage
2011-04-27 12:46:09 -07:00
Conley Owens
f0556bb90f
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
86d1d74762
Merge "Add lock before calling initEglImage"
2011-04-27 12:28:05 -07:00
Conley Owens
470239a090
am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.
2011-04-27 12:18:03 -07:00
Conley Owens
30d59fa90f
Ignore fix for startup NPE as file is deleted.
...
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
2011-04-27 12:09:35 -07:00
Conley Owens
44935c2908
Merge "Fix for startup NPE."
2011-04-27 11:40:46 -07:00
Nick Pelly
36e6c4c194
am cc9ee72b: Implement dead service recovery in NFC extras library.
...
* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
Implement dead service recovery in NFC extras library.
2011-04-26 18:04:02 -07:00
Nick Pelly
cc9ee72bd4
Implement dead service recovery in NFC extras library.
...
Change-Id: I4f1d714c625470df4cda2c4c9aacb8d27bfabb10
2011-04-26 16:38:00 -07:00
Conley Owens
54a952c843
am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
...
* commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 15:50:33 -07:00
Conley Owens
bf4769c7da
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
17ba30b549
Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
2011-04-26 14:36:48 -07:00
Kenny Root
bb93dad925
am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"
...
* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
libutils: Fix an improper const-cast in RefBase
2011-04-26 11:41:31 -07:00
Kenny Root
bb10986c3d
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
13ce221e43
Merge "libutils: Fix an improper const-cast in RefBase"
2011-04-26 11:26:33 -07:00
Jean-Baptiste Queru
45e13ec1c5
am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
...
* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
2011-04-26 01:20:37 -07:00
Irfan Sheriff
78d4e71dec
am d2127c43: Handle DHCP renewal and wakeup in framework
...
* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
Handle DHCP renewal and wakeup in framework
2011-04-26 01:01:31 -07:00
Jean-Baptiste Queru
5fcfce965f
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
4b72eec34c
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
2011-04-25 13:33:37 -07:00
Irfan Sheriff
d2127c438f
Handle DHCP renewal and wakeup in framework
...
The native DHCP client renews IP address, but can fail to do so when the device
is in suspend. This has lead to issues where device fails to renew in time and
on networks with lots of devices re-using expired DHCP IP addresses, it leads to
severe issues.
Handle DHCP renewal and wakeup in framework
Bug: 3344732
Change-Id: Ie4062e04a477f4a233946155e40a7c999b337c3f
2011-04-22 15:08:02 -07:00
Josh Stone
c4fbbe06a5
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
24a16e6c53
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
c34c88b948
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
ec1a8f7aa7
Merge "Unable to push files to Windows 7"
2011-04-19 14:48:08 -07:00
Jozef BABJAK
41a5ed7cd9
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
...
Change-Id: Ic8648aa5ae6a61348803171243c1c217feb058ec
2011-04-19 12:28:22 +02:00
Jozef BABJAK
5c14d32d56
Fix for startup NPE.
...
Change-Id: I6928939d235faf544a85bb84bba2fa135ddc8e45
2011-04-19 11:27:30 +02:00
Andreas Huber
5ce9eb9a34
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
8ecc90d00d
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
Andreas Huber
f0f1ceeb51
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
...
Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247
related-to-bug: 4286618
2011-04-14 10:10:36 -07:00
Mattias Petersson
44ad61c3a5
Auto hide virtual keyboard
...
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
2011-04-13 15:09:16 +02:00
Martin Wallgren
505bd0d60d
onDetachedFromWindow is called before onAttachedToWindow
...
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
2011-04-13 15:03:35 +02:00
Eric Fischer
68cb0ffad0
am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
2011-04-12 13:02:15 -07:00
Eric Fischer
71a556f24e
Import revised translations. DO NOT MERGE
...
Change-Id: Idd866750d0c53ae0665ef2dd6b64230182d185ae
2011-04-12 12:08:59 -07:00
Masanori Ogino
2037b5a8b2
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
...
Now support to load mnc/mcc value from IMSI on KDDI-CDMA.
Change-Id: I6f1d137ecf2e3130ca8f1a782dccec13b51f9933
2011-04-12 20:42:49 +09:00