Commit Graph

38903 Commits

Author SHA1 Message Date
Cary Clark
674a844f6d synchronize access to pictureReady, copyContentPicture
Two methods in WebViewCore are called from WebView. The C
underpinnings were synchronized with a mutex, but the Java
shell was not, so under rare cirumstances, the Java side might
delete the native class. Add Java synchronization to
protect against this.

Fixes http://b/issue?id=2121684
2009-09-15 16:29:50 -04:00
Mathias Agopian
5d888b3db6 am 80c96c29: am d2cc4273: Merge change 24825 into eclair
Merge commit '80c96c29ff4f681be5a199936dfff5aa2eabee8b'

* commit '80c96c29ff4f681be5a199936dfff5aa2eabee8b':
  fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer
2009-09-15 13:21:26 -07:00
Robert Greenwalt
3da2e85305 am 905d7f57: am f376c837: Merge change 24805 into eclair
Merge commit '905d7f57d44b8598994f3d24ca27db6f9748f05a'

* commit '905d7f57d44b8598994f3d24ca27db6f9748f05a':
  Don't init wifiChannels until after supplicant up
2009-09-15 13:21:09 -07:00
Jack Wang
a28ed57090 am 65e301c0: am e441dcbb: Merge change 22561 into eclair
Merge commit '65e301c09bf88a0a390b0a5924b2844804b9ce5b'

* commit '65e301c09bf88a0a390b0a5924b2844804b9ce5b':
  Performance measurement framework:
2009-09-15 13:21:03 -07:00
Yu Shan Emily Lau
095af68d3e am f23eb283: am 9a7efa45: Merge change 24789 into eclair
Merge commit 'f23eb2839a0e10b71f38f003e97d568dea476dbc'

* commit 'f23eb2839a0e10b71f38f003e97d568dea476dbc':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-15 13:20:56 -07:00
Robert Greenwalt
15f42b8cd1 am f35e4f2a: am a28948d7: Merge change 24754 into eclair
Merge commit 'f35e4f2a444fc4337fd12e3e0544c89f366bb8cd'

* commit 'f35e4f2a444fc4337fd12e3e0544c89f366bb8cd':
  Handle secondary APN connect failures.
2009-09-15 13:20:45 -07:00
Christopher Tate
553ebbf53f am 3c731875: am 38eeac30: Merge change 24797 into eclair
Merge commit '3c7318756617c346162e511aff71b889879495d8'

* commit '3c7318756617c346162e511aff71b889879495d8':
  Don't backup/restore telephony material from secure settings
2009-09-15 13:20:14 -07:00
Costin Manolache
c126c4b49c am d42da368: am d3e061fc: Merge change 24609 into eclair
Merge commit 'd42da36810b392867341b07d5bf1f2c47fa71c86'

* commit 'd42da36810b392867341b07d5bf1f2c47fa71c86':
  If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the  event again.
2009-09-15 13:19:02 -07:00
Jean-Michel Trivi
91a5d831d6 am b5308a70: Merge change 24816 into donut
Merge commit 'b5308a7051fedacf289470c8a7e21b63af9d4db8' into eclair

* commit 'b5308a7051fedacf289470c8a7e21b63af9d4db8':
  TextToSpeech javadoc update.
2009-09-15 13:18:46 -07:00
Scott Main
bc663a6531 am 528954c4: docs only. fix sample code errors per bug 2115299
Merge commit '528954c4d63980c0515528624130477f921cbc60' into eclair

* commit '528954c4d63980c0515528624130477f921cbc60':
  docs only.
2009-09-15 13:18:34 -07:00
johnwang
d3d3beb680 am e8855b4a: am b942db35: Merge change 24773 into eclair
Merge commit 'e8855b4a92625c051304df33ae851555d89e579e'

* commit 'e8855b4a92625c051304df33ae851555d89e579e':
  Fix NPE in TelephonyManager.
2009-09-15 13:18:28 -07:00
Mike Lockwood
4069b0766c am 16eae482: am 66c2a976: Merge change 24762 into eclair
Merge commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6'

* commit '16eae482cec71f0ca1a2f5e90c85c482577b2cd6':
  dumpstate: Switch back to running as non-root
2009-09-15 13:18:16 -07:00
Romain Guy
68bd8cf7fe am b04c6689: am 02ee5387: Merge change 24764 into eclair
Merge commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad'

* commit 'b04c6689d0369209dbf0485a2e0af7f02b521fad':
  Add @Widget annotation to GestureOverlayView to make it usable in ADT.
2009-09-15 13:17:55 -07:00
Jaikumar Ganesh
01c0a12985 am e08e60a7: am 32d8571f: Changes for BT 2.1
Merge commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0'

* commit 'e08e60a7cbb07b84d18b3b6cb35b64b33bdc3cb0':
  Changes for BT 2.1
2009-09-15 13:17:45 -07:00
Dianne Hackborn
7f07b9067b am f6626fec: am 162ec999: Merge change 24635 into eclair
Merge commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643'

