1745 Commits

Author SHA1 Message Date
The Android Open Source Project
1e09a72a75 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:56:43 -07:00
Jeff Hamilton
b890889267 Fix the build.
There was an issue with current.xml from a previous backup related change. Joe blames the stage.
2009-05-07 18:52:53 -07:00
The Android Open Source Project
60f3eb54a0 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:49:48 -07:00
Karl Rosaen
b2a5011578 Define the URI path, columns and constants for shortcut validation. 2009-05-07 18:37:11 -07:00
The Android Open Source Project
b59f23d4de Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:34:11 -07:00
Jack Palevich
e20ea783a1 Require native-order direct buffers for glXXXPointer APIs.
This was always a documented restriction, but was not enforced by the runtime until now.

Until now, if you passed in some other kind of buffer, it would sometimes work, and
sometimes fail. The failures happened when the Java VM moved the buffer data while
OpenGL was still holding a pointer to it.

Now we throw an exception rather than leaving the system in a potentially bad state.
2009-05-07 18:28:29 -07:00
The Android Open Source Project
3fd7e13960 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:51:28 -07:00
Android (Google) Code Review
538bcd702c Merge change 1164 into donut
* changes:
  Add new binder methods to camera client to support generic callbacks This is the first step in a multi-step change to move from the old specific callbacks to a generic callback. This will allow future flexibility in the interface without requiring binder rewrites. Bug 1837832
2009-05-07 17:47:54 -07:00
The Android Open Source Project
8705a41a77 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:40:33 -07:00
Android (Google) Code Review
881c4c25f1 Merge change 1108 into donut
* changes:
  * update density correctly when the configuration is changed. * Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-07 17:39:57 -07:00
The Android Open Source Project
c664d1837c Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:25:17 -07:00
Android (Google) Code Review
07d7521376 Merge change 760 into donut
* changes:
  don't use modulo
2009-05-07 17:23:51 -07:00
Christopher Tate
e10be80787 Sketch out the IBackupTransport api 2009-05-07 17:22:16 -07:00
The Android Open Source Project
572ae14f6e Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:04:14 -07:00
Mitsuru Oshima
d4cc32ca99 don't use modulo 2009-05-07 17:02:27 -07:00
Android (Google) Code Review
2108e5c74f Merge change 1163 into donut
* changes:
  Fix automatically generated code for glGet
2009-05-07 17:01:13 -07:00
The Android Open Source Project
7ec32cc7c3 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 16:45:46 -07:00
Joe Onorato
b1a7ffef3a More backup tests 2009-05-07 15:32:48 -07:00
Brandon Ballinger
e1a085801d am fedf566: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'fedf566b9e00f18588fc104caafd047af069844a'

* commit 'fedf566b9e00f18588fc104caafd047af069844a':
  AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
2009-05-07 14:30:13 -07:00
The Android Open Source Project
5085ef64ac Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 14:28:57 -07:00
Brandon Ballinger
fedf566b9e Merge branch 'readonly-p4-donut' into donut 2009-05-07 14:26:17 -07:00
Brandon Ballinger
cdd0ac6d85 AI 148484: (1) Pass recognizer intent to RecognitionService when starting to listen.
(2) Return error strings to client rather than error types.

Automated import of CL 148484
2009-05-07 14:24:02 -07:00
Robert Greenwalt
704e00ab7b Fix 1825581 - device restarts when using A2DP.
Had to do with using the wrong JNIEnv.  Now storing the VM and looking up a
JNIEnv appropriate to the thread as needed.
2009-05-07 14:09:29 -07:00
Dave Sparks
2a04aefdf0 Add new binder methods to camera client to support generic callbacks
This is the first step in a multi-step change to move from the old
specific callbacks to a generic callback. This will allow future
flexibility in the interface without requiring binder rewrites.
Bug 1837832
2009-05-07 12:25:25 -07:00
Scott Main
b6868d0048 am 9b825aa: AI 148470: add documentation about aapt image optimization
Merge commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093' into donut

* commit '9b825aa0eec5f143cec4c3cfeff97ba8d3d9d093':
  AI 148470: add documentation about aapt image optimization
2009-05-07 12:00:28 -07:00
Scott Main
9b825aa0ee AI 148470: add documentation about aapt image optimization
BUG=1735176

Automated import of CL 148470
2009-05-07 11:59:14 -07:00
Android (Google) Code Review
30f91d6e10 am b85c374: Merge change 1155 into donut
Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'

* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
  Don't allow negative numbers in ToneGenerator toneType parameter
2009-05-07 11:54:50 -07:00
Android (Google) Code Review
b85c37432b Merge change 1155 into donut
* changes:
  Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
2009-05-07 11:52:06 -07:00
Dirk Dougherty
9cfd9475ee am e87bf13: am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update
Merge commit 'e87bf13924199225d2751ae7b4d0451954ee3711'

* commit 'e87bf13924199225d2751ae7b4d0451954ee3711':
  AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
2009-05-07 11:20:43 -07:00
Dirk Dougherty
e87bf13924 am 1f8059f: AI 148461: Changes to support ADT 0.9.1. Update ADT version
Merge commit '1f8059f19f3345042121a55481d7f01dacc8d29e' into donut

