1167 Commits

Author SHA1 Message Date
Android (Google) Code Review
5b93050d48 am f6c96839: Merge change 6850 into donut
Merge commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0'

* commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0':
  Extra parameters for sendBurstDtmf.
2009-07-12 21:55:54 -07:00
Mike Lockwood
a4d2fb5ef6 CDMA: Add Network ID and System ID to CdmaCellLocation.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-12 14:33:07 -04:00
Dianne Hackborn
54a26bc85f resolved conflicts for merge of 889c2d37 to master 2009-07-10 16:05:59 -07:00
jsh
dafa22a3ef Extra parameters for sendBurstDtmf.
ON length and OFF length.
Also, define PROFILEs for use with SETUP_DATA_CALL.
2009-07-10 15:52:28 -07:00
Android (Google) Code Review
7882e20d59 Merge change 6814
* changes:
  Change 107 and 146 from partner repo.
2009-07-10 14:19:58 -07:00
Wink Saville
daccacb865 Change 107 and 146 from partner repo.
These were combined to save testing time.

cpr107:
    Enhance the MDN change during OTA

      1. Remove the OTA MDN change code in RuimRecords.java and move
         to CdmaServiceStateTracker.java
      2. Reduce the frequent function GET-CDMASubscription. Move the
         Get_CDMASubscription from pollstate() to EVENT_NV_READY handler.
         The CDMA Subscriber MDN/MIN is only changed by OTA programming.
         Only need fecth the subscriber information when power on and OTA
         completed.
      3. Add new variable for PRL version in cdma subscription

cpr146:
    SMS-to-Email fix for extracting e-mail address
2009-07-10 14:16:17 -07:00
Wink Saville
05b301b9df Changes 203 and 225 from partner repo.
These are combined to save testing time.


Change 225:
    make NV_READY return State.READY.

Change 203:

    CDMA SMS decoding support for Latin and fix for WAP concatenation

    1.  Enabled support for 8bit Latin decoding.
    2.  Change octet decoding to remove an extra pad byte from the payload.
        This caused problems with the concatenation of WAP PUSH messages.
    3.  Decode octet encoded data as if it was Latin. There are devices out
        there that will use 0 instead of 8.
2009-07-10 11:34:33 -07:00
Dianne Hackborn
854060af30 Fix bug #1873249i: Apps can DoS/brick device
This is the problem where various things are listening for broadcasts
(such as battery status, PIN/PUK/Network) that an application can send
to cause harm to the system.

Solving this is tricky because many of these broadcasts are sticky,
and I have never figured out how to do permissions with sticky
broadcasts in a sane way.  So instead, I am going to punt on the
general problem and just brute force it:

There is new a way for system components to declare specific
broadcast actions to be protected, which means that only the system
and the phone can send them.  This is good enough for now.  None
of it is exposed in the public API so we can make something a little
less stupid in the future if we ever need to.
2009-07-09 18:14:31 -07:00
Android (Google) Code Review
2291616d84 Merge change 6092
* changes:
  Remove duplicate code in Sim/Ruim card, handle IccCardStatus.
2009-07-08 15:22:56 -07:00
Jaikumar Ganesh
cdadaad0e4 Remove duplicate code in Sim/Ruim card, handle IccCardStatus.
a) Push code to IccCard.java base class.
b) Handle IccCardStatus.
c) Add some helper functions for USIM use.
2009-07-08 15:15:47 -07:00
yong liu
2fa57a3fd1 Message address encoding fix
Set DIGIT_MODE_4BIT_DTMF as the default digitMode and
TON_UNKNOWN as the default 'type of network'.
2009-07-07 18:51:29 -07:00
Android (Google) Code Review
bcd18e0151 am 62edc960: Merge change 6383 into donut
Merge commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44'

* commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44':
  Cleanup connection when airplane mode is entered.
2009-07-07 15:38:59 -07:00
Android (Google) Code Review
62edc96022 Merge change 6383 into donut
* changes:
  Cleanup connection when airplane mode is entered.
2009-07-07 15:22:15 -07:00
Android (Google) Code Review
51759015a3 Merge change 6392
* changes:
  Add the condition check of ERI for CDMA roaming.
