drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,589 Commits 1 Branch 0 Tags
Commit Graph

1332 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
917d9ea1eb am 8444023f: Merge from open-source gingerbread 
* commit '8444023f351b22816f6827d3314ff81b3533e3d9':
  Fix the Multi-page SMS sending error to several receipents
 2011-02-03 14:09:34 -08:00
Jean-Baptiste Queru
8444023f35 Merge from open-source gingerbread 
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
 2011-02-03 14:05:23 -08:00
Sang-Jun Park
b9ef00ea2f Fix the Multi-page SMS sending error to several receipents 
Change-Id: Iefde94b638413e3c1761f17c3065b20a044e5958
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
 2011-02-03 13:39:31 -08:00
Jean-Baptiste Queru
4b8ad9effd Merge from gingerbread 
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
 2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
5086c45718 am baaaca1c: Merge ee4c17ee from gingerbread 
* commit 'baaaca1c6164eff17488a178859295a1d5be9171':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 13:12:35 -08:00
Jean-Baptiste Queru
baaaca1c61 Merge ee4c17ee from gingerbread 
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
 2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
ee4c17eec3 Merge from open-source gingerbread 
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
 2011-02-03 12:41:51 -08:00
Jean-Baptiste Queru
2703b84caa Merge "Fix delivery report error with PENDING status in SMS" into gingerbread 2011-02-03 12:17:47 -08:00
Robert Greenwalt
5e9bf7a908 Merge "Add new network type for HSPA+." 2011-02-02 16:42:10 -08:00
Irfan Sheriff
2fcaf538ce am aec39e62: Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit 'aec39e625b95088f4020302a0eac1f38da43c765':
  two digit number handling in croatia and serbia
 2011-02-02 16:21:28 -08:00
Wink Saville
9d3fb3717f am 94dbc990: am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb 
* commit '94dbc990b8840d323d358770a1ba02bb4820c681':
  Have SmsMessage use getCurrentPhoneType
 2011-02-02 16:21:08 -08:00
Irfan Sheriff
aec39e625b Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-02-02 16:03:29 -08:00
Irfan Sheriff
d6d2de6b3c resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp 
Change-Id: I34d034115362f0f858fb65710165bd6cad2fdbd5
 2011-02-02 16:02:37 -08:00
Wink Saville
94dbc990b8 am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb 
* commit 'd31fed90f8fdf854cade08af94918066af921d74':
  Have SmsMessage use getCurrentPhoneType
 2011-02-02 15:52:51 -08:00
Robert Greenwalt
9e4ba121dc Add new network type for HSPA+. 
Change-Id: Ia949a02e5cb66bc9f7d4d5e7e771e592231c729b
 2011-02-02 15:41:44 -08:00
Irfan Sheriff
ec348b4953 resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp 
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
 2011-02-02 14:23:10 -08:00
Wink Saville
1938e314e3 Have SmsMessage use getCurrentPhoneType 
Although our first tablet doesn't support SMS messages there are testing
scenarios where they can be used. To preserve proper behavior now that
getPhoneType can return PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I48ef294f563351c66971b4e89e6dcb3326b0ae92
 2011-02-02 14:19:55 -08:00
Irfan Sheriff
0a4b3fd93b two digit number handling in croatia and serbia 
If users dial 92-96, dial them normally and not treat
as USSD

Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
 2011-02-02 14:08:38 -08:00
Robert Greenwalt
adf851755f am 746ef9b8: am 2c507b92: Merge "Use a cached context when possible." into honeycomb 
* commit '746ef9b8f0c080e247c6726b294fa2ab5cf53dac':
  Use a cached context when possible.
 2011-02-02 13:22:33 -08:00
Robert Greenwalt
746ef9b8f0 am 2c507b92: Merge "Use a cached context when possible." into honeycomb 
* commit '2c507b92c242951e4fb2e807431c10d73e4bf778':
  Use a cached context when possible.
 2011-02-02 13:19:15 -08:00
Wink Saville
837491cacb Merge "Provide default value for operator numeric for CDMA." 2011-02-02 12:16:48 -08:00
Robert Greenwalt
6e2884817d Use a cached context when possible. 
It's always possible after services have been registered, so it's just early
in the process that's a problem.  Lie correctly in those early cases and fix this
in MR1.

bug:3415254
Change-Id: I95811d1efd676fde01f66b742393d3aa4623482f
 2011-02-02 10:57:35 -08:00
Jean-Baptiste Queru
b65060282d am e7c6eea7: am 61b06be2: am 155b0ee0: Merge from open-source gingerbread 
* commit 'e7c6eea7b42c233fe4de61b72e4f72e7614909e1':
  fix for supporting 3 digits MNC code
 2011-02-02 09:55:06 -08:00
Jean-Baptiste Queru
e7c6eea7b4 am 61b06be2: am 155b0ee0: Merge from open-source gingerbread 
* commit '61b06be285ef03381b1d788996650863a1606b36':
  fix for supporting 3 digits MNC code
 2011-02-02 09:51:38 -08:00
