686 Commits

Author SHA1 Message Date
Bjorn Bringert
4369397d06 AI 147681: Fix SearchDialog crash on missing FORMAT suggestion column.
CL 147456 introduced support for HTML formatted search suggestions.
  This is triggered by the value "html" in the SUGGEST_COLUMN_FORMAT
  column. However, the code failed to check that the
  SUGGEST_COLUMN_FORMAT column was present before trying to read it.
  This resulted in an IllegalStateException being thrown when searching
  with a suggestion provider that does not include the SUGGEST_COLUMN_FORMAT
  column. This broke search at least in the Contacts and Music apps.

Automated import of CL 147681
2009-04-24 02:57:45 -07:00
Android (Google) Code Review
96a98d61d7 Merge change 402 into donut
* changes:
  remove seemingly now unnecessary workaround path
2009-04-24 00:55:26 -07:00
Android (Google) Code Review
dcac00d4d2 Merge change 415 into donut
* changes:
  code cleanup
2009-04-24 00:39:44 -07:00
Tammo Spalink
3de6da1f96 remove seemingly now unnecessary workaround path 2009-04-24 15:35:11 +08:00
Android (Google) Code Review
5fa153302c Merge change 482 into donut
* changes:
  location: Location Manager wakelock cleanup, phase 2
2009-04-23 22:44:05 -07:00
Yu Shan Emily Lau
2071043512 Modify and turn on the test case for video recording in portrait mode. 2009-04-23 21:46:55 -07:00
Android (Google) Code Review
d6f9b9baba Merge change 529 into donut
* changes:
  use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
2009-04-23 19:59:17 -07:00
Mathias Agopian
04ae634a5a Make sure to map undefined OES functions to their non-OES counterpart if it exists. 2009-04-23 19:57:10 -07:00
Mike Lockwood
48f1751822 location: Location Manager wakelock cleanup, phase 2
Remove two second timeout for wakelock when broadcasting events to
location listeners. Instead, hold wakelock until receipt of the event
is acknowledged, either via a Binder call or the
PendingIntent.OnFinished interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-04-23 19:27:41 -07:00
Karl Rosaen
f3ccf8a5a5 Merge branch 'readonly-p4-donut' into donut 2009-04-23 19:01:36 -07:00
Karl Rosaen
875d50a4b9 AI 147564: Merge back from search branch to donut. Notes:
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
  - all new public apis are @hidden; they will still get reviewed by api council once we're in git
  - other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
  to the contacts provider that was reviewed by jham

Automated import of CL 147564
2009-04-23 19:00:21 -07:00
Mathias Agopian
1feecd8310 use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis. 2009-04-23 18:05:44 -07:00
Android (Google) Code Review
0a9b5bbb47 Merge change 509 into donut
* changes:
  Fix a media server crash (bug 1807910): part one Add a factory method that creates a Camera object from a remote client
2009-04-23 15:58:38 -07:00
Android (Google) Code Review
5616a7d1de Merge change 459 into donut
* changes:
  TypedProperties: initial commit
2009-04-23 14:22:58 -07:00
James Dong
2adc2dbbd6 Fix a media server crash (bug 1807910): part one
Add a factory method that creates a Camera object from a remote client

Next:
The changes in authordriver.cpp and android_camera_input.cpp will come.
and the constructor for Camera object will be removed.
2009-04-23 14:07:23 -07:00
Android (Google) Code Review
24b62d0c41 Merge change 462 into donut
* changes:
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
2009-04-23 13:48:39 -07:00
Mathias Agopian
e29254e708 integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK. 2009-04-23 13:45:48 -07:00
Android (Google) Code Review
9c56513900 Merge change 165 into donut
* changes:
  Squashed commit of the following:
2009-04-23 12:23:46 -07:00
Android (Google) Code Review
947fe79e99 Merge change 483 into donut
* changes:
  API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
2009-04-23 11:44:10 -07:00
San Mehat
29b57e63e5 API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
Signed-off-by: San Mehat <san@google.com>
2009-04-23 11:40:17 -07:00
Tammo Spalink
39bae34694 code cleanup 2009-04-23 13:36:42 +08:00
Tammo Spalink
0a57e5b730 removed extra event log tag 2009-04-23 10:34:11 +08:00
Dirk Dougherty
134e8e4fc3 AI 147433: Fix broken link to sdk/samples dir in the offline.html page.
BUG=1790234

Automated import of CL 147433
2009-04-22 18:45:05 -07:00
Android (Google) Code Review
0b8ffd17bc Merge change 460 into donut
* changes:
  More optimization of dumpsys output.
2009-04-22 18:33:57 -07:00
Dianne Hackborn
1d442e0d99 More optimization of dumpsys output.
There are three major classes of changes here:

