2172 Commits

Author SHA1 Message Date
Wink Saville
8461680fab am e87c71f8: Merge "When reconnecting disassociate dc and apnContext." into jb-dev
* commit 'e87c71f8c1db547831e8f91be765a6eecee27342':
  When reconnecting disassociate dc and apnContext.
2012-07-10 16:40:01 -07:00
Wink Saville
e87c71f8c1 Merge "When reconnecting disassociate dc and apnContext." into jb-dev 2012-07-10 16:38:09 -07:00
Jean-Baptiste Queru
e39d42db00 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:48 -07:00
Jean-Baptiste Queru
5709f43dd8 Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-dev-plus-aosp 2012-07-02 14:48:44 -07:00
Jean-Baptiste Queru
3cd92d8faa Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:38 -07:00
Jean-Baptiste Queru
df0dded1e7 Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:33 -07:00
Jean-Baptiste Queru
2a2d5e0b31 Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:28 -07:00
Jean-Baptiste Queru
1fe7a81383 Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into jb-dev-plus-aosp 2012-07-02 14:48:19 -07:00
John Huang
5045dd6029 am 46c923af: Merge "Fix country code for Netherlands Antilles." into jb-dev
* commit '46c923afd50741c8d185a6d0c7666a86c9dfe712':
  Fix country code for Netherlands Antilles.
2012-07-02 12:55:01 -07:00
Jean-Baptiste Queru
7ebd4bae74 Revert "DO NOT MERGE: Remove SMS shortcode warning feature."
This reverts commit 004ff5ad2aa02daff607bcf1712f3efbb84c58ca.
2012-07-02 12:36:47 -07:00
Jean-Baptiste Queru
a02bce1d5b Revert "DO NOT MERGE: Remove SMS shortcode warning feature."
This reverts commit b1fc08ca082db8ecad54c792485ff7915e3513ce.
2012-07-02 12:30:32 -07:00
Wink Saville
829edb8a53 Fix country code for Netherlands Antilles.
Change the cc to "ai" from "nl" otherwise the timezone is
set to Netherlands which is +1 rather than the Caribbean
which is -4.

Bug: 6765706
Change-Id: Ie399efe95ce93b73eb4e60cfc47e621cce85e6e5
2012-07-02 12:26:21 -07:00
Santos Cordon
53149fd1eb Fix a bad comment. - DO NOT MERGE
Change-Id: I923fb003cc37f562ff6cc5a4cdcc8dd4ea227dc0
2012-07-02 10:57:31 -07:00
Santos Cordon
992a57bf39 Telephony Capability-Distinguish dialing & connect - DO NOT MERGE
New capability returns true if the device can distinguish between
dialing/active and connected reliably. Currently returns true only for
GSM phones.

Change-Id: I50751abaf74b31fdc747f4d04ca9a2ac4d73a1ff
2012-07-02 10:57:25 -07:00
Wink Saville
2686b058cd When we disconnect shutdown the StateMachine. DO NOT MERGE
Need to stop the StateMachine threads and release
all resources when we disconnect.

bug: 6342470
Change-Id: Ibf7a2ebf4f7ecd667c5d95579e66ecd5086103ea
2012-07-02 10:57:16 -07:00
Wink Saville
095c58b73a Enhance StateMachine Quitting and logging support. DO NOT MERGE
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

	services/java/com/android/server/NsdService.java
2012-07-02 10:57:11 -07:00
Wink Saville
1157e1a8d4 When reconnecting disassociate dc and apnContext.
This is done in onActionIntentReconnectAlarm, which is called when
retrying after an error, by setting the ApnContext.DataConnection &
DataConnctionAc to null which intern clears the DataConnection.mApnList.

With the mApnList cleared DataConnection.mRefCount will not be incremented
because the DC will not be found by findReadyDataConnection. Thus fixing
at least one cause of 6529189.

Bug: 6529189
Change-Id: I40ff1966f6fbd2f69e97d77b9db7122e4c5b992f
2012-06-27 16:23:33 -07:00
Jake Hamby
4a02a5ccfc am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev
* commit 'ca2c7b7d96625cf515af88ad30062405b38cb094':
  Fix detection of CDMA CMAS cell broadcasts.
2012-06-27 15:30:17 -07:00
Jake Hamby
0f40a51b20 Fix detection of CDMA CMAS cell broadcasts.
CMAS cell broadcasts do not necessarily set the message
priority indicator subparameter. Interpret the user data as a
CMAS message if the service category is in the CMAS range.

Includes a new test case in CdmaSmsCbTest to verify correct
decoding of an actual CMAS monthly test message.

