Commit Graph

697 Commits

Author SHA1 Message Date
Mike LeBeau
41c8ca73ff merged 98acd54, resolved conflicts 2009-05-08 17:59:05 -07:00
The Android Open Source Project
6396c51e67 merge 55280a9
Merge commit '55280a9'
2009-05-08 13:33:21 -07:00
Android (Google) Code Review
a1b9b6a529 am 672f1e2: Merge change 1192 into donut
Merge commit '672f1e2b07d985526bfd5606e6a888005fdcb70c'

* commit '672f1e2b07d985526bfd5606e6a888005fdcb70c':
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 12:25:06 -07:00
The Android Open Source Project
d56e9daff7 manual merge 3a6645a
Merge commit '3a6645a'
2009-05-08 12:16:40 -07:00
Android (Google) Code Review
0960c1d35f Merge change 1192 into donut
* changes:
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 11:41:47 -07:00
Android (Google) Code Review
3398aa6c7d Merge change 1114 into donut
* changes:
  Fix keyboard redraw bug on long-press of CapsLock.
2009-05-08 11:31:03 -07:00
Android (Google) Code Review
d2d304e104 am 17a5e5d: Merge change 1217 into donut
Merge commit '17a5e5de3d864842b723efe24650863db0656a14'

* commit '17a5e5de3d864842b723efe24650863db0656a14':
  Sketch out the IBackupTransport api
2009-05-08 11:12:34 -07:00
Android (Google) Code Review
5a49d8c25d Merge change 1217 into donut
* changes:
  Sketch out the IBackupTransport api
2009-05-08 11:10:34 -07:00
Joe Onorato
11c2776591 am c825d3e: fix the sim build. disables the tests for now.
Merge commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22'

* commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22':
  fix the sim build.  disables the tests for now.
2009-05-08 09:35:32 -07:00
Joe Onorato
2a98fb9fb1 fix the sim build. disables the tests for now. 2009-05-08 09:33:19 -07:00
The Android Open Source Project
0ced3f709d manual merge of 1e09a72
Merge commit '1e09a72'
2009-05-08 07:23:54 -07:00
The Android Open Source Project
ecfb57f4f6 am 60f3eb5: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd'

* commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd':
  Define the URI path, columns and constants for shortcut validation.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
13bfa901be am b59f23d: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db'

* commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db':
  Require native-order direct buffers for glXXXPointer APIs.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
031af5ad86 am 3fd7e13: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '3fd7e13960c2763225c5c8bc187bd15da04820dd'

* commit '3fd7e13960c2763225c5c8bc187bd15da04820dd':
  Add new binder methods to camera client to support generic callbacks
2009-05-08 07:22:45 -07:00
The Android Open Source Project
14a4c67dbb am 8705a41: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5'

* commit '8705a41a778bd0561737fd9b6fb2e1cdca0532b5':
  * update density correctly when the configuration is changed.
2009-05-08 07:22:44 -07:00
The Android Open Source Project
d55158b686 am c664d18: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e'

* commit 'c664d1837c34f3e7ab743f7fb96771b0c9d8df6e':
  don't use modulo
2009-05-08 07:22:44 -07:00
The Android Open Source Project
490f45b8ec am 572ae14: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f'

* commit '572ae14f6e38b9c3262937f2f4b57bd6779c3c5f':
  Fix automatically generated code for glGet
2009-05-08 07:22:41 -07:00
The Android Open Source Project
bc1b1cc401 manual merge of 7ec32cc
Merge commit '7ec32cc'
2009-05-08 07:21:43 -07:00
The Android Open Source Project
1963bba40a am 5085ef6: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '5085ef64ac3e589b1674dddcb6dabe3600e347da'

* commit '5085ef64ac3e589b1674dddcb6dabe3600e347da':
2009-05-08 00:54:55 -07:00
Scott Main
6e85bdd536 am b6868d0: am 9b825aa: AI 148470: add documentation about aapt image op
Merge commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4'

* commit 'b6868d0048ec814e02ced35df6ad6e7b72389ca4':
  AI 148470: add documentation about aapt image optimization
2009-05-08 00:54:53 -07:00
The Android Open Source Project
bed158f1de Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:56:43 -07:00
The Android Open Source Project
7b2a28eb75 Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 18:49:48 -07:00
The Android Open Source Project
7136037d4d 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
46d25a371d 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
e5752df54b 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
c1d9854e39 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
b4beae478a 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
ba87f0836e 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
95a2af1c87 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
144f2965c8 Merge change 760 into donut
* changes:
  don't use modulo
2009-05-07 17:23:51 -07:00
The Android Open Source Project
7476ede9ac Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 17:04:14 -07:00
Android (Google) Code Review
bc4a2d58e1 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
f3f77c2b0f Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-05-07 16:45:46 -07:00
Brandon Ballinger
375cfea26b 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
6f6ca074ed 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
4636d459e8 Merge branch 'readonly-p4-donut' into donut 2009-05-07 14:26:17 -07:00
Dave Sparks
9b35233ea5 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
2665202dba 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
Android (Google) Code Review
3c1a21bd42 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
c474615a51 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
43caaff294 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
0bc0d2b628 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
94bc09cdfc 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
76d550abd1 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
Jack Palevich
593f203ba3 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
aa2d9c139d 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
0a20297dc5 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
7a3f858b70 Merge change 1159 into donut
* changes:
  CoreTests: Fix LocationManagerProximityTest.
2009-05-07 10:33:25 -07:00
Android (Google) Code Review
9ee7741a88 Merge change 1158 into donut
* changes:
  location: Fix mock provider support
2009-05-07 10:32:52 -07:00
Android (Google) Code Review
f0d16879b7 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