* commit '1f8059f19f3345042121a55481d7f01dacc8d29e':
  AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
2009-05-07 11:18:35 -07:00
Dirk Dougherty
97774e15e3 am 2a50606: am f096acd: AI 148460: Misc changes for dev site.
Merge commit '2a50606532cfc26d100d6b7a966c73f785e5b3b8'

* commit '2a50606532cfc26d100d6b7a966c73f785e5b3b8':
  AI 148460: Misc changes for dev site.
2009-05-07 11:16:55 -07:00
Dirk Dougherty
1f8059f19f AI 148461: Changes to support ADT 0.9.1. Update ADT version id, move older ADT versions to a separate table.
BUG=1790234

Automated import of CL 148461
2009-05-07 11:15:03 -07:00
Dirk Dougherty
2a50606532 am f096acd: AI 148460: Misc changes for dev site.
Merge commit 'f096acd37994e47792552c2e53a6246dc8afb0d3' into donut

* commit 'f096acd37994e47792552c2e53a6246dc8afb0d3':
  AI 148460: Misc changes for dev site.
2009-05-07 11:14:26 -07:00
Dirk Dougherty
f096acd379 AI 148460: Misc changes for dev site.
BUG=1790234

Automated import of CL 148460
2009-05-07 11:12:11 -07:00
Jack Palevich
be509c9c7d Fix automatically generated code for glGet
Remove include of an internal agl header file. We should not depend on any implementation details
of our software renderer, since they may not be correct if another renderer is used.
Fix glGet number-of-elements logic for GL_FOG_COLOR GL_LIGHT_MODEL_AMBIENT,
and GL_COMPRESSED_TEXTURE_FORMATS.
2009-05-07 10:52:18 -07:00
Android (Google) Code Review
f9189f17d1 am 08d00b9: Merge change 1159 into donut
Merge commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd'

* commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd':
  CoreTests: Fix LocationManagerProximityTest.
2009-05-07 10:35:09 -07:00
Android (Google) Code Review
04f7e416b8 am 39bfa72: Merge change 1158 into donut
Merge commit '39bfa72172560b479fc100bf165883b86f5b2f5d'

* commit '39bfa72172560b479fc100bf165883b86f5b2f5d':
  location: Fix mock provider support
2009-05-07 10:35:08 -07:00
Android (Google) Code Review
08d00b9ad7 Merge change 1159 into donut
* changes:
  CoreTests: Fix LocationManagerProximityTest.
2009-05-07 10:33:25 -07:00
Android (Google) Code Review
39bfa72172 Merge change 1158 into donut
* changes:
  location: Fix mock provider support
2009-05-07 10:32:52 -07:00
Mike Lockwood
7f7840b41e CoreTests: Fix LocationManagerProximityTest.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-07 13:29:59 -04:00
Mike Lockwood
95427cdbd8 location: Fix mock provider support
Allow mock providers to be used for proximity alerts.
Clear calling identity so mock provider support does not fail due to
lack of INSTALL_LOCATION_PROVIDER permission.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-07 13:27:54 -04:00
Android (Google) Code Review
2bbaaf72ea am 0efb086: Merge change 1120 into donut
Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a'

* commit '0efb0868841cc1c2b5a669b39880d931f54f705a':
  Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
2009-05-07 09:34:39 -07:00
Android (Google) Code Review
0efb086884 Merge change 1120 into donut
* changes:
  Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest (Currently not supported by OpenCore 2.0)
2009-05-07 09:34:28 -07:00
Dave Sparks
4c92247098 Don't allow negative numbers in ToneGenerator toneType parameter
Bug 1836596
2009-05-07 09:26:06 -07:00
Android (Google) Code Review
a15f0fc6f7 am 5039606: Merge change 1152 into donut
Merge commit '50396063c2fbb1f427cf31e0b8a56567fb5a069c'

* commit '50396063c2fbb1f427cf31e0b8a56567fb5a069c':
  location: Remove two unnecessary variables.
2009-05-07 08:51:42 -07:00
Android (Google) Code Review
50396063c2 Merge change 1152 into donut
* changes:
  location: Remove two unnecessary variables.
2009-05-07 08:51:33 -07:00
Mike Lockwood
8dfe5d8c6b location: Remove two unnecessary variables.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-07 11:49:01 -04:00
Android (Google) Code Review
158b2129cf am f792fc5: Merge change 1150 into donut
Merge commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02'

* commit 'f792fc59c18aa470eb44cc596d5774115e2d9d02':
  location: Location Manager wakelock cleanup
2009-05-07 08:24:05 -07:00
Android (Google) Code Review
f792fc59c1 Merge change 1150 into donut
* changes:
  location: Location Manager wakelock cleanup
2009-05-07 08:23:40 -07:00
Mike Lockwood
0528b9b26a location: Location Manager wakelock cleanup
Location Providers are now responsible for their own wakelocks and scheduling.

Also fixed a deadlock in LocationManagerService in the code for releasing
wakelocks after client notifications have been received.
The fix is to use the Receiver object and mWakeLock for synchronization
 instead of the global mLock lock.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-07 11:02:22 -04:00