Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,876 Commits 3 Branches 0 Tags
71c55e51142e51fafb5865b1e297e56a464cb3ca
Commit Graph

7876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Libin Tang
71c55e5114 am 13cb90a7: am e2c9187b: Merge change 23782 into eclair 
Merge commit '13cb90a745a91ae5be76420bb7374b44a9b2317e'

* commit '13cb90a745a91ae5be76420bb7374b44a9b2317e':
  Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
 2009-09-03 09:51:32 -07:00
Dianne Hackborn
d196294f76 am 83c36fcb: am 3bb9c6d1: Merge change 23774 into eclair 
Merge commit '83c36fcbd4fac92540e207cab94b0295f5de5dbe'

* commit '83c36fcbd4fac92540e207cab94b0295f5de5dbe':
  Fix issue #2097189: can't set custom wallpaper
 2009-09-03 09:51:26 -07:00
Dianne Hackborn
47c12a45bc am 03050e8c: am bdd52b26: Fix issue #2097060: Screen all messed up when setup wizard finished 
Merge commit '03050e8cd2e895156ac4f94116582df2bb6e7f8f'

* commit '03050e8cd2e895156ac4f94116582df2bb6e7f8f':
  Fix issue #2097060: Screen all messed up when setup wizard finished
 2009-09-03 09:51:19 -07:00
Tammo Spalink
4e253d63fe am 8521dca6: am fb16e5cc: Merge change 23607 into eclair 
Merge commit '8521dca69bb33a7f45c8233305618e540543b00d'

* commit '8521dca69bb33a7f45c8233305618e540543b00d':
  Reject (NAK) CDMA SMS with unknown teleservice ids.
 2009-09-03 09:50:45 -07:00
Scott Main
88ffe75acd resolved conflicts for merge of 438fdfe8 to master 2009-09-03 09:41:39 -07:00
Libin Tang
13cb90a745 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
83c36fcbd4 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
03050e8cd2 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
e2c9187b99 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
3bb9c6d1f5 Merge change 23774 into eclair 
* changes:
  Fix issue #2097189: can't set custom wallpaper
 2009-09-02 22:20:29 -07:00
Dianne Hackborn
bdd52b264a Fix issue #2097060: Screen all messed up when setup wizard finished 
The new code to rebuild the window list was missing some app tokens.
Also there were a few other smaller bugs floating around.

Change-Id: I7734917af0b76ee4aa304e6a5321401d87640f89
 2009-09-02 21:54:18 -07:00
Dianne Hackborn
5e802fbb89 Fix issue #2097189: can't set custom wallpaper 
My deadlock fix was only half done.

Change-Id: If9f286030894a60cd71851fb784bb61045f08185
 2009-09-02 21:53:30 -07:00
Libin Tang
aace799b9c Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown. 
The change fixes the issue that dialing *86 during the call, the dialing voicemail
screen is not shown, instead it shows feature code screen.

For CDMA, when flash is sent to the network, there is no response from the
network to indicate if the feature code is completed or not. This is different
from MMI code in GSM network. So it's confusing to show any UI to indicate MMI
(feature code) for CDMA.

The change is to remove the feature code handling in CDMAPone, and handle the
feature code dialing the same way as the 3 way call dialing. Basically, when
feature code is dialed, the dialing screen will be shown.
 2009-09-02 20:48:02 -07:00
Tammo Spalink
8521dca69b 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
fb16e5ccdb Merge change 23607 into eclair 
* changes:
  Reject (NAK) CDMA SMS with unknown teleservice ids.
 2009-09-02 20:29:09 -07:00
Dmitri Plotnikov
22808e7bcc am 9d6783e7: am 622da682: Merge change 23765 into eclair 
Merge commit '9d6783e774c5ade517dbba7c28cf3a16fdb4e635'

* commit '9d6783e774c5ade517dbba7c28cf3a16fdb4e635':
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
 2009-09-02 20:25:45 -07:00
Scott Main
438fdfe833 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
9d6783e774 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
8f99b52484 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
b6b25d63df 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
Scott Main
23110e49b3 docs only. 
add documentation about zipalign and new auto-signing
procedures for Ant

Change-Id: Ia66f5a7af58f77e52b3a5c26cb9972d317c2c42c
 2009-09-02 20:17:16 -07:00
Dirk Dougherty
3c39c12fe5 am f2b3fcf5: am 5f7cee89: am 2a2058f5: Merge change 23762 into donut 
Merge commit 'f2b3fcf5a7e7fb69edc68ef3203a3f169278025c'

* commit 'f2b3fcf5a7e7fb69edc68ef3203a3f169278025c':
  Add updated API diff based on 4.xml.
 2009-09-02 19:36:33 -07:00
