Commit Graph

2497 Commits

Author SHA1 Message Date
Android (Google) Code Review
ab97a1c398 am 7bf9f930: Merge change 6415 into donut
Merge commit '7bf9f930d986335cd24dc15e2ee588b851f194d4'

* commit '7bf9f930d986335cd24dc15e2ee588b851f194d4':
  Fixes #1748951. Calling setListSelection() explicitely should cancel the selection hidden flag.
2009-07-07 15:21:16 -07:00
Android (Google) Code Review
5c3d39c866 Merge change 6415 into donut
* changes:
  Fixes #1748951. Calling setListSelection() explicitely should cancel the selection hidden flag.
2009-07-07 15:19:14 -07:00
Christopher Tate
d2ba65b2cd am a7de3845: Only write to the pending-backup journal when necessary
Merge commit 'a7de3845507b7bf57a2c7b26fb08f05b193697d6'

* commit 'a7de3845507b7bf57a2c7b26fb08f05b193697d6':
  Only write to the pending-backup journal when necessary
2009-07-07 14:53:56 -07:00
Android (Google) Code Review
847ebb4f76 Merge change 6392
* changes:
  Add the condition check of ERI for CDMA roaming.
2009-07-07 14:50:04 -07:00
Android (Google) Code Review
124ca05515 am c4cf22e8: Merge change 6403 into donut
Merge commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1'

* commit 'c4cf22e82ba8ec4eec7051ae3a8eb397ded578d1':
  Fix the metadata-available test during restore
2009-07-07 14:31:19 -07:00
Android (Google) Code Review
4fc0ba430e Merge change 6403 into donut
* changes:
  Fix the metadata-available test during restore
2009-07-07 14:29:47 -07:00
Android (Google) Code Review
1c9354e6aa Merge change 6399
* changes:
  Obex library cleanup, third pass
2009-07-07 14:08:43 -07:00
Android (Google) Code Review
ec0cb1740c am 7fdd661f: Merge change 6377 into donut
Merge commit '7fdd661f12f73148517e5e011efc206cc7259fbc'

* commit '7fdd661f12f73148517e5e011efc206cc7259fbc':
  Propagating error codes to TextToSpeech.java
2009-07-07 13:48:29 -07:00
Android (Google) Code Review
5fcde6c496 Merge change 6377 into donut
* changes:
  Propagating error codes to TextToSpeech.java
2009-07-07 13:46:17 -07:00
Jean-Baptiste Queru
aa32de6bce Merge a bunch of cherry-picked changes from the open-source tree. 2009-07-07 13:33:47 -07:00
Android (Google) Code Review
d7fac60c4f Merge change 6382
* changes:
  add a virtual destructor to region_rasterizer, to be on the safe side
2009-07-07 12:43:06 -07:00
Android (Google) Code Review
bd175dfe00 Merge change 6320
* changes:
  Add method to read events from a file.  Remove unused method.  Fixed after review.
2009-07-07 12:37:27 -07:00
Mathias Agopian
e7c4c28d0f add a virtual destructor to region_rasterizer, to be on the safe side 2009-07-07 12:29:17 -07:00
Android (Google) Code Review
4f9039002a am a5188a09: Merge change 6367 into donut
Merge commit 'a5188a09bd20c376b4f0645b0df4c52f8e114e21'

* commit 'a5188a09bd20c376b4f0645b0df4c52f8e114e21':
  Add virtual destructor.
2009-07-07 12:14:01 -07:00
Android (Google) Code Review
ed65428df2 Merge change 6367 into donut
* changes:
  Add virtual destructor.
2009-07-07 12:12:12 -07:00
Android (Google) Code Review
f770f4757b am fdc3d110: Merge change 6379 into donut
Merge commit 'fdc3d110516a6d2f62e68d2f76c4aeace580de40'

* commit 'fdc3d110516a6d2f62e68d2f76c4aeace580de40':
  Update RatingBar's assets in indicator mode.
2009-07-07 11:57:40 -07:00
Android (Google) Code Review
4666832006 Merge change 6379 into donut
* changes:
  Update RatingBar's assets in indicator mode.