* commit 'f6626fecdf3764bff9d40d3eac5c98f3fb9af643':
  Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
2009-09-15 13:17:26 -07:00
Dianne Hackborn
295c900011 am b7860bea: am 8cae124a: Various cleanup around resources and nine-patches.
Merge commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517'

* commit 'b7860bea3bcbd5217f42f2fa5ead4c498600d517':
  Various cleanup around resources and nine-patches.
2009-09-15 13:17:17 -07:00
Jaikumar Ganesh
1006988baf am e291ee80: am 7ff269f3: Merge change 24735 into eclair
Merge commit 'e291ee80006e2c91480d1d856a3771ec6b7c2cc8'

* commit 'e291ee80006e2c91480d1d856a3771ec6b7c2cc8':
  Handle DisconnectRequested message sent by Bluez.
2009-09-15 13:16:23 -07:00
Mike Reed
df4cf29715 redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
update dox on BlurMaskFilter
2009-09-15 16:16:05 -04:00
Mike Reed
c1523fdf31 am e450e55d: am d68781ac: Merge change 24675 into eclair
Merge commit 'e450e55d6395a3052f93946da42757a7f6df2ad1'

* commit 'e450e55d6395a3052f93946da42757a7f6df2ad1':
  change default for dither to true
2009-09-15 13:15:52 -07:00
Amith Yamasani
9fad216095 am e055d583: am b14a1419: Merge change 24475 into eclair
Merge commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f'

* commit 'e055d5833afc4124f0686b8d98f0b1adb3dd006f':
  Save and restore partial supplicant data, not the whole file.
2009-09-15 13:15:16 -07:00
Android Code Review
2419fa842b Merge change 10326
* changes:
  Javadoc used startApplication() which doesnt exists, changed to createApplication()
2009-09-15 13:14:58 -07:00
Scott Main
42f82a672f am 63c4244a: am aab72e7c: am 4d484a82: Merge change 24700 into donut
Merge commit '63c4244a1280cc93c9ac442df5100f2dfea2d80f'

* commit '63c4244a1280cc93c9ac442df5100f2dfea2d80f':
  docs only.
2009-09-15 13:13:57 -07:00
Andreas Huber
bbe5d773a0 am 2d1c327e: am e1a9de7a: Merge change 24702 into eclair
Merge commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f'

* commit '2d1c327eb91073881cd6b902d7209d4938e2bd5f':
  Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
2009-09-15 13:13:26 -07:00
Scott Main
662d3425b9 am b85c8ea6: am 764b0c6c: am 79253f8b: Merge change 24690 into donut
Merge commit 'b85c8ea67505afad2124bad28de4f5d4cbe2885c'

* commit 'b85c8ea67505afad2124bad28de4f5d4cbe2885c':
  docs only.
2009-09-15 13:13:05 -07:00
Scott Main
61e9cee40e am 7937966f: am a1103f33: am 890175db: Merge change 24574 into donut
Merge commit '7937966f4bd28cf88bf24c5ac7debdc18de567db'

* commit '7937966f4bd28cf88bf24c5ac7debdc18de567db':
  docs only.
2009-09-15 13:12:58 -07:00
Dirk Dougherty
b3e1b3fe74 am 37f62206: am 40351ece: am 7350ff3d: Merge change 24631 into donut
Merge commit '37f62206236dbfe89c15990cd506e5e40dc256b2'

* commit '37f62206236dbfe89c15990cd506e5e40dc256b2':
  Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
2009-09-15 13:12:51 -07:00
Dirk Dougherty
d5ff0bc9b6 am 8797066a: am 8a948de5: am 18dd1eeb: Merge change 24419 into donut
Merge commit '8797066aa8443df38118f24ed46fd052b2f4a37b'

* commit '8797066aa8443df38118f24ed46fd052b2f4a37b':
  Move API change details from highlights doc to version notes doc.
2009-09-15 13:12:45 -07:00
Andreas Huber
036272ed1c am 34881610: am 6026a514: Move JPEGSource.{cpp,h} into libstagefright.
Merge commit '348816109a33e082bf8a95af5cb46496f3a394b6'

* commit '348816109a33e082bf8a95af5cb46496f3a394b6':
  Move JPEGSource.{cpp,h} into libstagefright.
2009-09-15 13:12:34 -07:00
jsh
50f7ea53c3 Some SMS logging improvements.
Use Log.isLoggable() to enable logs at runtime.  Implement SmsResponse.toString()
so we can see what's returned.

Hopefully helps with debugging b/2086832.
2009-09-15 13:11:25 -07:00
Dirk Dougherty
4be629f254 Update sizes/checksums for SDK packages.
Change-Id: Icf375128ce0b4727648561e46d13cba6ec05832d
2009-09-15 13:06:47 -07:00
Evan Millar
e727f18cf2 Add the FasttrackBadgeWidget.
This widget is an extension of ImageView that takes care of the standard
fasttrack badging and on-click behavior. It should be used in any
applications that display contact photos.