Bug: 6506785
Change-Id: I2a26a5194a1a02e34c1ef862ff348e1571df51c4
2012-06-25 16:30:06 -07:00
Jean-Baptiste Queru
a310500f6c am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly."
* commit '2dd63ccdb0e4109d03c51a002ff785c9d8a8ccb9':
  Parcel compRequired flag correctly.
2012-06-15 10:13:31 -07:00
Jean-Baptiste Queru
d8ccd712da Merge "Parcel compRequired flag correctly." 2012-06-15 10:02:58 -07:00
Robert Greenwalt
8cdfd60d27 am 15319ded: am 460abe97: Merge "Add support for Caller Name Display"
* commit '15319ded1545dbb266273439063caf6ca23629f5':
  Add support for Caller Name Display
2012-06-12 15:58:10 -07:00
Robert Greenwalt
460abe97b0 Merge "Add support for Caller Name Display" 2012-06-12 15:17:39 -07:00
Wink Saville
e0f8b91e04 am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
* commit '4853f944ac4befba42219f6db8ed02b44a3e0d2b':
  Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:36:46 -07:00
Wink Saville
f75e3e01f6 am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"
* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
  Adds documentation to CdmaCellLocation get lat/long methods
2012-06-11 16:36:39 -07:00
Wink Saville
3fe79dfdf4 Merge "Adds utility method to convert 0.25 secs to decimal degrees" 2012-06-11 15:58:26 -07:00
Wink Saville
bc69f97c66 Merge "Adds documentation to CdmaCellLocation get lat/long methods" 2012-06-11 15:57:03 -07:00
Jean-Baptiste Queru
7372505e2f am 6c50da75: am 7d77977f: Merge "Fix Force Close when enable airplane mode"
* commit '6c50da75f696c184590c6e27d25755ee428f2afc':
  Fix Force Close when enable airplane mode
2012-06-11 11:22:15 -07:00
Jake Hamby
004ff5ad2a DO NOT MERGE: Remove SMS shortcode warning feature.
Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.

Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
2012-06-06 13:56:50 -07:00
Jake Hamby
b1fc08ca08 DO NOT MERGE: Remove SMS shortcode warning feature.
The SMS shortcode warning feature has some usability limitations which need
to be resolved before shipping. Remove the code for JellyBean. It will be
added back to a future release when the feature is complete.

