28849 Commits

Author SHA1 Message Date
Kenny Root
e2f95e42c2 am a34c9ca3: (-s ours) Add more error checking for ndc
Merge commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25' into gingerbread

* commit 'a34c9ca30ea25d0c4d8ae51da7858c4ea58b7f25':
  Add more error checking for ndc
2010-08-18 08:50:56 -07:00
David 'Digit' Turner
a6b47cd39a am 24a03083: PackageManagerService: always install native binaries from .apk
Merge commit '24a03083ca5cf33342debb9a230a591f098f7fd8' into gingerbread

* commit '24a03083ca5cf33342debb9a230a591f098f7fd8':
  PackageManagerService: always install native binaries from .apk
2010-08-18 08:45:35 -07:00
Patrick Scott
243efd2c57 Merge "Use a static variable and methods for the current WebView." 2010-08-18 08:11:38 -07:00
Patrick Scott
8a5d335a55 Use a static variable and methods for the current WebView.
sJavaBridge may not exist by the time onWindowFocusChanged is called.
To avoid an NPE, just static methods that modify a global field.
JWebCoreJavaBridge is a global object anyway so using a static field
will be fine.  To avoid any garbage collection issues, store the
WebView in a WeakReference.

Bug: 2894682
Change-Id: I73de9237ddbbdc55841a9b2639437e26856439c8
2010-08-18 11:00:42 -04:00
Kenny Root
4690627644 Amend previous ndc commit
Submitted wrong patchset. This includes the delta for the latest
patchset.

Change-Id: I63bb9a37dd9100550ae07a3a1c9fdd9fd71724e1
2010-08-18 07:53:30 -07:00
Steve Block
f0f30c677a Implement logic for new Geolocation delayed permission LayoutTests
Bug: 2914450
Change-Id: Ic0be3120e88efe9199f7719b9ccb1090baaabed6
2010-08-18 15:50:48 +01:00
Steve Block
0e4d86fddf Fix naming and executable bits on DumpRenderTree2 scripts
Change-Id: Id1415e2a166289c8c585e132e842f5ca6ad35426
2010-08-18 15:50:46 +01:00
Bjorn Bringert
a006b47298 New API and implementation of DB and memory-backed FDs
This depends on a kernel patch that implements read(2)
in the ashmem driver.

Bug http://b/issue?id=2595601

Change-Id: Ie3b10aa471aada21812b35e63954c1b2f0a7b042
2010-08-18 15:39:52 +01:00
satok
7eb84256e5 Enhancement of method.xml for Fast IME switching
- (Public API) Add public attrs: imeSubtypeExtraValue, imeSubtypeLanguage, imeSubtypeMode
-- (Public API) Add InputMethodSubtype class
-- (Public API) Add getSubtypes to InputMethodInfo
- Add parser for the enhanced method.xml

Change-Id: Ie7965fd29fd9615ef9c9418075c9f5f1c3365eb6
2010-08-18 19:19:00 +09:00
Brian Carlstrom
232a0331c0 tracking merge of external/apache-http from dalvik-dev
Change-Id: I25d7659b25f86f88cb36b4f80589b8c3e3a8c6b2
2010-08-18 00:47:08 -07:00
Kenny Root
a34c9ca30e Add more error checking for ndc
In NativeDaemonConnector.doCommand() calls, there was inconsistent error
checking. This change adds error checking for every call and makes it so
that any call to .doCommand() that gets an error code won't cause the
code to hang forever.

Change-Id: If714282b6642f278fb8137f652af1a012670253b
2010-08-17 23:29:46 -07:00
David 'Digit' Turner
24a03083ca PackageManagerService: always install native binaries from .apk
The previous implementation fails to work properly when the .apk
and installed versions of the binaries have the same size and date.

Change-Id: I063817a935da9ad459858d7eec8bb3d940607850
2010-08-17 23:21:56 -07:00
Adam Powell
2b6a68580b Merge "Fix bug 2927837 - PopupWindows don't account for xlarge status bar height" 2010-08-17 21:26:32 -07:00
Adam Powell
a7287f4d19 Fix bug 2927837 - PopupWindows don't account for xlarge status bar height
Add framework dimension resource screen_margin_bottom. This describes
the bottom margin formed by permanent screen decorations. In xlarge
configs this is equal to the height of the permanent system bar.

PopupWindows now size and position themselves with respect to
screen_margin_bottom.

Change-Id: I8960059adcf09605abf26c228bf877f5632fd11e
2010-08-17 21:17:04 -07:00
Jean-Baptiste Queru
9f115228c8 am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Merge commit '09f672509b78344258f1b0d9f021d2ec99942515'