2009-07-07 11:56:43 -07:00
Android (Google) Code Review
37ecefbd5f am 2c5a3aeb: Merge change 6326 into donut
Merge commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1'

* commit '2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1':
  BackupManager wrapper class improvements
2009-07-07 11:53:23 -07:00
Android (Google) Code Review
8b2b7b14a5 Merge change 6326 into donut
* changes:
  BackupManager wrapper class improvements
2009-07-07 11:52:01 -07:00
Cynthia Wong
c888a0b020 am 04f0b05e: Add a Gservices setting for how many times we should retry before discarding an uphill operation
Merge commit '04f0b05ea04a4a13d6a15b36eaa27b2ec364f313'

* commit '04f0b05ea04a4a13d6a15b36eaa27b2ec364f313':
  Add a Gservices setting for how many times we should retry before discarding an uphill operation
2009-07-07 11:46:05 -07:00
Android (Google) Code Review
b25c5a23c8 am 790a604b: Merge change 6372 into donut
Merge commit '790a604b9c32647711599710e21f0f00eb3d839c'

* commit '790a604b9c32647711599710e21f0f00eb3d839c':
  Fixes #1963217. Increases the invalidate region in compatibility mode.
2009-07-07 11:25:30 -07:00
Android (Google) Code Review
d0e3530737 am c1c44a56: Merge change 6363 into donut
Merge commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c'

* commit 'c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c':
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks
2009-07-07 11:25:26 -07:00
Android (Google) Code Review
9490823092 Merge change 6372 into donut
* changes:
  Fixes #1963217. Increases the invalidate region in compatibility mode.
2009-07-07 11:23:44 -07:00
Marco Nelissen
1c0f5382ed Add virtual destructor. 2009-07-07 11:03:13 -07:00
Android (Google) Code Review
750a261edb Merge change 6363 into donut
* changes:
  LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks
2009-07-07 11:02:04 -07:00
Android (Google) Code Review
cbbb9fb8c6 Merge change 6361
* changes:
  Fix sim build.
2009-07-07 11:01:19 -07:00
San Mehat
b3ef6afcea am 0310f9aa: WifiService: Fix build (missing import)
Merge commit '0310f9aa21ed8714acbe56afea061596fb8f1ac4'

* commit '0310f9aa21ed8714acbe56afea061596fb8f1ac4':
  WifiService: Fix build (missing import)
2009-07-07 10:52:51 -07:00
Android (Google) Code Review
3c2202c5a6 am b61479ae: Merge change 6314 into donut
Merge commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193'

* commit 'b61479ae868c9f2b887b2992b133a96d9ea1a193':
  Use the current Locale as the default language when TTS settings are not
2009-07-07 10:37:17 -07:00
Android (Google) Code Review
d2c4bb9cac Merge change 6314 into donut
* changes:
  Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine.
2009-07-07 10:35:40 -07:00
San Mehat
12b47c56de am fa6c7111: WifiService: use wifi association state to determine if we should suspend wifi instead of the existance of an IP address.
Merge commit 'fa6c7111fe58e09a92741c7655221c3629d3220e'

* commit 'fa6c7111fe58e09a92741c7655221c3629d3220e':
  WifiService: use wifi association state to determine if we should suspend wifi instead of
2009-07-07 10:19:56 -07:00
Andy McFadden
f460f19510 Fix sim build.
Looks like older gcc (4.1.x) doesn't properly handle templated
fanciness.  Apparently that's what we have on the build server.
2009-07-07 10:01:12 -07:00
Eric Laurent
8434c78862 am 88e209dc: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Merge commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c'

* commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c':
  Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
2009-07-07 09:36:14 -07:00
Eric Laurent
0bac53801b Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Store sample rate on 32 bits instead of 16 bits in audio_track_cblk_t.
Removed sampleRate() methods from AudioTrack and AudioRecord: replaced by getSampleRate().
AudioTrack::setSampleRate() no returns a status.
2009-07-07 07:10:45 -07:00
Android (Google) Code Review
f6476d6967 am 37ea7112: Merge change 6338 into donut
Merge commit '37ea71122579e9e2ad1f91b3eca5e4d436b54ea9'