This view's name will have to be changed before release, and will be
kept private until the name change is made. At that point the view will
be made public api.

Change-Id: I4704e0e979466929ad7b2ef11911681a5028b4a7
2009-09-15 13:00:49 -07:00
Android (Google) Code Review
6d9eebe732 Merge change 25090 into eclair
* changes:
  Move backlight brightness from HardwareService to PowerManager
2009-09-15 15:50:51 -04:00
Andreas Huber
9f9afef3d5 Added an API IOMX::createRendererFromJavaSurface.
This api allows to instantiate a renderer by specifying the hosting java Surface object. This hides the implementation details of (java-)Surface, (native-)Surface and friends.
2009-09-15 12:49:11 -07:00
Mike Lockwood
237a29923a Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming

Change-Id: Ice757f7ae87902bdfb3634471cf44f020ebfaae4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-15 15:47:09 -04:00
Android (Google) Code Review
ffa18dfac0 Merge change 25100 into eclair
* changes:
  Implement Object readback.
2009-09-15 15:40:09 -04:00
Jason Sams
5f43fd289a Implement Object readback. 2009-09-15 12:39:22 -07:00
Android (Google) Code Review
0ae011b6f6 Merge change 24990 into eclair
* changes:
  change to use the new CALLER_IS_SYNCADAPTER flag
2009-09-15 15:26:42 -04:00
Ken Schultz
dd4819f377 am 74a0b820: Merge change 25089 into eclair
Merge commit '74a0b8209e0228bb48739a4b25e489e2eba2a2c4' into eclair-plus-aosp

* commit '74a0b8209e0228bb48739a4b25e489e2eba2a2c4':
  DockObserver wakes the display when broadcasting a change
2009-09-15 11:53:39 -07:00
Dianne Hackborn
a90d14f2dd am 1cd403ea: Add SurfaceView API to put surface on top of window.
Merge commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2' into eclair-plus-aosp

* commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2':
  Add SurfaceView API to put surface on top of window.
2009-09-15 11:53:32 -07:00
Android (Google) Code Review
88cd369c33 Merge change 25048 into eclair
* changes:
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"
2009-09-15 14:51:56 -04:00
Bjorn Bringert
ed2c13a9d2 Revert "Deprecate showSearchIconAsBadge and icon search attrs"
I tried to revert a flag, but that doesn't actually work
and ended up deprecating the entire attribute.

This reverts commit ab50b86b79.
2009-09-15 19:49:10 +01:00
Android (Google) Code Review
74a0b8209e Merge change 25089 into eclair
* changes:
  DockObserver wakes the display when broadcasting a change 	- normal display timeout applies after wake
2009-09-15 14:44:34 -04:00
Dianne Hackborn
1cd403eaac Add SurfaceView API to put surface on top of window.
Change-Id: I9db84ee63a362e54ebc2f5b24a20ae5bdc3588bf
2009-09-15 11:29:00 -07:00
Brett Chabot
230a75ecda am d583a015: Merge change 25078 into eclair
Merge commit 'd583a015bcbac8718cbf5ed8a1c40d074c65a226' into eclair-plus-aosp

* commit 'd583a015bcbac8718cbf5ed8a1c40d074c65a226':
  Fix FileObserverTest#testRun.
2009-09-15 11:26:12 -07:00
Android (Google) Code Review
d583a015bc Merge change 25078 into eclair
* changes:
  Fix FileObserverTest#testRun.
2009-09-15 14:18:57 -04:00
Brett Chabot
0393d349be Fix FileObserverTest#testRun.
The assertion in the test was expecting 4 events, but it was only waiting for
three.

BUG 2119135
2009-09-15 11:07:33 -07:00
Christian Gustafsson
fca752b9d8 am 70f74b79: Assemble WAP datagram correctly when segments arrive out of order
Merge commit '70f74b79c3e4c88e0e7b747796f76187e4ea8259' into eclair-plus-aosp

* commit '70f74b79c3e4c88e0e7b747796f76187e4ea8259':
  Assemble WAP datagram correctly when segments arrive out of order
2009-09-15 11:05:23 -07:00
Grace Kloba
6aab672a17 am 04b2868c: WebView zoom clean up
Merge commit '04b2868c74a54cf711552262f0ad20d234b627b4' into eclair-plus-aosp

* commit '04b2868c74a54cf711552262f0ad20d234b627b4':
  WebView zoom clean up
2009-09-15 11:00:40 -07:00
Christian Gustafsson
70f74b79c3 Assemble WAP datagram correctly when segments arrive out of order
The WAP assembly code will always attach the last received segment at the end
of the WAP datagram. Change the code to add the current segment at the correct
location during the WAP datagram assembly.

Change-Id: I4cc18bf33bc68ab9a328a0107f21e3670b5026ac
2009-09-15 10:57:15 -07:00
Grace Kloba
04b2868c74 WebView zoom clean up 2009-09-15 10:53:44 -07:00