* commit '09f672509b78344258f1b0d9f021d2ec99942515':
  Fix compilation errors in libmedia, libstagefright.
2010-08-17 20:10:30 -07:00
Dianne Hackborn
26095af235 Merge "Maybe fix #2925641: calling onCreateOptionsMenu before attached activity" 2010-08-17 19:52:54 -07:00
Hung-ying Tyan
6ab9460875 Merge "CallManager: add setAudioMode()" into gingerbread 2010-08-17 19:52:50 -07:00
Jeff Brown
3922484d74 Merge "Optimize EventHub reads." into gingerbread 2010-08-17 19:41:46 -07:00
Jeff Brown
cc2e717f1d Optimize EventHub reads.
Change-Id: Id7d09c0a6e5c741c1e29becd2b6560772c5ff372
2010-08-17 19:40:26 -07:00
Jason Sams
fb545906ad Merge "Make java entry points for native fifo synchronized." 2010-08-17 19:29:17 -07:00
Jason Sams
d78be37d81 Remove OOB object destruction.
Change-Id: Icaa06aca4a701ec663c124d3141d9dbb633d7dc1
2010-08-17 19:28:29 -07:00
Hung-ying Tyan
a4cb657e3a CallManager: add setAudioMode()
When in a call, different audio modes need to be applied based on phone type.
(For example, SIP call needs to be in MODE_NORMAL while GSM call in MODE_IN_CALL.)
Originally, it's handled in PhoneUtils.setAudioMode(). It makes more sense now
to handle the actual logic in CallManager.

Change-Id: I58d8f31d6b4afe22f88da442daac2010781de801
2010-08-18 10:21:10 +08:00
Hung-ying Tyan
8eac20eacd SIP: implement conference call
Change-Id: Ifd420ed95e77e744c6aff28ac63e7363f97d9dc6
2010-08-18 10:00:36 +08:00
Dianne Hackborn
291905e34a Maybe fix #2925641: calling onCreateOptionsMenu before attached activity
Also add some APIs to PreferenceActivity.

Change-Id: I85894a3eb9cd3e5adb78b82e85454c0d74773178
2010-08-17 18:53:19 -07:00
Romain Guy
4ae784f126 Merge "Fix save()/restore() issues in the OpenGL renderer." 2010-08-17 18:40:50 -07:00
Romain Guy
8fb954263d Fix save()/restore() issues in the OpenGL renderer.
The save stack now behaves exactly like in Skia.

Change-Id: If7e642f41f2c8f693f6e8c26cba81507d466562e
2010-08-17 18:40:21 -07:00
Winson Chung
cdff2f2424 Merge "Fixing link in RemoteViewsFactory comment." 2010-08-17 18:17:47 -07:00
Winson Chung
6eceb00db9 Fixing link in RemoteViewsFactory comment.
Change-Id: Ibfb61eedbceb5721e3894074cc4b5597b12691f7
2010-08-17 18:16:47 -07:00
Adam Powell
e67a9dc83d Clean up some options menu/action bar menu handling for Dialogs.
Add Dialog#invalidateOptionsMenu so that dialogs hosting action bars
have a way to request a refresh of menu content.

Change-Id: I73aa22c2df1c5e60b94035e30af548f87073dbb9
2010-08-17 18:06:15 -07:00
Hung-ying Tyan
f6354aca3a Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread 2010-08-17 17:34:05 -07:00
Adam Cohen
b04f7ad90b -> Added 3D rotation to the StackView transition
-> Fixed a bug with multiple animations occuring at the same time
-> Added looping paramater to AdapterViewAnimator
-> Added restoration of state to AdapterViewAnimator
-> Fixed a flicker in the default AdapterViewAnimator transition
   (could be seen in AdapterViewFlipper)
-> Fixed a bug where touch events of StackView weren't be
   propagated to the proper child

Change-Id: I270280cabc42ad77d28e3e7d7d80aa4c17548cab
2010-08-17 17:29:36 -07:00
Eric Fischer
acf6178265 Merge "Import revised translations." 2010-08-17 17:23:28 -07:00
Eric Fischer
04e5a1cba9 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-17 17:19:21 -07:00
Jeff Brown
72ce42352c Merge "Fix possible race conditions during channel unregistration." into gingerbread 2010-08-17 17:05:38 -07:00
Jeff Brown
2cbecea4c9 Fix possible race conditions during channel unregistration.
Previously, the input dispatcher assumed that the input channel's
receive pipe file descriptor was a sufficiently unique identifier for
looking up input channels in its various tables.  However, it can happen
that an input channel is disposed and then a new input channel is
immediately created that reuses the same file descriptor.  Ordinarily
this is not a problem, however there is a small opportunity for a race
to arise in InputQueue.