2009-07-07 14:50:04 -07:00
Jaikumar Ganesh
024af038a7 Cleanup connection when airplane mode is entered.
The message was being sent to the wrong handler.
2009-07-07 12:34:59 -07:00
Yong Zhang
8e80fd4478 Add the condition check of ERI for CDMA roaming.
With this fix, phone will not show that it is roaming
when it is not, and there is no need to enable the
"Data Roaming" in order to get the data to work.
2009-07-07 11:46:56 -07:00
Android (Google) Code Review
6e2863ec16 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
Tammo Spalink
0fd833a50f septet-align UD after any UDH for GSM-7bit coding 2009-07-07 14:17:28 +08:00
Android (Google) Code Review
a95fe061c7 Merge change 6232
* changes:
  frameworks/base: Update mPdu in createFromPdu
2009-07-06 11:22:51 -07:00
Android (Google) Code Review
907a8589ba am 922f1b85: Merge change 6146 into donut
Merge commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1'

* commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1':
  Fixing 1949086 Sholes telephony crash after waking from sleep.
2009-07-06 11:17:56 -07:00
Satish Roddom
5082fd58e3 frameworks/base: Update mPdu in createFromPdu
Inside createFromPdu(), the passed-in parameter 'pdu' is assigned
to msg.mPdu, so that we can call getPdu() to get it back.
2009-07-06 09:36:11 -07:00
Wink Saville
1eee698c3e Fixing 1949086 Sholes telephony crash after waking from sleep. 2009-07-02 20:50:11 -07:00
Android (Google) Code Review
10063c1089 am 392282f1: Merge change 5962 into donut
Merge commit '392282f1e01518491c6536d931500c4bfac7f24f'

* commit '392282f1e01518491c6536d931500c4bfac7f24f':
  SimRecords.getServiceProviderName() always returned null.
2009-07-02 15:24:15 -07:00
Android (Google) Code Review
4a79a017a1 am daa5a215: Merge change 5810 into donut
Merge commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825'

* commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825':
  Fix bug 1930055 of NullPointerException.
2009-07-01 22:44:22 -07:00
Android (Google) Code Review
730babbd5e am 85d650c8: Merge change 5804 into donut
Merge commit '85d650c89998eb108faa2c02dcc32467e23f9555'

* commit '85d650c89998eb108faa2c02dcc32467e23f9555':
  Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that
2009-07-01 22:44:16 -07:00
jsh
8890aaf77c SimRecords.getServiceProviderName() always returned null.
Fixes bug 1955060.  spn was defined in both SimRecords and base class IccRecords.
2009-07-01 12:55:28 -07:00
Android (Google) Code Review
c2b9d63953 am a79ee8e2: Merge change 5792 into donut
Merge commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e'

* commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e':
  Fix typo introduced during variable cleanup.
2009-07-01 11:20:25 -07:00
Tammo Spalink
71b62d29ce am 8561de15: eliminate byte-typed cdma sms fields
Merge commit '8561de157c78e65e49f6989cd2c242c416631df7'

* commit '8561de157c78e65e49f6989cd2c242c416631df7':
  eliminate byte-typed cdma sms fields
2009-07-01 11:19:28 -07:00
Android (Google) Code Review
50f380074a am 0178afe4: Merge change 5485 into donut
Merge commit '0178afe415a598b5b3b4ab5bbeec96a079a124e1'

* commit '0178afe415a598b5b3b4ab5bbeec96a079a124e1':
  cdma sms is91 support
2009-07-01 11:19:24 -07:00
Android (Google) Code Review
4a301cb495 am 8aadf7ae: Merge change 5359 into donut
Merge commit '8aadf7ae278961926de5452a46863503303735cf'

* commit '8aadf7ae278961926de5452a46863503303735cf':
  fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper
2009-07-01 11:19:19 -07:00
Android (Google) Code Review
a01fda5427 am bda04135: Merge change 5669 into donut
Merge commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4'

* commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4':
  Fix setting of the APN type.
2009-07-01 11:18:28 -07:00
Android (Google) Code Review
daa5a21562 Merge change 5810 into donut
* changes:
  Fix bug 1930055 of NullPointerException.
2009-06-30 15:16:38 -07:00
Android (Google) Code Review
85d650c899 Merge change 5804 into donut
* changes:
  Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that the index is always < the array's length. Also ensures that the object's state is consistent. Should resolve a denial-of-service bug when handling malformed WAP pushes.