Android (Google) Code Review
622da6829f 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
f2b3fcf5a7 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
5f7cee89ca 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
2a2058f5a3 Merge change 23762 into donut 
* changes:
  Add updated API diff based on 4.xml.
 2009-09-02 19:29:45 -07:00
Dirk Dougherty
098b19112e am 2fcba612: am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake. 
Merge commit '2fcba6125ff9f3b8d8d555e20775f4bed0462029'

* commit '2fcba6125ff9f3b8d8d555e20775f4bed0462029':
  Add docs for SDK update.
 2009-09-02 19:18:57 -07:00
Jason Sams
8f4a01b6ce am 8fb91366: am e00d660a: Merge change 23584 into eclair 
Merge commit '8fb913661cb8088b3b4797374a9a912c41af276a'

* commit '8fb913661cb8088b3b4797374a9a912c41af276a':
  Simple app to create a gl2 context and dump the strings.
 2009-09-02 19:18:50 -07:00
Dirk Dougherty
2fcba6125f 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
8fb913661c 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
618ded26c6 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
Dmitri Plotnikov
ceb7979636 [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI 2009-09-02 19:13:58 -07:00
Android (Google) Code Review
e00d660aba 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
Dirk Dougherty
a6602f1fe4 Add docs for SDK update. 
Add redirects for preview files.
Manually integrate a few doc changes from cupcake.

Change-Id:I524d7dbf929371ee501599229894640660f352ce
 2009-09-02 19:08:28 -07:00
Dirk Dougherty
1f58a351d9 Add updated API diff based on 4.xml. 
Change-Id: Ic34f796c8308e2111e2a3dfaad5e27da2ca8b001
 2009-09-02 18:28:55 -07:00
Dianne Hackborn
e4f7eb49eb am 401ab105: am 6e478d7a: Merge change 23751 into eclair 
Merge commit '401ab1058ab11da429616cd7f3ec951f8bf4db30'

* commit '401ab1058ab11da429616cd7f3ec951f8bf4db30':
  Fix deadlock in wallpaper.
 2009-09-02 18:22:18 -07:00
Scott Main
8f3b65debf am fc82f6b5: am 3e21bf47: am 96b7f921: Merge change 23565 into donut 
Merge commit 'fc82f6b562c0643fcda6b8947fbf45c48efa3165'

* commit 'fc82f6b562c0643fcda6b8947fbf45c48efa3165':
  docs only.
 2009-09-02 18:22:12 -07:00
Dianne Hackborn
401ab1058a 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
6e478d7afb Merge change 23751 into eclair 
* changes:
  Fix deadlock in wallpaper.
 2009-09-02 18:18:59 -07:00
Scott Main
fc82f6b562 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
Dianne Hackborn
cdc0341af8 am 0250416a: am 78c951b2: Merge change 23704 into eclair 
Merge commit '0250416a8fc49693772205eaf521ece544b29757'

* commit '0250416a8fc49693772205eaf521ece544b29757':
  Fiddle system boot ordering.
 2009-09-02 18:00:00 -07:00
Scott Main
3e21bf473a 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
0250416a8f 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
Dianne Hackborn
840c3a2b7e Fix deadlock in wallpaper. 
Change-Id: I9ab5681ebf325a9e33ca4b59a8581e535e4dde54
 2009-09-02 17:56:50 -07:00
Android (Google) Code Review
78c951b286 Merge change 23704 into eclair 
* changes:
  Fiddle system boot ordering.
 2009-09-02 17:55:35 -07:00
Android (Google) Code Review
96b7f921a5 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
Scott Main
c9c00021de docs only. 
add new announcement for 1.6 sdk to homepage

Change-Id: I54c743a8d440de8003b9d08599d94fb2cbd34e39
 2009-09-02 17:45:34 -07:00
Mike Lockwood
6128a6a925 am 65ce3270: am 1ff04118: Merge change 23693 into eclair 
Merge commit '65ce32702d50f10dda6c50966a64b79985f8e7fd'

* commit '65ce32702d50f10dda6c50966a64b79985f8e7fd':
  dumpstate: Add option to output to socket, disable code that switched to nonroot
 2009-09-02 17:44:49 -07:00
Christian Sonntag
a299dde771 am a9ef0e88: am ea6fca82: fix doc 
Merge commit 'a9ef0e8891cea85b049e07bea56e05835bff1aef'

* commit 'a9ef0e8891cea85b049e07bea56e05835bff1aef':
  fix doc
 2009-09-02 17:44:43 -07:00
Mike Lockwood
65ce32702d 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