When InputQueue receives an input event from the dispatcher, it
generates a finishedToken that encodes the channel's receive pipe fd,
and a sequence number.  The finishedToken is used by the ViewRoot
as a handle for the event so that it can tell the InputQueue when
the event has finished being processed.

Here is the race:

1. InputQueue receives an input event, assigns a new finishedToken.
2. ViewRoot begins processing the input event.
3. During processing, ViewRoot unregisters the InputChannel.
4. A new InputChannel is created and is registered with the Input Queue.
   This InputChannel happens to have the same receive pipe fd as
   the one previously registered.
5. ViewRoot tells the InputQueue that it has finished processing the
   input event, passing along the original finishedToken.
6. InputQueue throws an exception because the finishedToken's receive
   pipe fd is registered but the sequence number is incorrect so it
   assumes that the client has called finish spuriously.

The fix is to include a unique connection id within the finishedToken so
that the InputQueue can accurately confirm that the token belongs to
the currently registered InputChannel rather than to an old one that
happened to have the same receive pipe fd.  When it notices this, it
ignores the spurious finish.

I've also made a couple of other small changes to avoid similar races
elsewhere.

This patch set also includes a fix to synthesize a finished signal
when the input channel is unregistered on the client side to
help keep the server and client in sync.

Bug: 2834068
Change-Id: I1de34a36249ab74c359c2c67a57e333543400f7b
2010-08-17 17:03:42 -07:00
Eric Fischer
ba4048c028 Import revised translations.
Change-Id: I03d83a241843f1fe88471425e4a7f7e6f33fee16
2010-08-17 16:50:06 -07:00
Amith Yamasani
9ae5473eae Make getListView() public and hidden, as it is needed for WifiSettings. 2010-08-17 16:49:58 -07:00
Irfan Sheriff
a1af0d7c80 Merge "Fix SDK build" into gingerbread 2010-08-17 16:48:36 -07:00
Irfan Sheriff
4d32d81bd7 Fix SDK build
Add the tag and documentation when we open up the high perf mode

Change-Id: I921e46a7519561e59fb917d08a36dd1d3d2fc7f3
2010-08-17 16:45:53 -07:00
Eric Fischer
f870000ff0 Import revised translations. DO NOT MERGE
Change-Id: Id47f0897de1361ba755f149b2886d7d1f79ff494
2010-08-17 16:43:35 -07:00
Chet Haase
5c76498572 Implement reversing functionality for Animator
Change-Id: I5cf32363a363c17a1d5c5dd0c602b06dc9ebc785
2010-08-17 16:42:29 -07:00
Daisuke Miyakawa
f996ed9f2e Merge "Make vCard importer/exporter aware of multi-byte parameters." into gingerbread 2010-08-17 16:42:06 -07:00
Daisuke Miyakawa
b7688558cc Make vCard importer/exporter aware of multi-byte parameters.
Bug: 2922186
Change-Id: Ic877940242d87ef918bf8d4dac601d37b296259b
2010-08-17 16:40:47 -07:00
Jason Sams
2e1872fe07 Make java entry points for native fifo synchronized.
Change-Id: I1baf2beb920016f0202042982075cbce1e67df42
2010-08-17 16:25:41 -07:00
Andrew Stadler
468c3230da Fix two bugs in PreferenceActivity headers
* Make Header fields public so activities can write them
* Recycle views properly
* Also made the HeaderAdapter and HeaderViewHolder static inner classes
  for a little extra efficiency.

Change-Id: If0a9276e4609e2e8568c7c5a6963f3ed3e25565f
2010-08-17 16:16:42 -07:00
Irfan Sheriff
8c11e95230 DO NOT MERGE WifiLock extensions for high performance mode
Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: I8b33d307f3d569bc92ba2139b9ed224ffc147547
2010-08-17 15:27:54 -07:00
Jean-Baptiste Queru
09f672509b resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
2010-08-17 15:24:11 -07:00
Rene Bolldorf
0b7bd95d69 Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')

Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
2010-08-17 23:45:14 +02:00
Winson Chung
6394c0e52c Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.
Also removing extra parameter in AppWidgetManager.notifyDataSetChanged.

Change-Id: Ic771fe045ae793a6dacf09f1230e7c1c4b59a13e
2010-08-17 14:25:06 -07:00
Steve Howard
8651bd5d18 Fix up handling of null fields in DownloadManager.
Document fields that can have invalid/unknown values, and fix handling
of null local URI.

Change-Id: I7684c151f0a20c91340655246bec2ce0a60328e4
2010-08-17 14:10:25 -07:00