- Avoid writing lines where their values are often empty, false, or some other typical thing.
- Use partial writes to the PrintWriter to avoid creating temporary strings.
- Use StringBuilder where we need to generate real String objects (and where possible cache the result).
2009-04-22 18:03:21 -07:00
Jean-Baptiste Queru
56137a2584 merge cupcake into donut 2009-04-22 17:56:58 -07:00
Dave Bort
c4d6dd0bbc TypedProperties: initial commit 2009-04-22 17:51:50 -07:00
Android (Google) Code Review
2d6b6b2568 Merge change 289 into donut
* changes:
  Changes for new ril.h.
2009-04-22 16:44:52 -07:00
Wink Saville
a14f47f975 Changes for new ril.h.
These allow RIL.java to assume ril.cpp is interfacing
to the new CDMA capable vendor ril. At the moment we
don't have a full CDMA capabile ril so thre are some
NEWRIL:TODO's in the code base to identify these areas.
2009-04-22 14:52:11 -07:00
Robert Greenwalt
96e20409af Squashed commit of the following:
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date:   Wed Apr 22 14:31:26 2009 -0700

    Additional fixes and tests for density.

commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date:   Tue Apr 14 14:39:00 2009 -0700

    Fix runtime resource selection logic.

    Fix isBetterThan so that o or this may be supperior at any stage.
    Used to only handle this-better or tie at each stage, biasing against o.
    Also allows reset of unit test to succeed.  Fixes bug 1709202.
2009-04-22 14:35:11 -07:00
Dirk Dougherty
644cf62660 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:39:58 -07:00
Dirk Dougherty
b08971b876 AI 147338: am: CL 147336 Remove stuff relating to the Maps ext library from the docs. Leave a pointer over to code.google.com.
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 147338
2009-04-22 13:38:45 -07:00
Dirk Dougherty
b6f8704116 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:37:15 -07:00
Dirk Dougherty
8ad72ec1cb AI 147334: am: CL 147332 Miscellaneous doc changes for cupcake SDK
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 147334
2009-04-22 13:35:59 -07:00
Scott Main
79282c867b Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:34:31 -07:00
Scott Main
757714fd15 AI 147327: am: CL 147325 update the installing and upgrading docs for cupcake
Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 147327
2009-04-22 13:33:18 -07:00
Scott Main
680974e363 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:28:57 -07:00
Scott Main
9077708767 AI 147317: am: CL 147314 change carousel SDK to 1.5;
revise Google IO info
  Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 147317
2009-04-22 13:27:42 -07:00
Scott Main
003f213bdf Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:26:11 -07:00
Scott Main
3aa6511539 AI 147313: am: CL 147311 update eclipse docs to include necessary AVD procedures and
discuss relevant target facilities
  Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 147313
2009-04-22 13:24:58 -07:00
Scott Main
823ce5e1b6 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:23:29 -07:00
Scott Main
5ac35ad03f AI 147308: am: CL 147306 re-write the Developing in Other IDEs doc with updated information for 1.5
Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 147308
2009-04-22 13:22:17 -07:00
Dirk Dougherty
7a7e3f68f6 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:20:44 -07:00
Dirk Dougherty
9db5e1d0ab AI 147303: am: CL 147297 Update Android 1.5 SDK Download, Release Notes, Version Notes, Highlights
Please let me know if you have other "known issues", "resolved issues", or
  "highlights".
  Also, note that the installing and upgrading docs are being updated in
  a different CL, so the new version is not displayed on my staging server.
  Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 147303
2009-04-22 13:19:30 -07:00
Eric Fischer
a4f01520b9 AI 147406: Import revised translations.
Automated import of CL 147406
2009-04-22 12:33:55 -07:00
Jean-Baptiste Queru
cddff7c3ce Merge commit 'goog/readonly-p4-donut' into HEAD
Conflicts:
	location/java/android/location/Geocoder.java
2009-04-22 12:09:59 -07:00
Marco Nelissen
9f0b1a4850 Do case-insensitive matching when determining whether something is music, an alarm sound, notification sound, etc. 2009-04-22 10:34:12 -07:00
Android (Google) Code Review
c9a3b66d27 Merge change 358 into donut
* changes:
  Fix issue 1745312: Various cleanups in media framework
2009-04-22 09:57:03 -07:00
Android (Google) Code Review
44ff0514c2 Merge change 416 into donut
* changes:
  Remove debug messages. 	modified:   core/java/android/hardware/Camera.java
2009-04-22 01:59:31 -07:00
Wu-cheng Li
ab5b424db3 Remove debug messages.
modified:   core/java/android/hardware/Camera.java

	modified:   camera/libcameraservice/CameraService.cpp
2009-04-22 16:22:01 +08:00