2009-06-30 15:05:56 -07:00
John Wang
107821369b Fix bug 1930055 of NullPointerException.
The NullPointerException in getCallState is caused by the restarting of phone process. getITelephony() was not ready to be used at that moment.

	modified:   java/android/telephony/TelephonyManager.java
2009-06-30 12:01:35 -07:00
Chris Palmer
3856785225 Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that
the index is always < the array's length. Also ensures that the object's
state is consistent. Should resolve a denial-of-service bug when handling
malformed WAP pushes.
2009-06-30 11:50:50 -07:00
Mike Lockwood
cd15475bc3 Revert "ConnectivityManager: Add support for bringing up the default APN."
This reverts commit a84b6faffbe7ef5981f3202be0f68a8b44d61a76.

I will work on a better mechanism for bringing up the default APN
when Wifi is enabled.
2009-06-30 14:02:27 -04:00
Jaikumar Ganesh
34267f7e17 Fix typo introduced during variable cleanup.
This prevented data connection being established after voice calls on 2G networks.
2009-06-30 10:53:16 -07:00
Android (Google) Code Review
da6edf4d8a am 4cb1276e: Merge change 4956 into donut
Merge commit '4cb1276e143e175590c69ceefa58eb721aa52846'

* commit '4cb1276e143e175590c69ceefa58eb721aa52846':
  Tune the Reconnect back off timer.
2009-06-29 20:20:16 -07:00
Tammo Spalink
8561de157c eliminate byte-typed cdma sms fields 2009-06-30 11:02:46 +08:00
Android (Google) Code Review
0178afe415 Merge change 5485 into donut
* changes:
  cdma sms is91 support
2009-06-29 19:22:11 -07:00
Android (Google) Code Review
8aadf7ae27 Merge change 5359 into donut
* changes:
  fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper
2009-06-29 19:22:05 -07:00
Android (Google) Code Review
1f9508ce4d am ae352273: Merge change 5192 into donut
Merge commit 'ae3522734ef83254626cacee18a9490f6af62415'

* commit 'ae3522734ef83254626cacee18a9490f6af62415':
  make BitwiseInputStream.read return int
2009-06-29 16:37:46 -07:00
Jaikumar Ganesh
c0303921d0 Fix setting of the APN type.
The user is on wifi, then enables SUPL APN. When wifi is switched off,
we try to establish DATA connection on the Default APN. If this fails,
we were not retrying as the mRequestedApnType variable was not being reset.
This was happening because the SUPL APN and the data connection APN
were the same.
2009-06-29 13:33:47 -07:00
Tammo Spalink
3a08cec99e fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper
addresses http://buganizer/issue?id=1489784
2009-06-29 12:51:22 +08:00
Tammo Spalink
8203dc1bc8 cdma sms is91 support 2009-06-28 16:23:53 +08:00
Jaikumar Ganesh
e7e12b44bc Tune the Reconnect back off timer.
Cap the max limit to 30 mins.
Re-register to the network once, when we reach the 30 min max.
2009-06-26 18:43:46 -07:00
Android (Google) Code Review
ae3522734e Merge change 5192 into donut
* changes:
  make BitwiseInputStream.read return int
2009-06-26 14:41:51 -07:00
Mike Lockwood
a84b6faffb ConnectivityManager: Add support for bringing up the default APN.
The default APN can now be requested by calling
ConnectivityManager.startUsingNetworkFeature(Phone.FEATURE_ENABLE_DEFAULT).

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-26 10:26:34 -04:00
David Krause
aec9632db0 am 5c7d9e81: CDMA incoming MMS fixes
Merge commit '5c7d9e8194900a2b1699cd57f95b22ca5f7b9be2'

* commit '5c7d9e8194900a2b1699cd57f95b22ca5f7b9be2':
  CDMA incoming MMS fixes
2009-06-25 22:01:20 -07:00
David Krause
5c7d9e8194 CDMA incoming MMS fixes
Need to correctly interpret WAP Datagram data. Specifically the
source and destination ports are only included in the 1st segment,
not subsequent segments but the original implementation was looking
for the ports for all segments.
2009-06-25 21:56:24 -07:00