* commit '37ea71122579e9e2ad1f91b3eca5e4d436b54ea9':
  septet-align UD after any UDH for GSM-7bit coding
2009-07-06 23:49:45 -07:00
Android (Google) Code Review
0cf7312c8b Merge change 6338 into donut
* changes:
  septet-align UD after any UDH for GSM-7bit coding
2009-07-06 23:48:25 -07:00
Mitsuru Oshima
9076616ee2 am 569076c9: widgets scaling fix. Use container\'s compatibility info and display metrics when container and widgets disagree.
Merge commit '569076c9f6bdadb4d3285a26e069634a839b5b87'

* commit '569076c9f6bdadb4d3285a26e069634a839b5b87':
  widgets scaling fix. Use container's compatibility info and display metrics when container and widgets disagree.
2009-07-06 21:24:08 -07:00
Mathias Agopian
1df3bbb8d8 trying to fix the sim, I'm not even sure this syntaxe is valid, but my compilo doesn't complain 2009-07-06 19:04:55 -07:00
Android (Google) Code Review
96e1107f4b am dbee95ca: Merge change 6317 into donut
Merge commit 'dbee95cacff9d2faf30638e64abe26fbeb128787'

* commit 'dbee95cacff9d2faf30638e64abe26fbeb128787':
  Make enable/provisioning of the backup service a two-step process
2009-07-06 18:26:42 -07:00
Android (Google) Code Review
0736fc8418 Merge change 6317 into donut
* changes:
  Make enable/provisioning of the backup service a two-step process
2009-07-06 18:24:26 -07:00
Android (Google) Code Review
2d245ba45f Merge change 6315
* changes:
  should fix sim build
2009-07-06 18:08:02 -07:00
Mathias Agopian
72b0ffe4c3 should fix sim build 2009-07-06 18:07:26 -07:00
-b master
8911cdad26 resolved conflicts for merge of b7195159 to master 2009-07-06 17:44:41 -07:00
Android (Google) Code Review
8d430cbfca Merge change 6287 into donut
* changes:
  Restore GPS state and ringer/vibrate toggles.
2009-07-06 17:32:09 -07:00
Romain Guy
56effbfabd am 870e09fc: Fixes #1963229. Introduces Context#isRestricted().
Merge commit '870e09fcd2dfdc12ac318962efd28b0420c562bb'

* commit '870e09fcd2dfdc12ac318962efd28b0420c562bb':
  Fixes #1963229. Introduces Context#isRestricted().
2009-07-06 17:10:41 -07:00
Android (Google) Code Review
6b4bf81edb am 453dd50e: Merge change 6307 into donut
Merge commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'

* commit '453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
  Fixes a compatibility issue with users that have the old TTS
2009-07-06 16:29:05 -07:00
Android (Google) Code Review
07ab11b4f6 Merge change 6307 into donut
* changes:
  Fixes a compatibility issue with users that have the old TTS installed already.
2009-07-06 16:28:03 -07:00
Android (Google) Code Review
eabd0dd50e am 8d07c068: Merge change 6305 into donut
Merge commit '8d07c0684619b6c30f525d25d92835254a7220a9'

* commit '8d07c0684619b6c30f525d25d92835254a7220a9':
  Fix up permissions for 'dumpsys backup'
2009-07-06 16:00:27 -07:00
Android (Google) Code Review
352c16e9de Merge change 6256
* changes:
  Refactoring of VideoView.java class
2009-07-06 15:54:49 -07:00
Android (Google) Code Review
1b78e260f2 Merge change 6305 into donut
* changes:
  Fix up permissions for 'dumpsys backup'
2009-07-06 15:49:26 -07:00
Mathias Agopian
dcab005f07 Merge commit 'goog/master_gl' into merge_master_gl 2009-07-06 14:52:04 -07:00