30770 Commits

Author SHA1 Message Date
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
Mans Rullgard
c290b590db stagefright aacenc/amrwbenc: Convert line breaks to Unix style
Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
2011-04-23 16:11:46 +03: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
Lavettacn Xiao
c84cc4f183 Check if we are in daylight time when calculating timezone
The code that calculates the Kernel TimeZone does not check
if we are actually in daylite time prior updating the kernel
time zone. Use TimeZone.getOffset which checks for daylight
savings. Also updated setTimeZone for consistency.

Change-Id: I44565bc8df48e81370ea3bfbb099a6a5675e343d
2011-04-19 14:47:45 +02:00
Jozef BABJAK
e42143aa57 Eliminating dead logic - bitmap state simply cannot be null here.
Change-Id: I33fdf650b06242efa22ca30b3f7252f6854b42f6
2011-04-19 13:24:37 +02: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
Urs Fleisch
5819051eee support humidity sensor type
Change-Id: I4156842677e91de0f922284d196147ff61e71a70
2011-04-13 12:52:59 -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
Kenny Root
87b3c0dcc4 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
08d9d9a462 Merge "Runtime resource overlay, iteration 1." 2011-04-11 10:07:15 -07:00
Shachar Shemesh
0cd48ae3de Remove errant tag terminator
Element android.widget.QuickContactBadge had two closing markers.

Change-Id: I0ab47e2fc999b4cf09fa10a7f5df58090816e315
2011-04-11 13:48:35 +03:00
Shachar Shemesh
7c94b34b52 Normalize output of XMLtree content
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
2011-04-11 13:32:19 +03:00
Brad Fitzpatrick
4430670f48 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
ca7ad44a8b Merge "audioflinger: Enable ARMv5TE optimized resampler" 2011-04-07 08:57:00 -07:00
Mattias Petersson
5435a06010 Scolling using arrow keys with padding
It was impossible to reach the end of a large test when scrolling down
using the arrowkeys when the ScrollView had padding. A common example
of this would be an AlertDialog with a text that is too long to fit on
the screen.

Change-Id: I55464290a0cdeabde83ccccc76fe8d015ae57a8d
2011-04-07 15:46:56 +02:00
Jim Huang
592a6d9768 audioflinger: Enable ARMv5TE optimized resampler
Previously, the optimized asm option is only enabled when
__ARM_ARCH_5E__ is defined, which is assigned in armv5te.mk
rather than armv7-a series targets.  This patch checks the ARM CPU
feature about half-word multiply instructions to enable ARMv5TE
resampler optimization routines properly.

Change-Id: I4c5a5d8c932416f23bedb0b389db958349f21ea4
2011-04-07 21:08:39 +08:00
Martin Wallgren
cee2051ada CHAR_SEQUENCE_CREATOR cannot handle null string
TextUtils.writeToParcel can handle null as input CharSequence
but createFromParcel will throw NullPointerException. Transforming
to and from parcel should handle null in the same way.

Change-Id: I707ea9be2091d2655c5f63eaa57c5674befa5ad3
2011-04-07 14:45:43 +02:00
Xavier Ducrohet
4754c79a77 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
Xavier Ducrohet
efa98a29e0 am 8a18dba4: Merge c5aeac7f from honeycomb.
* commit '8a18dba48c354fc47056b07ddec8a32fda266b6a':
  Merge c5aeac7f from honeycomb.
2011-04-06 19:08:02 -07:00
Xavier Ducrohet
59aad78eae LayoutLib: don't render when shader's local matrix is set to 0 scale.
Change-Id: I7726d87f3dd0475ac662f535a08c6435b8b9ed1f
2011-04-06 17:03:31 -07:00
Xavier Ducrohet
8a18dba48c Merge c5aeac7f from honeycomb.
LayoutLib: Fix issue with rendering mode.

When the layout content is embedded inside a decor layout
to emulate system bar (top or bottom) and title bar (or action bar)
then the code computing the full required size based on the RenderingMode
would fail because the decor layout would prevents the content layout to
take as much room as possible.
There is also an issue with the way we know render dialogs as the
dialogs usually as a frame with some padding and the previous measurements
would not take into account the dialog padding when increasing the
screen size.

This fix makes the code measure the size of the content layout in the
normal rendering, and then separately from the root layout with the proper
MeasureSpec to let the content grown. The difference in size is then added
to the screen size.

Bug: http://code.google.com/p/android/issues/detail?id=15892

Change-Id: Ie9a6c5e254b16785f817dcb9fae755d4936880aa
2011-04-06 14:24:59 -07:00