Joe Onorato
c825d3ebd6
fix the sim build. disables the tests for now.
2009-05-08 09:33:19 -07:00
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
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
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
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
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
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
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
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
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
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
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
Android (Google) Code Review
a6706b3c8f
Merge change 1131 into donut
...
* changes:
fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
2009-05-07 07:46:42 -07:00
Eric Laurent
9648e4b677
fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
...
Enabled USE_SHARED_MEM_BUFFER switch in SoundPool.cpp
2009-05-07 03:14:31 -07:00
Android (Google) Code Review
90da134bef
Merge change 1065 into donut
...
* changes:
Add a contact placeholder picture.
2009-05-07 01:05:41 -07:00
Xia Wang
fe1766474b
Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
...
(Currently not supported by OpenCore 2.0)
2009-05-06 21:12:39 -07:00
Michael Chan
05d24afb61
Merge branch 'readonly-p4-donut' into donut
2009-05-06 17:39:50 -07:00
Romain Guy
d90a33111b
Add new setTag(int, Object) API to allow applications to specify several tags.
2009-05-06 16:49:56 -07:00
Mitsuru Oshima
2e3d3b9ce7
* update density correctly when the configuration is changed.
...
* Turns private sLcdDensity to public DEVICE_DENSITY to use it in ActivityThread
2009-05-06 16:42:11 -07:00
Android (Google) Code Review
413cf5f453
Merge change 1110 into donut
...
* changes:
Track install/removal/update of packages that provide backup services
2009-05-06 16:15:21 -07:00
Christopher Tate
3799bc241b
Track install/removal/update of packages that provide backup services
2009-05-06 16:13:56 -07:00
Android (Google) Code Review
f2331a63c0
Merge change 1063 into donut
...
* changes:
Refactor SearchableInfo.
2009-05-06 14:20:53 -07:00