Commit Graph

255075 Commits

Author SHA1 Message Date
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
Android (Google) Code Review
7c6b6fbe4c am a6706b3: Merge change 1131 into donut
Merge commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2'

* commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2':
  fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
2009-05-07 07:50:07 -07: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
Mihai Preda
a82842f98d Move ACTION_BATTERY_LOW logic to BatteryService (bug 1630733). 2009-05-07 11:59:10 +02:00
Android (Google) Code Review
5bd1d84aa8 am 90da134: Merge change 1065 into donut
Merge commit '90da134befec804852775be7fd4905a1a188ff00'

* commit '90da134befec804852775be7fd4905a1a188ff00':
  Add a contact placeholder picture.
2009-05-07 01:07:37 -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
eec4c7737b am 05d24af: Merge branch \'readonly-p4-donut\' into donut
Merge commit '05d24afb61e2fbd137468a065fd58685e1a62d78'

* commit '05d24afb61e2fbd137468a065fd58685e1a62d78':
  AI 148368: Decrease CPU usage by throttling touch events
2009-05-06 18:18:49 -07:00
The Android Open Source Project
cfe5cdd3a1 manual merge d90a331 to avoid conflicts
Merge commit 'd90a331'
2009-05-06 18:16:52 -07:00
Michael Chan
05d24afb61 Merge branch 'readonly-p4-donut' into donut 2009-05-06 17:39:50 -07:00
Android (Google) Code Review
8dd6de8050 Merge change 1109
* changes:
  Another fix: look at db version to determine if there is a type column.
2009-05-06 17:21:57 -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
77066048f4 am 413cf5f: Merge change 1110 into donut
Merge commit '413cf5f4536b9c029d07f99b1c769c026313cd12'

* commit '413cf5f4536b9c029d07f99b1c769c026313cd12':
  Track install/removal/update of packages that provide backup services
2009-05-06 16:18:45 -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
34f97460bd am f2331a6: Merge change 1063 into donut
Merge commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c'

* commit 'f2331a63c0e7f6ffeedf16185c92a0aeffa5512c':
  Refactor SearchableInfo.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
93ec975eda am 729a901: Merge change 1099 into donut
Merge commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5'

* commit '729a901b2a9ca163d6395983711cea1fdc7b5eb5':
  Fix Phone-based locale selection to never choose a lang-only locale.
2009-05-06 15:49:01 -07:00
Android (Google) Code Review
6ea036760f am f759824: Merge change 1086 into donut
Merge commit 'f7598245489c6d28c2673acd269ada2e6e834065'

* commit 'f7598245489c6d28c2673acd269ada2e6e834065':
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 15:49:00 -07:00
Christopher Tate
959a4bcc46 am b1d790b: Pass null as savedState to indicate a full backup is require
Merge commit 'b1d790b63e2115be558d451efbc914d1f8dfa846'

* commit 'b1d790b63e2115be558d451efbc914d1f8dfa846':
  Pass null as savedState to indicate a full backup is required
2009-05-06 15:49:00 -07:00
Android (Google) Code Review
37dbf09917 am 9a6f250: Merge change 1089 into donut
Merge commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c'

* commit '9a6f25033c51390cbcc4eec38f27e0ac35e97f1c':
  Add a Backup Manager interface to request a full backup
2009-05-06 15:48:59 -07:00
Android (Google) Code Review
54f2422b48 am fd445d3: Merge change 1095 into donut
Merge commit 'fd445d3510cddc7a67cf7720935626684a2f3011'

* commit 'fd445d3510cddc7a67cf7720935626684a2f3011':
  gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 15:48:58 -07:00
The Android Open Source Project
56b7eeaa01 manual merge f3af740bdf
Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
2009-05-06 15:48:33 -07:00
The Android Open Source Project
761daf7550 manual merge for b9c9d260f2
Merge commit 'b9c9d260f21b321527c4622a123af9767630d94d'
2009-05-06 15:43:48 -07:00
Dianne Hackborn
2d5ed1fa3d Another fix: look at db version to determine if there is a type column. 2009-05-06 15:22:38 -07:00
Android (Google) Code Review
f2331a63c0 Merge change 1063 into donut
* changes:
  Refactor SearchableInfo.
2009-05-06 14:20:53 -07:00
Android (Google) Code Review
729a901b2a Merge change 1099 into donut
* changes:
  Fix Phone-based locale selection to never choose a lang-only locale.
2009-05-06 14:06:08 -07:00
Android (Google) Code Review
f759824548 Merge change 1086 into donut
* changes:
  Fixes regression introduced in Cupcake: a couple of adapters were using setTag() to store their own data, which could interfere with the use of setTag() made by the applications. The fix is quite simple an rely on a WeakHashMap to store the holders within the adapters; using the Views as the keys of the map.
2009-05-06 12:45:16 -07:00
Christopher Tate
b1d790b63e Pass null as savedState to indicate a full backup is required 2009-05-06 12:38:21 -07:00