Commit Graph

4578 Commits

Author SHA1 Message Date
Jeff Hamilton
6da5f4b87e am 505cbb44: Merge change 23811 into eclair
Merge commit '505cbb446d46466230c23a09b2ceb201b8faae8f' into eclair-plus-aosp

* commit '505cbb446d46466230c23a09b2ceb201b8faae8f':
  Fix the registration of the package changes broadcast receiver.
2009-09-03 09:36:02 -07:00
Android (Google) Code Review
8608902e91 Merge change 23818 into eclair
* changes:
  Exit Emergency Callback Mode if phone process crashes/restarts
2009-09-03 09:35:25 -07:00
Android (Google) Code Review
23dbf18922 Merge change 23811 into eclair
* changes:
  Fix the registration of the package changes broadcast receiver.
2009-09-03 09:33:44 -07:00
Steve Block
fcd8daa6b9 am b84138c7: Merge change 23806 into eclair
Merge commit 'b84138c72c94f189d4656451097b90f86d751731' into eclair-plus-aosp

* commit 'b84138c72c94f189d4656451097b90f86d751731':
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:26:05 -07:00
Android (Google) Code Review
ddfdfdf0aa Merge change 23806 into eclair
* changes:
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:24:15 -07:00
Robert Greenwalt
2d5f16032b am e8f605ff: Merge change 23761 into eclair
Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp

* commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9':
  Fix compilation of add-resource tag.
2009-09-03 09:11:10 -07:00
Android (Google) Code Review
981104a567 Merge change 23761 into eclair
* changes:
  Fix compilation of add-resource tag.
2009-09-03 09:08:24 -07:00
Daniel Sandler
1c543035ee am 47cec9fa: Merge change 23817 into eclair
Merge commit '47cec9fafbef30b817ac0a8af510ac35e09ea966' into eclair-plus-aosp

* commit '47cec9fafbef30b817ac0a8af510ac35e09ea966':
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
2009-09-03 08:51:35 -07:00
Android (Google) Code Review
f1b08e0635 Merge change 23817 into eclair
* changes:
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
2009-09-03 08:49:56 -07:00
Eric Laurent
94b81d85c4 am 1a3af62b: Merge change 23801 into eclair
Merge commit '1a3af62bfb3583ac2fece18523927587b6b6a277' into eclair-plus-aosp

* commit '1a3af62bfb3583ac2fece18523927587b6b6a277':
  fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
2009-09-03 08:02:53 -07:00
Eric Laurent
324a804739 am cabd01f4: Merge change 23798 into eclair
Merge commit 'cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp

* commit 'cabd01f42afd0661d6a29217c62353c2eae3149a':
  Fix issue 2097083: STREAM_SYSTEM should be at max volume.
2009-09-03 08:02:46 -07:00
Android (Google) Code Review
a29d88b99a Merge change 23801 into eclair
* changes:
  fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
2009-09-03 08:01:09 -07:00
Android (Google) Code Review
06b0d49be6 Merge change 23798 into eclair
* changes:
  Fix issue 2097083: STREAM_SYSTEM should be at max volume.
2009-09-03 08:00:30 -07:00
Eric Laurent
08d3d1d001 fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Do not ramp volume if the first frame of a track is processed after the track was stopped.
In the case of very short sounds, the track stop request can be received by AudioFlinger just after the start request before the first frame is mixed by AudioMixer. In this case, the track is already in stopped state and initial volume is applied with a ramp for the first frame processed which should not be the case: initial volume change is always applied immediatelly.
2009-09-03 04:11:18 -07:00
Wei Huang
b0590b6856 am 558340f2: Merge change 23793 into eclair
Merge commit '558340f2143b5efe4bc14b901ae1dc1b8cec7901' into eclair-plus-aosp

* commit '558340f2143b5efe4bc14b901ae1dc1b8cec7901':
  add conditional verbose logging for when sending a SMS message.
2009-09-03 01:35:35 -07:00
Android (Google) Code Review
3aedbeabd8 Merge change 23793 into eclair
* changes:
  add conditional verbose logging for when sending a SMS message.
2009-09-03 01:33:44 -07:00
Dianne Hackborn
a92d317509 am 85644d78: Really fix issue #:2097189 can\'t set custom wallpaper
Merge commit '85644d78894b66fa2903fb012b5122185767d1c5' into eclair-plus-aosp