Jean-Baptiste Queru
61b06be285 am 155b0ee0: Merge from open-source gingerbread 
* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
  fix for supporting 3 digits MNC code
 2011-02-02 09:48:52 -08:00
Jean-Baptiste Queru
8226140cca Merge from gingerbread 
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
 2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
155b0ee049 Merge from open-source gingerbread 
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
 2011-02-02 09:45:32 -08:00
Eric Laurent
7c38e05914 am 6f2c1c92: am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones 
* commit '6f2c1c92681d8e3664accae2a03058e38ea411f6':
  Allow TTY mode for GSM Phones
 2011-02-02 08:34:57 -08:00
Eric Laurent
6f2c1c9268 am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones 
* commit '0990484c3ef96c6f0553374675b76fed54b5b164':
  Allow TTY mode for GSM Phones
 2011-02-02 08:30:57 -08:00
Eric Laurent
0990484c3e am 3d4069a2: Allow TTY mode for GSM Phones 
* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
  Allow TTY mode for GSM Phones
 2011-02-02 08:28:25 -08:00
Sang-Jun Park
ba34751426 fix for supporting 3 digits MNC code 
Default Android MNC value has a 2 digit but it should be supported a 3 digit
MNC in India. (should be supported both 2 and 3 digits MNC)

Change-Id: I69373d196b29bccd06653841f24cbfe3886834fb
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
 2011-02-02 19:12:31 +09:00
Wink Saville
12bf1133bd am ff34565f: am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb 
* commit 'ff34565fcb366d4bd0066bd7fe6f588e42a9a9cc':
  Add TelephonyManager.getCurrentPhoneType
 2011-02-01 21:06:38 -08:00
Wink Saville
9d72be3318 Add TelephonyManager.getCurrentPhoneType 
The new method getCurrentPhoneType has the old behavior of getPhoneType
and does not check for voice capable. This allows code to assume
the old behavior.

bug: 3198435
Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
 2011-02-01 19:22:15 -08:00
Wink Saville
1a24a9c1d4 am 566cd74f: am 4b77bbd2: Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb 
* commit '566cd74f5686b480d2e3d49c4505c45df7712587':
  Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
 2011-02-01 15:30:29 -08:00
Eric Laurent
3d4069a2e0 Allow TTY mode for GSM Phones 
TTY mode should not be restricted to CDMA phones as some GSM carriers
support it.
TTY support is enabled by overlaying the tty_enabled boolean property
in packages/apps/Phones/res/values/config.xml

Also corrected wrong comments on TTY methods.

Change-Id: I48dbc2be51c3dcdaedc1838b85134edc7012be3c
 2011-02-01 15:25:41 -08:00
Sang-Jun Park
c5996b9969 Fix delivery report error with PENDING status in SMS 
1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.

Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
 2011-02-01 10:05:28 -08:00
Wink Saville
fe629782f3 Provide default value for operator numeric for CDMA. 
If the RIL_REQUEST_OPERATOR response[2], the numeric for the operator,
is bad use the system property ro.cdma.home.operator.numeric.

bug: 3383515
Change-Id: I9abddc477d57c350a4c9a445242eaa7627cd5f69
 2011-01-31 18:11:31 -08:00
Wink Saville
9b9e6778dd Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices. 
bug: 3198435
Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
 2011-01-31 17:33:05 -08:00
Wink Saville
9fbf9c2ddb am bac75416: am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb 
* commit 'bac75416d1cead62ca54e6e78206da64507146ba':
  Add debug for tracking bug 3404006.
 2011-01-30 23:17:35 -08:00
Wink Saville
cde85d5738 Merge "Add debug for tracking bug 3404006." into honeycomb 2011-01-30 23:12:35 -08:00
Wink Saville
ea9af9e97b Add debug for tracking bug 3404006. 
We need some additional debugging to help diagnose the cause
of this bug. There is no logic changes just additional debugging.

Change-Id: Ifc5d1c82904042fa87fd3b5b1066f58b62e7359c
 2011-01-30 16:16:20 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge 
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
 2011-01-30 12:40:38 -08:00
Jean-Baptiste Queru
7ea919c44b Merge 6b739dc7 from gingerbread 
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
 2011-01-29 12:59:20 -08:00
Robert Greenwalt
b46062bc08 am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
  Add some network types that OEM's are asking for.
 2011-01-29 09:35:28 -08:00
Robert Greenwalt
f8fdec50c7 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp 
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
 2011-01-29 09:32:04 -08:00
Hung-ying Tyan
dd75788eda am cc019c0c: Merge "Get mute state from active call." into gingerbread 
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
 2011-01-29 09:31:40 -08:00
John Wang
6630698e24 am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread 
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
 2011-01-29 07:29:42 -08:00
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread 
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
 2011-01-29 06:55:38 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for. 
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
 2011-01-28 14:48:37 -08:00
Robert Greenwalt
473df1cd24 am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb 
* commit 'f7784876ed2d731fae9ab8a10119f558a9adf8d7':
  Fix data network type notifications.
 2011-01-28 09:54:04 -08:00