2188 Commits

Author SHA1 Message Date
Wink Saville
2900a3fae6 Fix build.
I tried to get these into the merge conflict resolution,
but didn't succeed.

Change-Id: Id474415869182da438c09f7a75ee54c098fbc81e
2012-08-13 16:50:30 -07:00
Wink Saville
c1e68d133c Merge commit 'e0df2c4f' into fix-merge-conflict
* commit 'e0df2c4f':
  Telephony: Signal Strength cleanup & LTE support

Change-Id: I655fcc0cf430820a50a8751ac132c73f7d8e0c6f
2012-08-13 15:53:19 -07:00
Wink Saville
e0df2c4f5d am eca64977: Merge "Telephony: Signal Strength cleanup & LTE support"
* commit 'eca64977041c5df0c987bdae56006ebbe86de677':
  Telephony: Signal Strength cleanup & LTE support
2012-08-13 12:00:30 -07:00
Wink Saville
eca6497704 Merge "Telephony: Signal Strength cleanup & LTE support" 2012-08-13 11:25:49 -07:00
Uma Maheswari Ramalingam
a44b137648 Telephony: Signal Strength cleanup & LTE support
Make signal strength parsing common for all modes

Add Support to calculate LTE
level for UI signal bar display

Update the lowest of Evdo/ CDMA dbm value
in phone status instead of using only CDMA dbm

Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
2012-08-10 15:44:31 -07:00
Wink Saville
f08755705f am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"
* commit 'eb2257ccc94679404cf22d876f0a98109a5dc25d':
  Telephony: Dynamically instantiate IccCard
2012-08-08 17:44:24 -07:00
Wink Saville
eb2257ccc9 am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"
* commit '6f2361e7a97329feba7ac19b1a2635e315f73021':
  Telephony: Dynamically instantiate IccCard
2012-08-08 17:09:26 -07:00
Alex Yakavenka
a6ce25cbbb Telephony: Dynamically instantiate IccCard
Add required constant for Dct

Change-Id: I61cafee25cb40fe7de606a78566f93dfee523c73
2012-08-08 10:30:11 -07:00
Wink Saville
fe33a09a3f am 8f82961f: am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
* commit '8f82961f5ace376cb2f888f8d4e53fe8a49f7315':
  Telephony: Move AdnRecord.aidl into opt/telephony
2012-08-04 08:12:52 -07:00
Wink Saville
8f82961f5a am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
* commit '98853623bcb27155e9b030301a0cb2a987cfc612':
  Telephony: Move AdnRecord.aidl into opt/telephony
2012-08-04 08:07:54 -07:00
Alex Yakavenka
7b3b02cb53 Telephony: Move AdnRecord.aidl into opt/telephony
Change-Id: Ib22f3e777f1cd39fb6da5b907bcec57c2c66ce3a
2012-08-03 16:47:51 -07:00
Wink Saville
9742553603 Merge "Unhide the new location API's" into jb-mr1-dev 2012-08-01 16:43:36 -07:00
Robert Greenwalt
432139b5c3 Reduce log spam.
Turn off DBG in SignalStrength.java

Change-Id: Ida1bded2551272956115aef5f3eda0f2a8cf3aed
2012-07-27 15:44:16 -07:00
Wink Saville
3caf66d2ea Unhide the new location API's
Change-Id: I41cc89998b8bd1e6686ea30475ab8905a133e312
2012-07-26 11:48:12 -07:00
Jake Hamby
6f65b6ee71 am 0c8a7768: am 893d93d2: Implement CMAS service category program results.
* commit '0c8a7768e04513f5175add42c7be6240a703ff73':
  Implement CMAS service category program results.
2012-07-25 23:05:36 -07:00
Wink Saville
b208a24cf5 Revise and update CellInfo API's
Change-Id: I25a46076a244f50edb9da65816b3717e00820b34
2012-07-25 14:08:09 -07:00
Jake Hamby
893d93d207 Implement CMAS service category program results.
Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).

Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
2012-07-25 14:01:52 -07:00
Naveen Kalla
93cb0dd3b2 Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony
This test was missed out while migrating telephony to frameworks/opt.

Change-Id: I75d5bfef81352ebb916b3a4b3e482550478b797b
2012-07-18 14:51:11 -07:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-17 12:23: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
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