* commit '85644d78894b66fa2903fb012b5122185767d1c5':
  Really fix issue #:2097189 can't set custom wallpaper
2009-09-03 00:29:09 -07:00
Jeff Sharkey
a21a6cf539 am 0c36a517: Add private API for data with presence.
Merge commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015' into eclair-plus-aosp

* commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015':
  Add private API for data with presence.
2009-09-02 23:20:48 -07:00
Dianne Hackborn
c32811aeb1 am e3c393d3: Merge change 23787 into eclair
Merge commit 'e3c393d3d14dab5b1eab37d2c52b7283df253f7f' into eclair-plus-aosp

* commit 'e3c393d3d14dab5b1eab37d2c52b7283df253f7f':
  Fix issue #2097313: Latin IME crashes first use
2009-09-02 23:19:07 -07:00
Android (Google) Code Review
2dcf5dae98 Merge change 23787 into eclair
* changes:
  Fix issue #2097313: Latin IME crashes first use
2009-09-02 23:11:16 -07:00
Libin Tang
a70b435447 am e2c9187b: Merge change 23782 into eclair
Merge commit 'e2c9187b993a652fa8fdad516461ab66caa96cb4' into eclair-plus-aosp

* commit 'e2c9187b993a652fa8fdad516461ab66caa96cb4':
  Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
2009-09-02 22:47:49 -07:00
Dianne Hackborn
b102996078 am 3bb9c6d1: Merge change 23774 into eclair
Merge commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548' into eclair-plus-aosp

* commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548':
  Fix issue #2097189: can't set custom wallpaper
2009-09-02 22:47:42 -07:00
Dianne Hackborn
98c4e2ecdd am bdd52b26: Fix issue #2097060: Screen all messed up when setup wizard finished
Merge commit 'bdd52b264af8f562dd368d40b66771c88d45127f' into eclair-plus-aosp

* commit 'bdd52b264af8f562dd368d40b66771c88d45127f':
  Fix issue #2097060: Screen all messed up when setup wizard finished
2009-09-02 22:47:36 -07:00
Android (Google) Code Review
310b4c9b56 Merge change 23782 into eclair
* changes:
  Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
2009-09-02 22:29:08 -07:00
Android (Google) Code Review
6832164e6f Merge change 23774 into eclair
* changes:
  Fix issue #2097189: can't set custom wallpaper
2009-09-02 22:20:29 -07:00
Tammo Spalink
d28595039b am fb16e5cc: Merge change 23607 into eclair
Merge commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f' into eclair-plus-aosp

* commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f':
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:30:43 -07:00
Android (Google) Code Review
108662399d Merge change 23607 into eclair
* changes:
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:29:09 -07:00
Scott Main
af6aa36f9a am 8f99b524: am b6b25d63: Merge change 23126 into donut
Merge commit '8f99b52484369a3a9221733c9817f6c09ba1ec85' into eclair-plus-aosp

* commit '8f99b52484369a3a9221733c9817f6c09ba1ec85':
  docs only.
2009-09-02 20:24:09 -07:00
Dmitri Plotnikov
6efadd7d04 am 622da682: Merge change 23765 into eclair
Merge commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5' into eclair-plus-aosp

* commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5':
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
2009-09-02 20:24:04 -07:00
Scott Main
748a073be8 am b6b25d63: Merge change 23126 into donut
Merge commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1' into eclair

* commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1':
  docs only.
2009-09-02 20:21:42 -07:00
Android (Google) Code Review
0b8d09ac02 Merge change 23126 into donut
* changes:
  docs only. add documentation about zipalign and new auto-signing procedures for Ant
2009-09-02 20:19:39 -07:00
Android (Google) Code Review
871837a79f Merge change 23765 into eclair
* changes:
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
2009-09-02 19:35:07 -07:00
Dirk Dougherty
b5ef5d8617 am 5f7cee89: am 2a2058f5: Merge change 23762 into donut
Merge commit '5f7cee89ca6670cefe91192e364037ee6ce39b19' into eclair-plus-aosp

* commit '5f7cee89ca6670cefe91192e364037ee6ce39b19':
  Add updated API diff based on 4.xml.
2009-09-02 19:34:00 -07:00
Dirk Dougherty
69c41b3f14 am 2a2058f5: Merge change 23762 into donut
Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair

* commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5':
  Add updated API diff based on 4.xml.