Bug: 6605549
Change-Id: Ifb23d20f30199f242abb8bf7db015232a085c8e3
2012-06-05 12:21:02 -07:00
kenshin
131ecf2b41 Add support for Caller Name Display
Copied relevant parts from CdmaConnection.java to get the information
as/if presented by network operator (Fido/Rogers in canada provide that
information, and it get displayed if there's no match in phonebook).
Although it works (the nale is displayed when the call is received),
the information is not stored (not kept in the log).

* Patch Set 2 : correct coding style
* Patch Set 3 : promote [get]cnapName, [get]cnapNapePresentation to parent
                class (Connection)
* Patch Set 4 : -remove ref to CDMA in get[CnapName|CnapNamePresentation] headers
                -remove unnecessary self ref-reference
* Patch Set 5 : -add forgoten "protected" modifier to newly promoted class memebers

Change-Id: I2279f75d679d5afa716d9904fc3b3e33c77948c6
2012-06-04 13:36:18 -04:00
Danny Baumann
73f5618ab4 Parcel compRequired flag correctly.
This should fix a couple of cases (e.g. SET_UP_MENU responses for Dual
SIM adapters) whether a command response would be rejected due to a
compRequired flag mismatch between the command sent to the Stk app and
the response received from it.

The problem was:
- STK service received command without compRequired flag set
- it passes it to the STK app, which sees compRequired set
- STK app passes back the response with the user selection
- STK service gets the response, which has compRequired set
- it discards the response, as the command details don't match
  (CatService.java:646)
2012-06-01 10:24:51 +02:00
Jake Hamby
8367627f3a Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check.
Change SMSDispatcher to bypass SMS premium short code confirmation
dialog when caller has "android.permission.SEND_SMS_NO_CONFIRMATION"
permission (instead of checking package name against hardcoded list).

This permission is only available to system apps or those signed with
the same certificates as those in the system image.

Bug: 6502817
Change-Id: I6098d448892cc5e842ba6dc10cf494295e7226af
2012-05-25 15:16:33 -07:00
Wink Saville
f19540a2d7 Add debug for tracking down connectivity issues.
bug: 6529189
Change-Id: I5dc4316ceacf48625f0839e0200b77a1e0984465
2012-05-24 15:44:01 -07:00
Kazuhiro Ondo
8f669f49fa Improve sim ready event handling for CdmaLte.
bug: 6463933
Change-Id: I751f760badb87c1fe4b78fd68921257cec4a4b9d
2012-05-21 14:09:17 -07:00
John Wang
45131d0c3b Merge "Only reset time from NITZ in zone fix." into jb-dev 2012-05-21 10:33:08 -07:00
John Wang
df7bbfd7c2 Only reset time from NITZ in zone fix.
When timezone property gets reset by mcc change, SST only adjusts time to
reflect new timezone settings if there is NITZ string w/o timezone.

bug:6465783
Change-Id: I1a27b3f371f79aa532de1c94ec5cb12285bdfdb4
2012-05-18 17:36:31 -07:00
John Wang
8834538a4e Change "uk" to "gb" in COUNTRY_CODES.
Since MccTable uses "gb" instead of "uk" for United Kingdom.

bug:6465783
Change-Id: Ifc2e2e7e72bd8405c698474d2ab9d01cb4ca006b
2012-05-18 17:16:12 -07:00
Jake Hamby
172d97edcd Enable SMS short code patterns to be updated from secure settings.
The premium SMS short code detector loads patterns from an XML resource
by default (frameworks/base/core/res/res/xml/sms_short_codes.xml).
Add support for updated patterns to be loaded on a per-country basis
from a secure setting named "sms_short_codes_" + the country code.
Updated patterns can be pushed to Google devices via Gservices.

Bug: 5513975
Change-Id: Ibfc0be4f12227ba45c28396ec7cdbc307442af81
2012-05-17 16:29:44 -07:00
Robert Greenwalt
2977286dde Merge "Log more RetryManager information." into jb-dev 2012-05-16 17:25:40 -07:00
John Wang
3a64109db6 Merge "Restore ready apns once voice call ended" into jb-dev 2012-05-16 17:15:51 -07:00
Robert Greenwalt
83daf6c5ae Log more RetryManager information.
6505637 had unexplainable behavior.  Add some logging so we can see
what's going on.

bug:6505637
Change-Id: I43c2ce7f8d12271d988b112f47589d0fba2b6955
2012-05-16 17:15:12 -07:00
yoonsung.nam
32eda207cd Restore ready apns once voice call ended
Currently GsmDCT does not setup default data if secondary APNs are
connected but default is disconnected. Sometimes retry alarm of default
expries during voice call but it's rejected due to voice calling and
eHRPD attached status.

Fix onVocieCallEnded() to restore all ready apns inclduing defautl
regardless of isConnected().

bug:6502005

Change-Id: I25db9be010cb588dfee51bdaf435f24055ecb431
Signed-off-by: yoonsung.nam <yoonsung.nam@samsung.com>
2012-05-16 17:00:23 -07:00
Robert Greenwalt
33961892a9 Don't start data-stall checks if not connected
We did this only if connected in most places, but screen-on/off didn't
care.  On no-radio devices it caused extra timers/wakeups that
didn't help anybody.

bug:6375908
Change-Id: Iba72da323de716acb0e67361b955c7381f18f67d
2012-05-16 15:34:46 -07:00
Jake Hamby
47509c744f Merge "Change SMS security check to enforceCallingPermission()." into jb-dev 2012-05-14 13:12:14 -07:00
Jeff Brown
7304c34382 Move power HAL interactions to PowerManagerService.
This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server.  Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
2012-05-11 18:42:42 -07:00
Wink Saville
e9aa4b27af Merge "Add additional debug for time zone handling." into jb-dev 2012-05-10 23:05:54 -07:00
Wink Saville
26e1a02ba3 Add additional debug for time zone handling.
Change-Id: Ie46bba7e0ef7737a865f7efadbf963c2d14e488f
2012-05-10 16:23:39 -07:00
Robert Greenwalt
26ee989576 Fix some apn settings issues.
Correct some logging that was misleading and be more precise in our
removal of things from the waiting list.

bug:6445253
Change-Id: I97b20b851617149a24303276392de403dbde2a8f
2012-05-09 15:35:06 -07:00
Jake Hamby
6de4da4461 Change SMS security check to enforceCallingPermission().
The permission check for IccSmsInterfaceManager.sendText() was changed from
enforceCallingPermission() to enforceCallingOrSelfPermission() to enable the
Phone app to send SMS's directly for the "reply by SMS" feature. That feature
was implemented in a different way (handled by the MMS app), so the permission
check can be changed back to the original enforceCallingPermission(). Verified
that SMS can still be sent, including "reply by SMS" for an incoming call.

Bug: 4686733
Change-Id: If844a0c485de0a87857d8f82a3452e776005153e
2012-05-09 15:17:16 -07:00