summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* Fix permissions check in IccSmsInterfaceManager.sendText()David Brown2011-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In android.internal.telephony.IccSmsInterfaceManager, we currently use enforceCallingPermission() rather than enforceCallingOrSelfPermission() to enforce the SEND_SMS permission. The difference is that enforceCallingPermission() will ALWAYS throw a SecurityException if you're not handling an IPC, i.e. if the request is from the same process as the telephony framework. In other words, the current code prevents the phone app from ever using SmsManager.sendTextMessage() :-( This change fixes IccSmsInterfaceManager.sendText() to use enforceCallingOrSelfPermission(), and I confirmed I can now send SMSes from the phone app. NOTE there are a bunch of other uses of enforceCallingPermission() in the telephony framework (all SMS-related) that we probably want to fix too, although I'm fixing just this one for now since it's blocking a hi-pri phone UI feature. I opened bug 4686733 to cover the rest of the cleanup, though. Bug: 4686733 Change-Id: Iaffcf62c54493fa4961fb20894c974697f26e3a7
* am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." ↵John Wang2011-06-164-7/+69
|\ | | | | | | | | | | | | into honeycomb-LTE * commit '03cbb58e2418dc22ae18a8648404382da4ee46e8': Support SIM permanently disabled state.
| * am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTEJohn Wang2011-06-164-7/+69
| |\ | | | | | | | | | | | | * commit 'ff42c04d15e000f6295e796e154cc60c54aa078b': Support SIM permanently disabled state.
| | * Merge "Support SIM permanently disabled state." into honeycomb-LTEJohn Wang2011-06-164-7/+69
| | |\
| | | * Support SIM permanently disabled state.John Wang2011-06-144-7/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SIM card can get permanently disabled due to too many PUK retries. The PERM_BLOCKED pin state of SIM application represents this state. This change decodes permanent disabled state and broadcasts it via ICC_ABSENT intent with PERM_DISABLED reason. It also update the lockscreen to show the prompt message. bug:4392059 Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
* | | | Don't clean up operator properties in RuimRecords.John Wang2011-06-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't clean up PROPERTY_ICC_OPERATOR_ISO_COUNTRY and PROPERTY_ICC_OPERATOR_NUMERIC here. Since not all CDMA devices have RUIM, these properties should keep the original values, e.g. build time settings, when there is no RUIM but set new values when RUIM is available and loaded. bug:4552029 Change-Id: I37c2cea32b582a00873b7f85b70abe30253e1241
* | | | am ec18268e: am 1146bddf: Merge "Always clear settings when entering ↵Wink Saville2011-06-151-3/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Inactive state." into honeycomb-LTE * commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021': Always clear settings when entering Inactive state.
| * | | am 1146bddf: Merge "Always clear settings when entering Inactive state." ↵Wink Saville2011-06-151-3/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit '1146bddf92fc91dad384bdaea740f9472bebd911': Always clear settings when entering Inactive state.
| | * | Merge "Always clear settings when entering Inactive state." into honeycomb-LTEWink Saville2011-06-151-3/+1
| | |\ \
| | | * | Always clear settings when entering Inactive state.Wink Saville2011-06-151-3/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
* | | | | am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into ↵Wink Saville2011-06-152-6/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a': Clean up some debug statements.
| * | | | am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTEWink Saville2011-06-152-6/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '4d6233b2edd24c83efe10f4403456b8d0c87241a': Clean up some debug statements.
| | * | | Clean up some debug statements.Wink Saville2011-06-152-6/+8
| | |/ / | | | | | | | | | | | | Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
* | | | am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to ↵Marco Nelissen2011-06-153-0/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | gingerbread-plus-aosp * commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6': Ignore duplicate WAP push PDU source/destination port if configured
| * | | am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aospMarco Nelissen2011-06-153-0/+52
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0': Ignore duplicate WAP push PDU source/destination port if configured
| | * \ \ resolved conflicts for merge of d027329c to gingerbread-plus-aospMarco Nelissen2011-06-153-0/+52
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I169c415bf998b9935ab36812511573db05717b91
| | | * | | Ignore duplicate WAP push PDU source/destination port if configuredSoojung Shin2011-06-103-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some carriers duplicate the OMADM wap push PDU source/destination port. e.g. MSGTYPE-TotalSegments-CurrentSegment -SourcePortDestPort-SourcePortDestPort-OMADM PDU So the client has to ignore the duplicate source/destination port. Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4 Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
* | | | | | am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record ↵Wink Saville2011-06-141-4/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only." into honeycomb-LTE * commit '5d47d203fb60f4e7c91d97fa852a23863861b011': Enforce provision check for CSIM record only.
| * | | | | am fbef26eb: Merge "Enforce provision check for CSIM record only." into ↵Wink Saville2011-06-141-4/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc': Enforce provision check for CSIM record only.
| | * | | | Merge "Enforce provision check for CSIM record only." into honeycomb-LTEWink Saville2011-06-141-4/+10
| | |\ \ \ \
| | | * | | | Enforce provision check for CSIM record only.Kazuhiro Ondo2011-06-141-4/+10
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
* | | | | | am aad3c3cb: am c2d17d3b: Merge "Make APN re-connect delay configuable" into ↵Wink Saville2011-06-141-2/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a': Make APN re-connect delay configuable
| * | | | | am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTEWink Saville2011-06-141-2/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14': Make APN re-connect delay configuable
| | * | | | Merge "Make APN re-connect delay configuable" into honeycomb-LTEWink Saville2011-06-141-2/+4
| | |\ \ \ \
| | | * | | | Make APN re-connect delay configuableKazuhiro Ondo2011-06-141-2/+4
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configurability on hard coded timer. Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
* | | | | | am 46cd4a4b: am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based ↵Wink Saville2011-06-142-36/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on SID/NID"" into honeycomb-LTE * commit '46cd4a4bfe432ed6b483c0d6fc1045e387f22710': Revert "CDMALTE: Get roaming status based on SID/NID"
| * | | | | am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" ↵Wink Saville2011-06-142-36/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a': Revert "CDMALTE: Get roaming status based on SID/NID"
| | * | | | Revert "CDMALTE: Get roaming status based on SID/NID"Kazuhiro Ondo2011-06-142-36/+5
| | |/ / / | | | | | | | | | | | | | | | This reverts commit 3fc9055c7f3bc25948f17bc29582abae72fe7de1.
* | | | | Add "geoDescription" to CallerInfoDavid Brown2011-06-133-19/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of change https://android-git.corp.google.com/g/111296 the libphonenumber library now provides an API ("PhoneNumberOfflineGeocoder") to look up a geographical description string for a given number. This change adds a new CallerInfo field called "geoDescription", and uses the PhoneNumberOfflineGeocoder to look it up (if the contact lookup fails) during the CallerInfoAsyncQuery sequence. See https://android-git.corp.google.com/g/114715 for the corresponding change under apps/Phone, to display this string (along with the raw number) in the incoming-call UI. Also some other minor cleanup: - fixed spelling of the "normalizedNumber" field - tiny javadoc and code style cleanup - slight CallManager and CallerInfo debug output cleanup Bug: 4595580 Change-Id: I900d8f48e953d1b24983602cb5467a5c6a6c518a
* | | | | am cc44bea0: am 2addaf97: Merge "Add toString for IccCard Status and App." ↵John Wang2011-06-102-0/+40
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit 'cc44bea0400bc6b6e995d66b705a4db0a77a7dfa': Add toString for IccCard Status and App.
| * | | | am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTEJohn Wang2011-06-102-0/+40
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2addaf97b319e257677ac3e5bbb772ba40cfa78a': Add toString for IccCard Status and App.
| | * | | Merge "Add toString for IccCard Status and App." into honeycomb-LTEJohn Wang2011-06-102-0/+40
| | |\ \ \
| | | * | | Add toString for IccCard Status and App.John Wang2011-06-092-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enhance the debug info for GET_SIM_STATUS. Print out the Card status and App status instead of Object id. It helps to debug PUK lock and other SIM related issues. Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
* | | | | | am 75612e9c: am 1ea549e8: Merge "CDMALTE: Get roaming status based on ↵Robert Greenwalt2011-06-102-5/+36
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SID/NID" into honeycomb-LTE * commit '75612e9c3f92364ba1f0a7fce46f1df11b0a14ca': CDMALTE: Get roaming status based on SID/NID
| * | | | | am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into ↵Robert Greenwalt2011-06-102-5/+36
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e': CDMALTE: Get roaming status based on SID/NID
| | * | | | CDMALTE: Get roaming status based on SID/NIDKazuhiro Ondo2011-06-092-5/+36
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
* | | | | am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred ↵Robert Greenwalt2011-06-104-7/+73
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | language." into honeycomb-LTE * commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8': Set locale based on SIM preferred language.
| * | | | am 75749ab1: Merge "Set locale based on SIM preferred language." into ↵Robert Greenwalt2011-06-094-7/+73
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22': Set locale based on SIM preferred language.
| | * | | Set locale based on SIM preferred language.Kazuhiro Ondo2011-06-094-7/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless user had selected a desired locale, EFli or EFpl will be used to decide the locale to be used. Note this locale setting is not persistent - only valid while SIM card is present. Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
* | | | | am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if ↵Wink Saville2011-06-092-22/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | data is detached" into honeycomb-LTE * commit '2d8500d21a3fe6af36040a5dcd0599e00a242766': Report data status from ApnContext even if data is detached
| * | | | am 799f04c0: Merge "Report data status from ApnContext even if data is ↵Wink Saville2011-06-082-22/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | detached" into honeycomb-LTE * commit '799f04c09cc7284e0660d419bcb24af57b86f08e': Report data status from ApnContext even if data is detached
| | * | | Merge "Report data status from ApnContext even if data is detached" into ↵Wink Saville2011-06-082-22/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | honeycomb-LTE
| | | * | | Report data status from ApnContext even if data is detachedKazuhiro Ondo2011-06-082-22/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While in HO, data connection type may temporary become "unknown". This triggers TelephonyRegistry picks up the wrong data connection state, ending up notifying bogus state to ConnectivityService. The patch is just to pick up the status from ApnContext which should be maintaining the right state. Also cleaned up unnecessary lines which was added earlier phase. Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
* | | | | | am a384ff32: am 33e1424b: Merge "Use CSIM to get provision information" into ↵Wink Saville2011-06-098-47/+306
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'a384ff32827cf6383ead48ec4e0da42365ed3584': Use CSIM to get provision information
| * | | | | am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTEWink Saville2011-06-088-47/+306
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '33e1424b2e924e9b0162aa648137e8254f729161': Use CSIM to get provision information
| | * | | | Use CSIM to get provision informationKazuhiro Ondo2011-06-088-47/+306
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of LTE & CDMA hybrid system, provision information will be read from CSIM records. Also CSIM records can be updated over the air. No data connection attempt should be made until CSIM provisioning is notified via SIM_REFRESH event. Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
* | | | | am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into ↵Wink Saville2011-06-093-21/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '0da86d4fef70f94a02a504f8500df2833719da6b': Fix default preferred network.
| * | | | am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTEWink Saville2011-06-083-21/+19
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'a558fdf156601a477964139fee57da29de7f31b3': Fix default preferred network.
| | * | | Merge "Fix default preferred network." into honeycomb-LTEWink Saville2011-06-083-21/+19
| | |\ \ \
| | | * | | Fix default preferred network.Wink Saville2011-06-083-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp returns OTASP_NOT_NEEDED. Some cleanup. Bug: 4531115 Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a