2009-09-02 19:32:02 -07:00
Android (Google) Code Review
ef8cb0d852 Merge change 23762 into donut
* changes:
  Add updated API diff based on 4.xml.
2009-09-02 19:29:45 -07:00
Dirk Dougherty
8416c92cae am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7' into eclair-plus-aosp

* commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7':
  Add docs for SDK update.
2009-09-02 19:16:26 -07:00
Jason Sams
c0bb9622cc am e00d660a: Merge change 23584 into eclair
Merge commit 'e00d660aba91a7a682f83b2e0216296b0f3cca64' into eclair-plus-aosp

* commit 'e00d660aba91a7a682f83b2e0216296b0f3cca64':
  Simple app to create a gl2 context and dump the strings.
2009-09-02 19:16:20 -07:00
Dirk Dougherty
c7f3cc9c3b am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit 'a6602f1fe4590e48c760f21ce29a92629240c463' into eclair

* commit 'a6602f1fe4590e48c760f21ce29a92629240c463':
  Add docs for SDK update.
2009-09-02 19:14:24 -07:00
Android (Google) Code Review
0774e765a8 Merge change 23584 into eclair
* changes:
  Simple app to create a gl2 context and dump the strings.
2009-09-02 19:13:10 -07:00
Dianne Hackborn
e54700aed4 am 6e478d7a: Merge change 23751 into eclair
Merge commit '6e478d7afb33eff4efe704a16b1a05435b431062' into eclair-plus-aosp

* commit '6e478d7afb33eff4efe704a16b1a05435b431062':
  Fix deadlock in wallpaper.
2009-09-02 18:20:52 -07:00
Android (Google) Code Review
36d5bedd4b Merge change 23751 into eclair
* changes:
  Fix deadlock in wallpaper.
2009-09-02 18:18:59 -07:00
Scott Main
ea6cb5e1d0 am 3e21bf47: am 96b7f921: Merge change 23565 into donut
Merge commit '3e21bf473a89688918f4e59fac4ba2d4539e3775' into eclair-plus-aosp

* commit '3e21bf473a89688918f4e59fac4ba2d4539e3775':
  docs only.
2009-09-02 18:00:28 -07:00
Scott Main
9a0820d571 am 96b7f921: Merge change 23565 into donut
Merge commit '96b7f921a5aea4264af1e0b4970263a3135c04d0' into eclair

* commit '96b7f921a5aea4264af1e0b4970263a3135c04d0':
  docs only.
2009-09-02 17:58:12 -07:00
Dianne Hackborn
bf8c7a1e73 am 78c951b2: Merge change 23704 into eclair
Merge commit '78c951b286ad6fc5300e2d30a624b7e9963202e7' into eclair-plus-aosp

* commit '78c951b286ad6fc5300e2d30a624b7e9963202e7':
  Fiddle system boot ordering.
2009-09-02 17:57:49 -07:00
Android (Google) Code Review
03283d3c02 Merge change 23704 into eclair
* changes:
  Fiddle system boot ordering.
2009-09-02 17:55:35 -07:00
Android (Google) Code Review
c254e26e3d Merge change 23565 into donut
* changes:
  docs only. add new announcement for 1.6 sdk to homepage
2009-09-02 17:55:32 -07:00
Mike Lockwood
217132adbe am 1ff04118: Merge change 23693 into eclair
Merge commit '1ff041180c66ef6f1020cf5314a665d319e9ac86' into eclair-plus-aosp

* commit '1ff041180c66ef6f1020cf5314a665d319e9ac86':
  dumpstate: Add option to output to socket, disable code that switched to nonroot
2009-09-02 17:42:36 -07:00
Christian Sonntag
e9fdb8abe0 am ea6fca82: fix doc
Merge commit 'ea6fca8231c94064917e40dea23be8df50930cf9' into eclair-plus-aosp

* commit 'ea6fca8231c94064917e40dea23be8df50930cf9':
  fix doc
2009-09-02 17:40:51 -07:00
Android (Google) Code Review
ab78a8fe39 Merge change 23693 into eclair
* changes:
  dumpstate: Add option to output to socket, disable code that switched to nonroot
2009-09-02 17:40:20 -07:00
Christian Sonntag
8a35f8eb8f am 75f1d43b: Merge change 23738 into eclair
Merge commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59' into eclair-plus-aosp

* commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59':
  fix doc
2009-09-02 17:27:36 -07:00