• Home
  • History
  • Annotate
  • only in /frameworks/base/telephony/java/android/telephony/
History log of /frameworks/base/telephony/java/android/telephony/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1428f43fa742f59835ffabf8abe912e9d8bf8f19 10-Aug-2015 Chris Manton <cmanton@google.com> Save data registration roaming state

Carrier configuration may override the roaming state
but the roaming state may be required for specifying
proper APNs upon data call setup. This change stores
the unmodified roaming state.

bug: 22990977
Change-Id: I5ebe04f60709bc691e9c79be193f1790a7148818
erviceState.java
ad4c63b53d1e2b9b632833fb989a1aa444588de3 04-Aug-2015 Makoto Onuki <omakoto@google.com> READ_SMS allows getLine1Number() [1/3]

Bug 22862050

Change-Id: I45dba41423dd3313984c93a6e674f37410fb3050
elephonyManager.java
a4f2da398837c5eaec5dec13c29e13af3f7185e3 22-Jul-2015 Jack Yu <jackyu@google.com> Allow carriers to force disable ETWS/CMAS test messages.

This feature can be enabled in carrier config XML. When enabled, the user will not see
ETWS/CMAS enable/disable option in emergency broadcast preference menu.

bug: 22396039
Change-Id: I6ad6fa39852d3b13faeef968a1963b3e0a4a6e61
arrierConfigManager.java
ea975b122fee3ac0fe766d2b58bb420b82e5dd95 16-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Add new API for handling DB query per subId." into mnc-dev
dc49309cefed9519611b183ae2c616e6f0110738 14-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Add new API for handling DB query per subId.

+ Add new API for handling DB query and Resources object per subscription.
+ Add constants for column name of DB storing subscription info.
+ Add a common settings file for multi-tab

Bug: 22360525
Change-Id: Icf6d35bdbe31618e2a95df450aee12b99d3aea7a
ubscriptionManager.java
93018a4d983f0c7063fd0b243436364cd191e0a9 13-Jul-2015 Roshan Pius <rpius@google.com> Handle exceptions when accessing Content providers.

BUG: 21638129
Change-Id: I88f7dcf67e395f49136a1f434fbd9c75e15cddad
honeNumberUtils.java
7e9cb0d094043bd8bdb7544c2356abd5479b7aee 09-Jul-2015 Roshan Pius <rpius@google.com> Catch & log security exception in telephonymanager

BUG: 22225068
Change-Id: I9b0053cf1041c81f409ace556b810ef79de88599
elephonyManager.java
9bc8299ca0b2e8396b9f2f027c440cda164ba75e 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Fix permissions.

Legacy API should not need new permissions.
Also found some more hidden/system that should have permissions.

bug:22379438
bug:19257083
Change-Id: I24be0a90dffcffe03d25982a9b02eedcf03fbd59
elephonyManager.java
348988c5704a5a6eb6aec093e295c2d9f00ee33c 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix permissions on TelephonyManager" into mnc-dev
8b0f3873a04103f6886fdc2fb79b9a3963567720 08-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
6e4a98f8707f759fa9f47a458683a3627e42b0b6 07-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Fix permissions on TelephonyManager

bug:19257083
Change-Id: I063d36bbe7ece9d83aac7c490d1b44e55da2c286
elephonyManager.java
278b8f950948435fb08db0a12313e2ea704fa637 01-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Add/Fix Permission check on SubscriptionManager.

Things that are modifing should check the modify permission.

bug: 19259681
Change-Id: I27c7501d6777deec902b9cd47e194eadef391869
ubscriptionManager.java
becddea63e2c4b414e5eac2841d3516c4e89bb24 06-Jul-2015 Casey Ho <caseyho@google.com> Merge "Unhide signal strength constants used by getLevel." into mnc-dev
4b2698ba5ea9bb0f3806abecf65899b166912509 02-Jul-2015 Svet Ganov <svetoslavganov@google.com> Merge "Workaround legacy TelephonyManager.getDefault() with no context" into mnc-dev
4e792cbe7530b78b9f83907b19e45bfefc363423 01-Jul-2015 Svet Ganov <svetoslavganov@google.com> Workaround legacy TelephonyManager.getDefault() with no context

bug:22201450

Change-Id: If591bd90f3e4081c411dfa6415853c110a62a7fb
elephonyManager.java
a10277e3e4c01e08f53b98eac3c98bf94482b106 01-Jul-2015 Makoto Onuki <omakoto@google.com> Merge "Allow default SMS app to get self phone number" into mnc-dev
6ce5d68a58f10a3eb0caa64a1c37b09ba012e6b6 01-Jul-2015 Jay Shrauner <shrauner@google.com> Catch SecurityExceptions

Bug:22208649
Change-Id: I608be28095a2d7ee0e3dd739ed899eaae55e700e
elephonyManager.java
1249bdbe90102172f6e678993516203bb3a493bf 30-Jun-2015 Yorke Lee <yorkelee@google.com> Fix TelecomManager.isVoicemailNumber

Provide an overload of PhoneNumberUtil.isVoiceMailNumber that
takes a context to prevent an NPE.

This does not fix PhoneNumberUtil.isVoicemailNumber(String number),
that will require a follow up CL.

Bug: 22184528
Change-Id: I300b70948e5ff7230989bb887ad17e222c61685d
honeNumberUtils.java
a26a019c6c8d7d39b1d3beefb3f2f55845175ea5 29-Jun-2015 Makoto Onuki <omakoto@google.com> Allow default SMS app to get self phone number

Apps with WRITE_SMS app op can now call TelephonyManager.getLine1Number().
(Note we no longer have the WRITE_SMS permission.)

Bug 22031904

Change-Id: Ic843b6d7674879951a64e3b3a92bca09c3b5c65b
elephonyManager.java
748e9d59792184e6a2122c78d51ab7ea8fa8d559 25-Jun-2015 Nathan Harold <nharold@google.com> Deprecate TelephonyManager.getNeighboringCellInfo()

bug: 22121990
Change-Id: Id8f9d080fdd1e2993b414a5304424238396b6fd4
elephonyManager.java
63f25b6e3f8b3973efeb2151f7dd71c94dc1f461 25-Jun-2015 Chris Manton <cmanton@google.com> Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL

Bug: 20828356

Change-Id: I30a286e7af884a11c51363916dd6a4dc965d399a
arrierConfigManager.java
e5c7ca7d792f0ecb8219c217d756080d1d4c3933 24-Jun-2015 Junda Liu <junda@google.com> Rename and add carrier config keys for volte and ims.

Bug: b/21878236
Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
arrierConfigManager.java
a51765ed6d495dec81009371a7c13e2c9efd5609 23-Jun-2015 Nancy Chen <nancychen@google.com> Add public action to open voicemail settings.

Need public api constant to create an intent to open voicemail settings.
This is used for visual voicemail.

Bug: 21086059
Change-Id: I1a11712ead2941d5322cde6be6c3f41652bc36d8
elephonyManager.java
d314de0aa495e7a5e5d8a8754f2bdb1d09d45a21 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Return reasonable phone type if no sim inserted.

With no sim, there's no subscription, no default phone, etc.
If we're asked for phone type for an invalid sub, just use the
first phone.

bug: 20760370
Change-Id: Ide7b0679e7253e1f1ce563a68fbbec1ff8c24daf
elephonyManager.java
8e27050f0ebb27b920dfc918635130865dba0eac 21-Apr-2015 Casey Ho <caseyho@google.com> Unhide signal strength constants used by getLevel.

Bug: 22008966
Change-Id: I0c1dc993cbf33a7109d8a4e329b05a897df6ea1b
ellSignalStrength.java
c242d9d2aeececeda4c980dfa119b3414d818424 22-Jun-2015 Shishir Agrawal <shishir@google.com> Merge "Adding hidden TM calls to scan/select cell networks." into mnc-dev
8f87c8249b33feff0ac414576b90e5c70b5661be 20-Jun-2015 Junda Liu <junda@google.com> Merge "Fix spelling of a config variable." into mnc-dev
1826c234bcdc115c821da2991443e54f95e52888 20-Jun-2015 Jonathan Basseri <misterikkit@google.com> Fix spelling of a config variable.

This is to be consistent with the style/format in CarrierConfigManager.

Fortunately, nothing in packages/apps/CarrierConfig needs to be updated,
since this variable doesn't have any overrides.

Change-Id: I8910abd28d9c0aae68a04dcfcfb2f3d0c0466ca9
arrierConfigManager.java
d4f2bcdab5a43e6439babfd5eefeaff908b73870 19-Jun-2015 Shishir Agrawal <shishir@google.com> Adding hidden TM calls to scan/select cell networks.

TM.getCellNetworkScanResults: Performs a radio scan for networks and returns
a list of OperatorInfo.

Tm.setNetworkSelectionModeManual: Manually selects a network and returns the
status of the selection.

Bug: 21563489
Change-Id: If64f30d6f1ed373c1d90433688389307f3dfee8c
elephonyManager.java
5385f5a0b8b22a06a3befd5b660676dc04336a5f 19-Jun-2015 Junda Liu <junda@google.com> Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev
fbd740c3ca5a55bc18a2a73e4b4255fdb47c506f 19-Jun-2015 Junda Liu <junda@google.com> Add comments to carrierconfigmanager for required permission.

Bug: b/20826627
Change-Id: Ia8a42f4792429e56108a423f27c3f843f6b0f958
arrierConfigManager.java
019523a8a44dcab0bac7cb4fa3c22ada7cca6804 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> Migrate 'csp_enabled' to CarrierConfigManager.

This variable controls whether SIM cards are allowed to disable manual
carrier selection, so it makes more sense for it to be managed as
carrier config.

Currently the variable is only used in device overlays
for specific networks, but we are dropping the device-overlay so that
this simply applies to those networks.

Change-Id: Ia6ba6a89c94c0916c19bdf792e48a4feac87eded
arrierConfigManager.java
cb8bb3900178c126b9f101e84edd07bb6b489637 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Add VVM carrier config to public API." into mnc-dev
7e603d69947566bd17ac76820fde59ac9fd11c0c 19-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev
6c1dc315aaf68676c56cc00b13f6937ef5592f8d 19-Jun-2015 Jonathan Basseri <misterikkit@google.com> Add VVM carrier config to public API.

These bits of carrier config were @hidden, but in order for carrier apps
to set them, they need to be public.

Bug: 21930513
Change-Id: Ifa49cf7441a8c6b6cf7e1aadb46abeb41054fcc3
arrierConfigManager.java
elephonyManager.java
330dcac0cb9412b7a856a99ce3ea94d2ebba330a 18-Jun-2015 Sanket Padawe <sanketpadawe@google.com> SubscriptionManager: Fix NPE in getSimStateForSlotIdx

bug: 21915589
Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
ubscriptionManager.java
d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71 18-Jun-2015 Fyodor Kupolov <fkupolov@google.com> OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds

Bug: 21726452
Bug: 21878243
Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15
elephonyManager.java
69dd4bba65f0b50bbee101d371425ad7fd13ed22 17-Jun-2015 Chris Manton <cmanton@google.com> Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev
94f30824959acf2d7c7e6555ecb642ba07b2187a 17-Jun-2015 Andrew Lee <anwlee@google.com> Merge "Add DisconnectCause for CDMA activated case." into mnc-dev
a5aabfebcaad34b9fdea222d858fc54d18e462c0 17-Jun-2015 Junda Liu <junda@google.com> Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev
e15cca771cd641d611ecf00b20621a688a383036 17-Jun-2015 Junda Liu <junda@google.com> Add carrier config variable to hide sim lock setting ui.

Bug: b/19623656
Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
arrierConfigManager.java
ca16a79b1875921b0204dd952f0d6a28ea5e1022 16-Jun-2015 Chris Manton <cmanton@google.com> Add keys to handle GSM and CDMA roaming/non roaming overrides

bug: 20828356

Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
arrierConfigManager.java
0c4d2e84cf9028e2de75e54f742df4fa7c4574a6 17-Jun-2015 Andrew Lee <anwlee@google.com> Add DisconnectCause for CDMA activated case.

Bug: 19296388
Change-Id: Ic754534e6d0273ae73ed80e3bb25a681d410a03b
isconnectCause.java
27a88a3eb6a6a456ea3ec1b81a8fb26333f904a5 16-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
73d043232434f3ad37af26615919eac3117536b7 16-Jun-2015 Junda Liu <junda@google.com> Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev
e478649373a494347e744fcdaeac6960e4b5ae65 15-Jun-2015 Junda Liu <junda@google.com> Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.

Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
arrierConfigManager.java
28a8cf6883478d568f9c85065e94ba39c5c439d4 16-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding config variables for triggering CI action on System update." into mnc-dev
02008b78d095206a9b72bd3a5242c54cb6da0bdd 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> Adding config variables for triggering CI action on System update.

Bug: 21603815
Change-Id: I401099a9aeced578ee914ddbebf1f5982f276780
arrierConfigManager.java
b2af4220adccb68c67bc91022db6239a9b9e280b 11-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Delete TODO and file a bug." into mnc-dev
3360c2657908e6cb8565c85bdb33e0e2a3fd92b4 10-Jun-2015 Jonathan Basseri <misterikkit@google.com> Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL

Disabling voice privacy sounds scary. Update this config variable name
to what it actually does, which is to hide some settings UI.

Bug: 21571894
Change-Id: Ib981b5e442b56d0167a19326fe34935b7a1cfbf1
arrierConfigManager.java
5bf0ca1b3a304faf265a6c3e63410b32f4fdb118 11-Jun-2015 Jonathan Basseri <misterikkit@google.com> Delete TODO and file a bug.

This TODO looks more like a feature request, so I filed b/21766386 to
evaluate the feature. We should remove the TODO especially because this
text is in the public API.

Note: I'm not deleting the exact same comment from
packages/services/Telephony/res/values/config.xml
because the data migrated to CarrierConfigManager is slated to be
deleted from config.xml files.

Bug: 21571894
Change-Id: Iaba042fb47ade24f5825a48b21960193d322363f
arrierConfigManager.java
735e61b30f3099dff9dd6f4f9b65b6b1e5e38413 11-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Additional OP_READ_PHONE_STATE AppOps checks for telephony

Bug: 21726452
Change-Id: Iab61372d0fc8cecc826564a218ff542ec4afde5c
elephonyManager.java
1f86c1ae83557d7e03c7bd3e5222137b03216bd4 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Update docs on SignalStrength.getLevel" into mnc-dev
46982c53641603f42cf32a7ac9a7fc3e4e2befce 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Update docs on SignalStrength.getLevel

bug:21572049
Change-Id: I10b830859a253170184a2d874d0ed39fc6ee0503
ignalStrength.java
a66a067a9c9b706035f48f445561100f29c960bf 11-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev
8c332b727523ce0dbb9256f0f43a9c655d71a3ea 09-Jun-2015 Santos Cordon <santoscordon@google.com> TelephonyManager should use TelecomManager's getCallState().

Telecom's version includes non-cellular calls in its result. Many apps
compile against TelephonyManager's existing API so we should update it
to use telecom instead.

We kept the implementation as cellular-only for
getCallState[ForSubscription](...) version of the API (which is hidden
anyway).

Bug: 21732997
Change-Id: Ifd27e6b49d76fe96ccc969e5262b1a876670aeef
elephonyManager.java
da9bbf725592c6482d6fbce18ef8c258b18e4fc8 10-Jun-2015 Andrew Flynn <flynn@google.com> Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
0cf20cdf81c1d8b553f7b3f8179048fe1d5b4d59 09-Jun-2015 Jeff Davidson <jpd@google.com> Mark CARRIER_PRIVILEGE_* constants as @SystemApi.

These constants are returned by checkCarrierPrivilegesForPackage which
is marked as @SystemApi, so this seems like an oversight.

Bug: 21613234
Change-Id: I5efc2c305cb1870e42fb103578fe33ec3e6000d4
elephonyManager.java
ceaed68b074bd341ed9b5f13ff9cc69e3f533999 09-Jun-2015 Andrew Flynn <flynn@google.com> notifyCarrierNetworkChange:TelephonyManager->CarrierService

Re-checkin of 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
elephonyManager.java
309b2f63f3265c341f6a43cbca2fb25f9c38109a 04-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Do not enforce PHONE_STATE_PERMISSION to register listener

PHONE_STATE_PERMISSION should not be required to register to the following
event types:
- PhoneStateListener.LISTEN_CALL_STATE
- PhoneStateListener.LISTEN_DATA_ACTIVITY
- PhoneStateListener.LISTEN_DATA_CONNECTION_STATE

In case of LISTEN_CALL_STATE, an empty string should be passed instead of
incomingNumber, when caller has no PHONE_STATE_PERMISSION.

Bug: 21588537
Change-Id: I5b6d0308924f7e4cd13a983b8e0c9b3a5bbb119b
honeStateListener.java
d56958c440dffd85349adee5ca0bf4d0893215c6 09-Jun-2015 Zach Johnson <zachoverflow@google.com> Merge "Ignore carrier apps when checking for idleness" into mnc-dev
8711ed644bab42c03ab9a22c14e1cb2825a107a6 09-Jun-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'modemActivityInfo' into mnc-dev

* changes:
API for get modem activity info
Activity info and stats from modem
5ea0c8f1c660630edcdd5abdac076f7df69a7f8a 08-Jun-2015 Jonathan Basseri <misterikkit@google.com> Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId

Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
arrierConfigManager.java
b4b9ca7580c75f07330e5222cbd9ccc93b12935e 19-May-2015 Zach Johnson <zachoverflow@google.com> Ignore carrier apps when checking for idleness

Also introduce a way to check if a package has
carrier privileges for any active phone.

Change-Id: If5c5fe07f05ffc90fc21431eb27cf48030c0175b
elephonyManager.java
71feb72b76777afa10dca555287f954d63deeb9d 08-Jun-2015 Nathan Harold <nharold@google.com> Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev
21a4f17c942165684bc590de594984912459396d 08-Jun-2015 Andrew Flynn <flynn@google.com> Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev
2b5348b41329b42f5b0929455a9b616a5e1f685e 08-Jun-2015 Andrew Flynn <flynn@google.com> Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"

This reverts commit 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
elephonyManager.java
fde06fd323fbc7102a824e1b8a2b9ddc4a89c38a 08-Jun-2015 Nathan Harold <nharold@google.com> Fix a typo in the docstring of getAllCellInfo()

Change-Id: I5ac23e708926a1ca649ace3890af417c9607e0e9
elephonyManager.java
829c097761e39b608b8b965a2c03f11ce5a95d2b 08-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev
9b5e2124d0bc80370e80e0525e34a46eda61ded7 08-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev
2429e6a8d96a4eba83e22c35595fa05e0f5e51f2 08-Jun-2015 Andrew Flynn <flynn@google.com> Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
9387f1dfe3788661e883672b36edabf11a96de51 27-May-2015 Amit Mahajan <amitmahajan@google.com> Changing getSimState to use slot idx instead of sub id.

Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
ubscriptionManager.java
elephonyManager.java
912f705f1f98ba2fc744601994dfbe12f391b0ae 06-Jun-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Suppress default logging in SubscriptionManager." into mnc-dev
28964eb236cee7e593cf46ff6bcd61cd0d4c54f6 06-Jun-2015 Sanket Padawe <sanketpadawe@google.com> Suppress default logging in SubscriptionManager.

Bug: 20465753
Change-Id: Ieeb493be7b32382c6adf1cf0664cf3e96cedace7
ubscriptionManager.java
69822f0d63e80a068bb2ee4c80a617492f1d8141 04-Jun-2015 Jonathan Basseri <misterikkit@google.com> Renaming carrier config variable keys.

API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
arrierConfigManager.java
7f8be9d89b7f294bf5e5d377908a5c74d2f4968f 04-Jun-2015 Andrew Flynn <flynn@google.com> notifyCarrierNetworkChange:TelephonyManager->CarrierService

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
new internal callers that want to bind to it.

Bug: 21572049
Bug: 21630803
Change-Id: Idcbcd107966fe92d7edc23c261e11db61160f615
elephonyManager.java
3d0f09433a6a26e5d47bd567cac2ce69d1e7eb0c 04-Jun-2015 Prerepa Viswanadham <dham@google.com> API for get modem activity info

Change-Id: I4785e1dfce14468de8ba5a376c7c3aa57178ce7b
elephonyManager.java
5c728994311c40821604c6711171e860776659a6 28-May-2015 Prerepa Viswanadham <dham@google.com> Activity info and stats from modem

Change-Id: Ifa8e520673c7e5549b0066a16a744810f1f0730c
odemActivityInfo.aidl
odemActivityInfo.java
65561b5c5100d4d4b18d5086cba52d796122e78d 04-Jun-2015 Nancy Chen <nancychen@google.com> Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev
b2556363e7c142d7e0ab8f62e1a82662600a0821 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> Fixed punctuation in comment.

Bug: 21559800
Change-Id: I47dc8e7be809cc586c307e72c7e9e11d5268cd5f
elephonyManager.java
b8a4ba86d87b7bdfe8b88300de8b29f1578b26c6 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Update getVoiceMessageCount() comments." into mnc-dev
53477531889214c2ef983501b0698beb0495e10e 04-Jun-2015 Amit Mahajan <amitmahajan@google.com> Update getVoiceMessageCount() comments.

Bug: 21559800
Change-Id: I7a737ae8a93c59391f232b5da6e3b36874126f3a
elephonyManager.java
97f5ccd1cc9f06c27c5e38bfb4a8a05238e1df2f 04-Jun-2015 Nancy Chen <nancychen@google.com> Add carrier package name field to check for carrier vvm app.

The carrier's vvm app's package name will be checked so that if it is
already installed, the dialer vvm will be disabled.

Bug: 2112648e#
Change-Id: I0433037f3bc5c5a380c76a03090d61c430e47e4b
arrierConfigManager.java
2e7ca76a8a1b87c2ea6102ba14fe324cfe20f8ca 30-May-2015 Amit Mahajan <amitmahajan@google.com> Adding temporary logging to debug CTS failure (for CellLocationTest).

Bug: 21209629
Change-Id: Ic99cf02f26d3cca7260a3a0141ce13eff9a885bc
elephonyManager.java
b06411a90fcaaa6d2bb295174c97d4b7a124eea9 03-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Document procedure for adding carrier config variables." into mnc-dev
97769b0c437a1a09aa925f07bbc8c0ae14d5c31b 03-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev
115c04410ec276f9fe7e364f9ac082cad5bce8d0 02-Jun-2015 Brian Attwell <brianattwell@google.com> Rename PhoneNumberUtils APIs

In response to more API review.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
honeNumberUtils.java
f31ac338af8f5b32ce08799b8ad9c7f9a1d4d091 27-May-2015 Jonathan Basseri <misterikkit@google.com> Migrating MmsConfig to CarrierConfigManager.

Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a

Bug: 21085630
Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
arrierConfigManager.java
abdf79aba01c6dbf4792907b4875fed023089f82 02-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev
27a7b78e40d23e6f87343ee9a75dc54b9b34894d 02-Jun-2015 Jonathan Basseri <misterikkit@google.com> Revert "Migrating MmsConfig to CarrierConfigManager."

Forgot to update-API

This reverts commit 9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc.

Change-Id: I8e1bb7ff5b86d478ae7a79497d28ee9310209de6
arrierConfigManager.java
56dbe3ee4bea8fce11a2698a44778e264e9ec2db 02-Jun-2015 Adrian Roos <roosa@google.com> Merge "Hide and disable emergency assist API" into mnc-dev
9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc 27-May-2015 Jonathan Basseri <misterikkit@google.com> Migrating MmsConfig to CarrierConfigManager.

Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

Bug: 21085630
Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a
arrierConfigManager.java
08e318e5868b4f21a95fd1b5e8b9659e2d830257 29-May-2015 Jonathan Basseri <misterikkit@google.com> Document procedure for adding carrier config variables.

Readers of CarrierConfigManager.java should find enough info in the
comments to add new variables and override them in either their own
carrier app or the default carrier app.

Change-Id: Ib1d87c24543491ad8b4ef0b1d08148a07fb1ace3
arrierConfigManager.java
19d9d0ca2e95eca34e8f7b28023aa10f15d82f88 29-May-2015 Brian Attwell <brianattwell@google.com> Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
1a15ab91bcdf780f0d109f4a4d18701195ffdb49 29-May-2015 Brian Attwell <brianattwell@google.com> Rename "end" to "endExclusive" in addPhoneTtsSpan

Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
honeNumberUtils.java
ff0c25ce3174bd4f76256e413beb81f6eb501da9 29-May-2015 Amit Mahajan <amitmahajan@google.com> Merge "Cleaning up logging in TelephonyManager." into mnc-dev
56548d578c05100d87ee7480fe61bc4815a0dacb 28-May-2015 Amit Mahajan <amitmahajan@google.com> Cleaning up logging in TelephonyManager.

Bug: 21474174
Change-Id: I4555ada69c233ee9e9d9e45c1d619e8b779d9016
elephonyManager.java
ec7100d0114d50f12c4ad95eaeac61e93a6d5a96 28-May-2015 Nancy Chen <nancychen@google.com> Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev
7ff76d637f5ad49838e9d4a1570c762a187ed4d1 16-Apr-2015 Narayan Kamath <narayan@google.com> Add a hidden telephony API for querying SIM derived locales.

bug: 19818550
Change-Id: Ide6c05ad8fe7b0cff6f20ddfe755e83e9b3a21aa
elephonyManager.java
42ecc9eb902ef90876cd345a906c24e0d58720a3 23-May-2015 Zach Johnson <zachoverflow@google.com> Drop the "Config". Just "CarrierService". It's cleaner.

b/21308727

Change-Id: I6515888c7804349ecd07c4dd74575ef89a4bea59
arrierConfigManager.java
cb43f420fc17eed8152c3509093813d4a0ecd031 28-May-2015 Nancy Chen <nancychen@google.com> Update docstring for STRING_VVM_TYPE to point to possible values.

The possible values for CarrierConfgiManager.STRING_VVM_TYPE now live in
TelephonyManager. Update the reference.

Bug: 21446369
Change-Id: I85e3ab4f64d54f0cb8bf16b2ada67cae36cefdd2
arrierConfigManager.java
46fa08d66483bf041fdc0a4eace63f9addf8e629 27-May-2015 Adrian Roos <roosa@google.com> Hide and disable emergency assist API

Bug: 21471480
Change-Id: If53926ebd6451b05ccacf06342cc648185dc5eaf
elephonyManager.java
9e4cd8332ac89bc409445eff3b81d739edaccb0f 23-May-2015 Nancy Chen <nancychen@google.com> Add vvm type for t-mobile.

T-Mobile has slightly different configuration details so add a vvm type
to correspond to what they use: comverse vvm.

Bug: 21126480
Change-Id: I83fd0c5651bf94eb912dd44f4b52924d8bcdd4e7
arrierConfigManager.java
elephonyManager.java
8c621ef54630e411d50e9ba1d8d8ed19ef93f9e1 12-May-2015 Robert Greenwalt <rgreenwalt@google.com> Add support for static RadioCapabilities.

Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY. Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that. B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I49e4527fe94919a7094bc7c1e100d20e8f833865
adioAccessFamily.java
07e02b6d25f5a731a36ad49b482e35c14c97cbdc 14-May-2015 Junda Liu <junda@google.com> Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev
b731c3d944ccf46b7d0115f63b63eee5ab8abf1a 05-May-2015 Jonathan Basseri <misterikkit@google.com> Add null annotations for getting carrier config.

CarrierConfigManager can return null Bundles for carrier config, but
never returns null when getting default values. Add the appropriate
annotations.

Change-Id: Iffbed3b54ca7cc28cf8b04f133aacdf9e6e4fd20
arrierConfigManager.java
cd115b738c3ead973425b64c19e3f78052979261 13-May-2015 Junda Liu <junda@google.com> Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.

Bug: b/21028396
Change-Id: I029671b6bcd03a07956ccf35f4e5fe03d16a2218
arrierConfigManager.java
4f9ad1678eca240afb5a2174dc35e4f0559312c3 12-May-2015 Jonathan Basseri <misterikkit@google.com> Switching to PersistableBundle in carrier config API.

Part of this API involves persisting config bundles to avoid binding to
apps at critical moments (like boot). Regular bundles should not be
written to disk because they support object types that can lose their
meaning while the data is at rest.

In order to use PersistableBundle, we must either start with one or
filter unwanted types out of Bundle objects. Since the carrier config
API has no use for unsupported types, we chose to use PersistableBundle
everywhere.

Bug: 20268926
Change-Id: I17989ce840014c2a0ed3679c1bca5a8498082c7f
arrierConfigManager.java
d1808401ca3bfd6b6b9a975c1e739b194d18f849 05-May-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
Merge commit 'b6f59f4' into master_merge
Merge commit 'f6db0ce' into master_merge
Merge commit '17455a3' into master_merge
Merge commit 'b4d5b32' into master_merge
Merge commit 'a1a2fa7' into master_merge
Merge commit '8dfdb98' into master_merge
Merge commit 'eba66c3' into master_merge
b6f9da0b7f26b50163461a767cafcd8014328742 01-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '17455a3' into master_merge
13a98b6c6ed28bfa0cb373e49c183167699e30f0 26-Feb-2015 Amit Mahajan <amitmahajan@google.com> Support for bearer_bitmask.

Change-Id: I7cae3d229445607c66b6472124264588f7571097
erviceState.java
08b51bfe8532ab7eff38ad69ad46c251be5c2792 30-Apr-2015 Yorke Lee <yorkelee@google.com> Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
f1a349bda3b6cb400692159d72a41ea89b0e6128 30-Apr-2015 Yorke Lee <yorkelee@google.com> Add default dialer checks to Telecom/Telephony

Check for the default dialer or the modify phone state permission
for various TelecomManager/TelephonyManager methods.

Make sure to check the user-selected default rather than the
hardcoded package name.

Exercise this code in TestDialerActivity.

Bug: 20304458
Change-Id: Ic04cd8f2ba98e1d54c39549ae89d3e11cd5cdafb
elephonyManager.java
9b56ad8f1a7e2c97423171bf15b0dc303f12d4c1 27-Apr-2015 Jonathan Basseri <misterikkit@google.com> Moving all Telephony overlays to CarrierConfigManager.

This adds every variable and its default value from
packages/services/Telephony/res/values/config.xml to the new
CarrierConfigManager API. Variable docstrings are also taken from
config.xml, with minimal edits.

These variables were not included because either they are not carrier
specific, or they are device specific:

OtaPlaySuccessFailureTone
OtaShowActivateFailTimes
OtaShowActivationScreen
OtaShowListeningScreen
carrier_settings
carrier_settings_menu
config_allow_hfa_outside_of_setup_wizard
config_enabled_lte
csp_enabled
dialer_default_class
dtmf_type_enabled
hac_enabled
send_mic_mute_to_AudioManager
ui_default_package

This also adds BOOL_HIDE_CARRIER_NETWORK_SETTINGS which is a replacement
for android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS.

Bug: 20270007
Change-Id: I985a55cf88d3bd1863e28af7790b59eef01d6504
arrierConfigManager.java
712cdaf48e83f71033fd097a5d2cc6238fdad6db 24-Apr-2015 Cheuksan Wang <edwang@google.com> Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev
9892718663be17e00cc20e82d75a532161bcd613 24-Apr-2015 Jonathan Basseri <misterikkit@google.com> Never return a reference to sDefaults.

Final static fields in Java are still mutable, so CarrierConfigManager
should not give callers the opportunity to mutate them.

Change-Id: I413597fc5f59c249997967bb0aad2d09b54fa613
arrierConfigManager.java
48f8fe53ee6624ed64ccd5f47bbc28beb223ce6b 24-Apr-2015 Jonathan Basseri <misterikkit@google.com> Merge "Adding carrier variables to control certain network settings."
ad5baab57e2b7c154f4bb5a1c7bab3ff3c952ede 23-Apr-2015 Jonathan Basseri <misterikkit@google.com> Adding carrier variables to control certain network settings.

Bug: 20270007
Change-Id: I4075c159e4fceb2e8a5bdda1261f8b2470455595
arrierConfigManager.java
4f18c60f48bf1b2b614f9a10b7ef3b7967713ceb 06-Apr-2015 Sooraj Sasindran <ssasin@codeaurora.org> Make sure to return network type after conversion

After converting raf to type, make sure to return
network type

Change-Id: I7fd338717be98a055cbaed66d1b15417da27a3d8
adioAccessFamily.java
c180f9adf7010395d32799536d4d7db675936642 03-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> Radio Access Family related fixes

1. Include EHRPD in the EVDO group
2. Fix mapping of CDMA network type to include EVDO
3. Add utility to get the network type from the Raf

Change-Id: I35023083be4c681809c003c7ed6a31c698ea4647
adioAccessFamily.java
cf5715eb30dd866a330c9aff2db5b57da8a2f246 22-Apr-2015 Todd Kennedy <toddke@google.com> Merge "Unhide SignalStrength#getLevel()"
af86120955f3fe65c2c330e2333009b6ed12081a 21-Apr-2015 Todd Kennedy <toddke@google.com> Unhide SignalStrength#getLevel()

Bug: 20410696
Change-Id: I9f7f8c2949a9fdf5f84c4b567898c240034f5e85
ignalStrength.java
24aadf18d5f69f33460cf266ab8952c644a12c55 21-Apr-2015 Svet Ganov <svetoslavganov@google.com> Merge "Add OP_READ_PHONE_STATE app op continued - framework"
5f24126e2ef51c5d0e9ccc7500a6226c63567200 20-Apr-2015 Jonathan Basseri <misterikkit@google.com> Merge "Add multi-sim support for getCarrierPackageNamesForIntent."
f1fb39763d87dabe254b6ed64ac8f20145035bc0 03-Apr-2015 Stuart Scott <stuartscott@google.com> Move factoryReset to service and protect.

bug:16161518
Change-Id: I02d1bbae1887c62ee426e6f03e8bc1f18c6666bf
elephonyManager.java
f3c7bf432dc5c21fdecbb44865c037313d21b4cf 17-Apr-2015 Junda Liu <junda@google.com> Add multi-sim support for getCarrierPackageNamesForIntent.

resbmit of change Id100b7c4606287a1daa90092cd3c8a5a6519247d

Bug: 20268073
Change-Id: I852aac4da492e15f1dd7a3c88693fa14ec07b7c4
elephonyManager.java
21301f6016ce50594f6cd9c66581ee9a08b57be9 19-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add OP_READ_PHONE_STATE app op continued - framework

Change-Id: If1c2783ad9ea2aa773e5416e09a3cfd1817ef73f
ubscriptionManager.java
722743667110718acf473c92727b55581c0b9309 19-Apr-2015 Jeff Sharkey <jsharkey@google.com> Merge "Revert "Add multi-sim support for getCarrierPackageNamesForIntent.""
1b7ed7b1c2224728340251eb19433ab34ec1fac1 19-Apr-2015 Jeff Sharkey <jsharkey@google.com> Revert "Add multi-sim support for getCarrierPackageNamesForIntent."

This reverts commit 0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55.

Change-Id: I099c612ff1715c5c34c0ed9bc1bec460a1a5db01
elephonyManager.java
f47c6488ea7de6bf2938ffb5bb1549bcf948da49 19-Apr-2015 Junda Liu <junda@google.com> Merge "Add multi-sim support for getCarrierPackageNamesForIntent."
774afb9a8e9f8f5a4d31d0573d94efeb3e5c3655 18-Apr-2015 Svet Ganov <svetoslavganov@google.com> Fix calling package for app ops

Change-Id: Ie867262e74d0b09e16193cb575b1c1cf942c83cb
elephonyManager.java
275b5635ad98a411d511894e98f80e8b8bc41799 14-Apr-2015 Svetoslav <svetoslavganov@google.com> Teach telephony about location app ops

Change-Id: I2bd8f0cb90d161994045d403f5d0c129ea951c3f
elephonyManager.java
0ff9fd87d0a0d88bf46945629d0a30f6e7fb3f55 17-Apr-2015 Junda Liu <junda@google.com> Add multi-sim support for getCarrierPackageNamesForIntent.

Bug: b/20268073
Change-Id: Id100b7c4606287a1daa90092cd3c8a5a6519247d
elephonyManager.java
d3c1ddb892f2ef8ae1b8eb0e4c50dfef302c0beb 17-Apr-2015 Svet Ganov <svetoslavganov@google.com> Merge "Add OP_READ_PHONE_STATE app op - framework"
2850d7a5996aaccc675a917cfec61f5ba55845d7 17-Apr-2015 Yorke Lee <yorkelee@google.com> Set default values for VVM constants in CarrierConfigManager

* Also hide the constants, they don't need to be @SystemApi
* Make VVM_PORT_NUMBER an Int

Bug: 20272209
Change-Id: I0d47afd7916d40f77ba5bf8e95306b46b27c15b3
arrierConfigManager.java
16a16899505ec0a9ede5b76650bfb8817b3227c7 16-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add OP_READ_PHONE_STATE app op - framework

The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.

Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
ubscriptionManager.java
elephonyManager.java
5c86e922dd3473c0cf235ac9288d68099c293e53 09-Apr-2015 Nancy Chen <nancychen@google.com> Add keys for visual voicemail carrier configuration values

Each carrier has its own set of visual voicemail configuration values
to be retrieved from the carrier config manager API.

Bug:19236241
Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
arrierConfigManager.java
9a1c9b67c4b2426884deb60c1ff84130ab47333c 25-Feb-2015 Jonathan Basseri <misterikkit@google.com> Adding Carrier Config API.

UICC privileged carrier apps will extend CarrierConfigService to provide
carrier-specific configuration. Apps/services will use
CarrierConfigManager to read the current configuration.

CarrierConfigManager also defines the set of configuration variables and
their default values.

Bug: b/19483786
Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
arrierConfigManager.java
dae67ef3439a91f58ccf4844a6b0e1d48be1a6f6 16-Apr-2015 Vinit Deshpande <vinitd@google.com> Merge "TelephonyManager Carrier Network Change Notification"
48903511b092feb7502f10f121bdf9b56f26395d 09-Apr-2015 Nancy Chen <nancychen@google.com> Add keys for visual voicemail carrier configuration values

Each carrier has its own set of visual voicemail configuration values
to be retrieved from the carrier config manager API.

Bug:19236241
Change-Id: Ic1d59a13d2203c70aba178c315c47ec2661ea56e
arrierConfigManager.java
3031bf961103ecc1caa32449a3cdb95575042278 25-Feb-2015 Jonathan Basseri <misterikkit@google.com> Adding Carrier Config API.

UICC privileged carrier apps will extend CarrierConfigService to provide
carrier-specific configuration. Apps/services will use
CarrierConfigManager to read the current configuration.

CarrierConfigManager also defines the set of configuration variables and
their default values.

Bug: b/19483786
Change-Id: I027211b43276afd6fe893ae50048c52f2aed5cf5
arrierConfigManager.java
1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4 10-Apr-2015 Jay Shrauner <shrauner@google.com> DO NOT MERGE Make Telecom/InCallUI APIs public

Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
elephonyManager.java
55b97525f0f50857f1ab0acd2608053fd0f3416c 10-Apr-2015 Jay Shrauner <shrauner@google.com> Make Telecom/InCallUI APIs public

Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
elephonyManager.java
1f45264dd6b874d72ed901a2213c779d42d321c1 15-Apr-2015 Andrew Flynn <flynn@google.com> TelephonyManager Carrier Network Change Notification

Adds a way for a carrier app to notify the system that an intended network
change is starting or ending. This can be used by a system PhoneStateListener
to provide custom UI or perform other actions during this period.

- Adds new public TelephonyManager API: notifyCarrierNetworkChange(boolean)
- Adds new @hide PhoneStateListener method: onCarrierNetworkChange(boolean)
- Functionality merely serves as a pass-through of data from an app to a
PhoneStateListener (SystemUI for the intended use case)
- Protected by MODIFY_PHONE_STATE permission or hasCarrierPrivileges().

Bug: 11392659

Change-Id: I3199e21ec1ac124198f44b86c1534dd3ff1f6858
honeStateListener.java
elephonyManager.java
2aebb3fec319f5715e70dc5d3c3139f8821ec6ab 06-Apr-2015 Santos Cordon <santoscordon@google.com> Add SIM activation constants to TelephonyManager

Change-Id: I43fe5de4a1137bede4e81f4d51f272ad92dc80d5
elephonyManager.java
896a1e650cf69f8dea1ef588c0089aaaf3d12e08 03-Apr-2015 Andrew Lee <anwlee@google.com> Protect against null ITelephony to fix crash.

Bug: 20066803
Change-Id: I4336e979dab3a4b1b3d53078af572ff3f822377a
elephonyManager.java
984dc850b4caeb4470e52bce773935be5305cf8e 30-Mar-2015 Stuart Scott <stuartscott@google.com> Move reset network settings into framework.

bug: 16161518
Change-Id: Ic3b537ebd09d1b9723feff9dcc96e20fda05a94f
elephonyManager.java
0ced792cd69ff4e78b3ea84e6b38c1f1fddce82e 10-Dec-2014 Shishir Agrawal <shishir@google.com> Fail SmsManager requests if SubId is not active.

If subId is not active, expected subIds can be assigned to the messages being
processed due to SmsManager calls. The change will fail any SmsManager calls
if SubId is not active.

Bug: 18629526
Change-Id: I8da1b1e2c477f32dcbaff417fc4e14ba2a225414
ubscriptionManager.java
943eb8654ff64ad854adada782ab911421a649a0 26-Mar-2015 Adrian Roos <roosa@google.com> Add emergency assistance API and setting

Bug: 19841649
Change-Id: I5bc99df6d85eb84b253456e32ce52afd7592a95e
elephonyManager.java
4209a28270a70016ee5ee6cae3dc96d6df0ade26 24-Mar-2015 Prerepa Viswanadham <dham@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
9504a9d90b81b9b9befd0008f8b862bef6bbc803 19-Mar-2015 Nick Vaccaro <nvaccaro@google.com> am 23c7cef2: am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

* commit '23c7cef2ca28bf3116611507457be953f45ca80b':
Avoid unhandled page fault cases on Android Wear
23c7cef2ca28bf3116611507457be953f45ca80b 19-Mar-2015 Nick Vaccaro <nvaccaro@google.com> am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev

* commit '74a0eb360da012c5a13577a8af33f6b28b0fadf7':
Avoid unhandled page fault cases on Android Wear
5fc29ed61aa7d0b736de58af265a6ed380086b8d 18-Mar-2015 Nathan Harold <nharold@google.com> Merge "Adding hidden isWifiCallingEnabled() and isVolteEnabled()" into lmp-mr1-wfc-dev
automerge: 8ee14a2

* commit '8ee14a244851ac80af0193541a5d521462d75e1e':
Adding hidden isWifiCallingEnabled() and isVolteEnabled()
5540908059e3d746d915cc5d7e00618dc43df585 17-Mar-2015 Andrew Lee <anwlee@google.com> Merge "Add methods to indicate accessibility support."
67b3ef27f0e6d1eac458ceead9bb65d0b717fe31 15-Mar-2015 Vinit Deshpande <vinitd@google.com> am "Telephony: Implementation for IWLAN."

merged from goog/mirror-m-wireless-internal-release
bece926 Telephony: Implementation for IWLAN.

Change-Id: I4d55b3452428ebf9fbcfc3ba3a75cefcb2aeb0cf
42eadcdf3432e9fd6662ee07316db7726c1eabbf 12-Mar-2015 Nathan Harold <nharold@google.com> Adding hidden isWifiCallingEnabled() and isVolteEnabled()

Change-Id: Ic33f8c50dfb2d81b2bdc149629724e3972aad09e
elephonyManager.java
f3c10020e2b76f20adb90d250ab4ed4e20e348d2 10-Mar-2015 Andrew Lee <anwlee@google.com> Add methods to indicate accessibility support.

Namely, indicates whether Telephony supports TTY mode or hearing
aid compatibility.

Bug: 19372734
Change-Id: I08d8cc64169b170c1dc6fb0c713e888eeba30099
elephonyManager.java
2b84e98e69ec915586963a1f2f3e55bacf210061 06-Mar-2015 Andrew Lee <anwlee@google.com> Merge "Add methods for device telephony configs."
67fc92bd444e4d8eee0aa7703980aff9185ea1bd 03-Mar-2015 Andrew Lee <anwlee@google.com> Add methods for device telephony configs.

+ Expose method for whether DTMF length can be changed.
+ Expose method for whether the device is a world phone.

Bug: 19372734
Change-Id: I542e87cab1924eb600fdce929f5227e36112964b
elephonyManager.java
9b09c15c35879838458d690e18fc67b0167485a2 03-Feb-2015 Santos Cordon <santoscordon@google.com> Add Sub-ID-from-phone-account converter method.

There are several places in the code that currently attempt to parse the
sub ID directly from the phone account which is undesireable. Before we
can change from using the subID to using an ICC ID with the phone
accounts, we need to create a conversion method so that no other
components are parsing the sub ID out of the phone account directly.

Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
elephonyManager.java
57f8f0d7f9ff9e7a916ada7efaf2f59931de89b1 04-Feb-2015 Brian Attwell <brianattwell@google.com> Unhide and rename PhoneNumberUtils tts methods

Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpan
Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan

Instead of removing the original hidden methods, I deprecated them.
Since Telephony changes initially get checked into wireless-dev
branch and dialer/contacts changes get checked into master branch,
immediately deleting the ttsSpanAsPhoneNumber methods would break
builds.

In ContactsCommon, I plan on removing
ContactDisplayUtils#getTelephoneTtsSpannable and instead using
these Telephony APIs. Numbers I tested worked in ToT master talkback:
911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484,
001 39 02 444 4444. The changes in this diff cause the numbers
to be talked-back at least as well as before.

Some context: go/question-about-telephonys-ttsspan

Bug: 18777272
Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460
honeNumberUtils.java
08c7116ab9cd04ad6dd3c04aa1017237e7f409ac 28-Feb-2015 John Spurlock <jspurlock@google.com> Remove unused imports in frameworks/base.

Change-Id: I031443de83f93eb57a98863001826671b18f3b17
honeNumberUtils.java
honeStateListener.java
reciseCallState.java
reciseDataConnectionState.java
ubscriptionManager.java
elephonyManager.java
f257469c08f06e40f47f0b884cb0737d1316cc2c 20-Feb-2015 Nick Vaccaro <nvaccaro@google.com> Avoid unhandled page fault cases on Android Wear

Telephony routines were dereferencing the null result of
getITelephony() and getSubscriberInfo(), causing unhandled page
faults at the hardware level.

Bug: 18264818
Change-Id: I7d058aa881c7dac20051d6faea2a6d52be4bd74e
elephonyManager.java
5414d155e5ce3147f9db1b2ec6fb2dcd6473e089 27-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 40aa30b3: am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '40aa30b3747fc62b14832682d2cc3117edd93b80':
Changing usage of carrier name field of SubInfoRecord
40aa30b3747fc62b14832682d2cc3117edd93b80 27-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '654a473bfea9a4197868ae81091812505da8ca87':
Changing usage of carrier name field of SubInfoRecord
8b76495751432e0ab3770f3660e235e5f5e1a024 26-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev

* commit '025f0938544bae3262acc24e9c6031b6de88901d':
Changing usage of carrier name field of SubInfoRecord
bece926b51854f196e015b025c4177be17c8f5ab 23-Feb-2015 Yashdev Singh <yashdevs@codeaurora.org> Telephony: Implementation for IWLAN.

Introduce new RAT as IWLAN.
- Allow registration polling in airplane mode.
- Allow non-default PDP activation for iwlan RAT.

Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response to indicate
if cellular and iwlan RAT co-exists.
- If co-existence is possible then allow default PDP activation
along with other PDPs.

Change-Id: Icc6f8111ec3c86ec06e8facd5a5b60b4d5e08e78
erviceState.java
elephonyManager.java
ea4713d6e50a34c9e699ba09dd3c73000aff3b46 24-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Changing usage of carrier name field of SubInfoRecord

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
ubscriptionInfo.java
ed4ca5ca2c40ed2c838aaf483fcd58abdfa0ff08 03-Feb-2015 Santos Cordon <santoscordon@google.com> Add Sub-ID-from-phone-account converter method.

There are several places in the code that currently attempt to parse the
sub ID directly from the phone account which is undesireable. Before we
can change from using the subID to using an ICC ID with the phone
accounts, we need to create a conversion method so that no other
components are parsing the sub ID out of the phone account directly.

Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
elephonyManager.java
bad6337b0862ba166ed26b5cabde8ed1fc3a419c 11-Feb-2015 Shishir Agrawal <shishir@google.com> GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8 automerge: 6b27472
automerge: b7e04f3

* commit 'b7e04f3294d2ce60450fcc6881249b6b0c6c30b0':
GpsLocationProvider: Read data enabled status from TelephonyManager.
b7e04f3294d2ce60450fcc6881249b6b0c6c30b0 11-Feb-2015 Shishir Agrawal <shishir@google.com> GpsLocationProvider: Read data enabled status from TelephonyManager. automerge: 64ce5f8
automerge: 6b27472

* commit '6b274720c5a210c07256e5b9fc11a1e9aca59017':
GpsLocationProvider: Read data enabled status from TelephonyManager.
64ce5f8fab077e4792737f86502d0e77ad6cbb0b 11-Feb-2015 Shishir Agrawal <shishir@google.com> GpsLocationProvider: Read data enabled status from TelephonyManager.

Bug: 18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
elephonyManager.java
b15c00a551cc5b4d1688ed6b73c6c0f5c0ff7a9f 06-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 0a4c2646: am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev automerge: 4eed340

* commit '0a4c2646f4b72fdc78299dbb3dd86a7aecefff08':
Suppress phone number from logcat.
0a4c2646f4b72fdc78299dbb3dd86a7aecefff08 06-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev
automerge: 4eed340

* commit '4eed340437d23a9b4fabf2881557325b863af23c':
Suppress phone number from logcat.
c6dbe3be2cc6d9e1755d43dc56739b71ce7469f3 04-Feb-2015 Brian Attwell <brianattwell@google.com> Unhide and rename PhoneNumberUtils tts methods

Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpannable
Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan
Added getPhoneTtsSpan

Instead of removing the original hidden methods, I deprecated them.
Since Telephony changes initially get checked into wireless-dev
branch and dialer/contacts changes get checked into master branch,
immediately deleting the ttsSpanAsPhoneNumber methods would break
builds.

In ContactsCommon, I plan on removing
ContactDisplayUtils#getTelephoneTtsSpannable and instead using
these Telephony APIs. Numbers I tested worked in ToT master talkback:
911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484,
001 39 02 444 4444. The changes in this diff cause the numbers
to be talked-back at least as well as before.

Some context: go/question-about-telephonys-ttsspan

Bug: 18777272
Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460
honeNumberUtils.java
1acdd4b1f4e4111f347afe7ebfd45c2eba045e75 05-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Suppress phone number from logcat.

Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
honeNumberUtils.java
af7454bafb99248caa9f02cf96195118d59afeab 02-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged"
automerge: 21475c6

* commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':
21475c6a92b893f5d078ba23f06f0be6edaaacbd 02-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged"

* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
3c6e38d3b5c7c5c209dca4f99526109e352a5392 21-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> Fixing up the formatting code which is already merged

I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
3165abfd3471a83e0544337f0ccbaee92fa57136 30-Jan-2015 Stuart Scott <stuartscott@google.com> am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
automerge: 2e233d3

* commit '2e233d30662d26846a42c298967842d2e8537653':
[DS] Correct the access method for telephony system property
2e233d30662d26846a42c298967842d2e8537653 30-Jan-2015 Stuart Scott <stuartscott@google.com> am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev

* commit '712d5b3d582dfe8f7fb855ba98704c98e9441836':
[DS] Correct the access method for telephony system property
85973dcf8cd7d7a964ba746875a0c572685d1807 29-Jan-2015 Legler Wu <legler.wu@mediatek.com> [DS] Correct the access method for telephony system property

Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
honeNumberUtils.java
ubscriptionManager.java
elephonyManager.java
81f63a60f3db45fcadc5c223dbafe9349c1b57f9 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
automerge: f19485b

* commit 'f19485b644b7ba7bda1f5c7a2279ca56c37923f0':
Suppress logging to avoid showing phone no.
f19485b644b7ba7bda1f5c7a2279ca56c37923f0 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev

* commit '60e4edfb94fd744001b4c7013a89ef4abb311f97':
Suppress logging to avoid showing phone no.
5df10e1842606f9a9a829a4779bf8f610b2d7bd9 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev
14d21344d21e379f6aeaa923cae7dc519efa16e3 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Suppress logging to avoid showing phone no.

Bug: 19193581
Change-Id: I6ee17a2eab9d0ed84c931d6395a5aeb148177f95
ubscriptionInfo.java
d31cafb369c48a41bc149833659fad894e7bf59f 29-Jan-2015 Stuart Scott <stuartscott@google.com> am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
automerge: cf8ae79

* commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b':
Change getDeviceId to take phoneId.
cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b 29-Jan-2015 Stuart Scott <stuartscott@google.com> am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236

* commit '8d702000a7291068e639a9954e03c36d66144449':
Change getDeviceId to take phoneId.
f4e52360613d20dc8176ce8a37cb05ad904fad0d 29-Jan-2015 Stuart Scott <stuartscott@google.com> Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
7cfb00fb9453346fa708158bcfeffd36783e31d9 28-Jan-2015 xinhe <xinhe@google.com> am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1
automerge: 5e51c21

* commit '5e51c21943a4e9c0096acbaee5f923e9e0297f25':
Sprint: MMS cannot be sent in the UK
5e51c21943a4e9c0096acbaee5f923e9e0297f25 28-Jan-2015 xinhe <xinhe@google.com> am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1

* commit '93487e286e6bfa434fb092c6276d96b40e5d62c4':
Sprint: MMS cannot be sent in the UK
d456ec4be1d2310c498dda2c7319562754ad643e 28-Jan-2015 Stuart Scott <stuartscott@google.com> Change getDeviceId to take phoneId.

bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
elephonyManager.java
6620b4273ef6a1489e091a6b6cc766c0eff30f8d 28-Jan-2015 xinhe <xinhe@google.com> Sprint: MMS cannot be sent in the UK

This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.

Bug:18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
elephonyManager.java
fe0e33495c63542ea04be3879b97c03119c2f88b 21-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f
automerge: 52f25f7

* commit '52f25f7b30b684a46814cff60538e6a7636ed618':
Add + code handling logic for SMS Global Roaming
52f25f7b30b684a46814cff60538e6a7636ed618 21-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f

* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
Add + code handling logic for SMS Global Roaming
63e77bf8a5be6844bd8fd9d07cd303f6dc72c64e 21-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18

* commit 'f0f5eee8238284aad08fd573959392542e57a8ab':
Fixed a crash in TelephonyManager while calling getDeviceID()
f0f5eee8238284aad08fd573959392542e57a8ab 21-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760
automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
Fixed a crash in TelephonyManager while calling getDeviceID()
201cc00947bceb71166d0800fb770eedb4ccb3f1 20-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Fixed a crash in TelephonyManager while calling getDeviceID()

Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
elephonyManager.java
c0fa70ee195e25eb470223d2a1de855e455d21c5 17-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 60b41e6a: am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

* commit '60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe':
Modify getDeviceId() to get device id independent of Subscription.
60b41e6aa7a93bf90cb1b7715a2429dbe7c975fe 17-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

* commit '543348eb94624907102c1baffe5bdaf1087fede8':
Modify getDeviceId() to get device id independent of Subscription.
d2dd69ae8d81defc5f2286690b3dd246d4118fcc 17-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev
2a3e8c729d2e5c166775d6810346406b4fcc2eb0 15-Jan-2015 Stuart Scott <stuartscott@google.com> am e2b9d5b5: am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev

* commit 'e2b9d5b56c6b06418e85cd49afd87e0d08f57c71':
Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
568e54be71731bdbcd5338385eb6cc6a082c9456 15-Jan-2015 Jorim Jaggi <jjaggi@google.com> resolve merge conflicts of 87f5369 to master.

Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
e2b9d5b56c6b06418e85cd49afd87e0d08f57c71 14-Jan-2015 Stuart Scott <stuartscott@google.com> am 542f4ee6: am a2fa3d21: Merge "Unhide getDataRoaming, Messenger uses it to decide to download MMS or not." into lmp-mr1-dev

* commit '542f4ee61986e2a2883211f229a1b3ad23ceca81':
Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.
98b8cf2c8029836d19cfa7c19fbf66e6d0b62efb 14-Jan-2015 Stuart Scott <stuartscott@google.com> am 2d68b428: am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev automerge: dfb99e8

* commit '2d68b428b06df4f91ffd12c01ccbac61ce9cb163':
Update javadoc and hide getNameSource and getDataRoaming.
400a3f6df20b92e639f20956301a36beb67b511b 14-Jan-2015 Stuart Scott <stuartscott@google.com> Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.

bug:19015551
Change-Id: Ibcad6424695a97bd9ae123010bdf740449d09327
ubscriptionInfo.java
ubscriptionManager.java
0b7f5e81ba06f694df8c8cccaea9e009e3200b4c 14-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Modify getDeviceId() to get device id independent of Subscription.

+ Add getDeviceId() in ITelephony to find device id independent of
subscription.

Bug: 18780202
Change-Id: I21cc38418eb7f4f1b300c6372e1dc7548385c112
elephonyManager.java
427e7162ca02473069b48affeadb1216184c1724 14-Jan-2015 Junda Liu <junda@google.com> am ead01845: am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev

* commit 'ead0184548fdd341f5903d9ce35604c926dcddde':
Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
6e41019633975358cf2f84c5d1e09e6e3a049875 14-Jan-2015 Junda Liu <junda@google.com> Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev
2d68b428b06df4f91ffd12c01ccbac61ce9cb163 14-Jan-2015 Stuart Scott <stuartscott@google.com> am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
automerge: dfb99e8

* commit 'dfb99e82740fe21006bb6972af6af610ed12edbe':
Update javadoc and hide getNameSource and getDataRoaming.
e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372 13-Jan-2015 Stuart Scott <stuartscott@google.com> Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
3fb3abd10a5980a0a5afe7f0e54f736eff84b5a5 13-Jan-2015 Junda Liu <junda@google.com> Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.

Bug: b/18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
elephonyManager.java
494601e39aa242d122406277a96fd71a5f8b46c0 13-Jan-2015 Wink Saville <wink@google.com> am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
automerge: 9482799

* commit '948279954ac88ecfd0678713158175702d981c73':
Rename reg/unreg OnSubscriptionsChangedListener.
4abdd079498801edf6d144ba6d6965d4cb00e91e 13-Jan-2015 Stuart Scott <stuartscott@google.com> Update javadoc and hide getNameSource and getDataRoaming.

Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.

bug:18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
ubscriptionInfo.java
948279954ac88ecfd0678713158175702d981c73 13-Jan-2015 Wink Saville <wink@google.com> am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev

* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
Rename reg/unreg OnSubscriptionsChangedListener.
071743f0cbbfab36150db6ec945452579d02e8dd 13-Jan-2015 Wink Saville <wink@google.com> Rename reg/unreg OnSubscriptionsChangedListener.

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
ubscriptionManager.java
a423a279f6297bb9422fc8841651348c2fcc7b7a 12-Jan-2015 sohryun.shin <sohryun.shin@lge.com> Add + code handling logic for SMS Global Roaming

When sending SMS from international CDMA NANP country, outgoing SMS is failed due to + code converting.
(Send a SMS text message: to an international phone number using the plus code (+)).

In kitkat, when user send a sms with plus code, the "+" converted to 011(NANP_IDP_STRING). And it works well.
However, in lollipop, the "+" converted to current IDP, not NANP_IDP_STRING. And it failed to send the SMS.

I think, we need to seperate SMS and Call logic like cdmaCheckAndProcessPlusCodeForSms and cdmaCheckAndProcessPlusCode.
sohryun.shin@lge.com

Change-Id: Ie9d402cbeb4de4ac30299d5820b33909d0e40320
honeNumberUtils.java
95cde2dc211f51deed6da2836d1bc7b23988782d 09-Jan-2015 Ben Gilad <gilad@google.com> API to satisfy the dependency in https://go/contacthandler1135

Bug: 17586396
Change-Id: I10bad15b4db3ec8928316507119c529c5d1f304b
honeNumberUtils.java
0d2f2fb0be4261f00e45c8ebb7999ddea8d1f9e3 06-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am 0994d12b: am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"

* commit '0994d12b0d37f81b4b5b619b82db6bc20b3b6384':
Telephony: Initialize GsmCellLocation class members properly
0994d12b0d37f81b4b5b619b82db6bc20b3b6384 06-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"

* commit 'd38218d880f02951015733a3d3e00deb546465bf':
Telephony: Initialize GsmCellLocation class members properly
e4ec09da0b4a31e23f1a19bdd1ea99e0f87cadac 21-Oct-2012 Srikanth Chintala <srikchin@codeaurora.org> Telephony: Initialize GsmCellLocation class members properly

Default values for class members mLac, mCid, mPsc would be 0.
Initialize these variables with -1 as 0 is considered as valid value.

CRs-Fixed: 406479
Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
sm/GsmCellLocation.java
6162c699ad04b5dc8878ea4c77c28be8fbbd7931 28-Dec-2014 Amit Mahajan <amitmahajan@google.com> am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev automerge: 4f68c0c
automerge: 4b2cbae

* commit '4b2cbae9cfd941633eadf9b667b3e3e0372c1ad2':
IMS: add the api to get IMS registration information.
4b2cbae9cfd941633eadf9b667b3e3e0372c1ad2 28-Dec-2014 Amit Mahajan <amitmahajan@google.com> am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev
automerge: 4f68c0c

* commit '4f68c0c1d8811d610021d97839af303c2752eff2':
IMS: add the api to get IMS registration information.
0303be4a8ac109e52b2581b7c6a94b27c581f84f 18-Dec-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: add the api to get IMS registration information.

Bug: 18668325
Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
elephonyManager.java
15c446b5e5a27fc7657942156776d460cdcbadb2 19-Dec-2014 Wink Saville <wink@google.com> am 7c580cab: am b5f1e878: Fix build breakage.
automerge: 7478d51

* commit '7478d51f7042f6b78741058668060e87ce80a703':
Fix build breakage.
7478d51f7042f6b78741058668060e87ce80a703 19-Dec-2014 Wink Saville <wink@google.com> am 7c580cab: am b5f1e878: Fix build breakage.

* commit '7c580caba94ca3b917c887b9e8353809c7f320c7':
Fix build breakage.
b5f1e878d1bc245b676a1a2504c30d21a311bf6c 19-Dec-2014 Wink Saville <wink@google.com> Fix build breakage.

I rebased a change and didn't compile, my mistake.

Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
adioAccessFamily.java
97b6ab4862839da56b4df6437b14314f74d328b6 19-Dec-2014 Wink Saville <wink@google.com> am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.
automerge: 700b8f0

* commit '700b8f080ae39345b7174deea3c8acf6e1b51972':
Update mapping between RAF and Network Type.
700b8f080ae39345b7174deea3c8acf6e1b51972 19-Dec-2014 Wink Saville <wink@google.com> am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.

* commit '57859d704ef2bc61798c172c4524596393f0beef':
Update mapping between RAF and Network Type.
1bb25d4d7b77ba8fe91beeed76e4f15e91b6bcc8 19-Dec-2014 Wink Saville <wink@google.com> am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
automerge: 7b727e2

* commit '7b727e2e0aedef50aba8e3d4081a643b79329497':
Update mapping between RAF and Network Type.
7b727e2e0aedef50aba8e3d4081a643b79329497 19-Dec-2014 Wink Saville <wink@google.com> am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev

* commit 'aa40537ca56ce386edcdaed2d21a9e2f07975812':
Update mapping between RAF and Network Type.
f73c2d1f0b6d55668c19493fba0088a69e6b128f 17-Dec-2014 Wink Saville <wink@google.com> Update mapping between RAF and Network Type.

bug:18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
adioAccessFamily.java
63c79ce4bfef7e8de7939be3de8a539938d9fc4e 19-Dec-2014 Wink Saville <wink@google.com> Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
dba700ef43ba81e8905ca883301613d6154f0b9a 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev automerge: eac6db5
automerge: ea1656f

* commit 'ea1656f408376d71b124d1ea62116862731aa4ab':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
ea1656f408376d71b124d1ea62116862731aa4ab 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> am e69b5d68: Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
automerge: eac6db5

* commit 'eac6db511b02ebf398a5e70eb70a7a5f05133945':
Change to write (create) setting+subid if it does not already exist when it is queried for the first time.
e69b5d68c2a52d867a614ff0ca378de4ec7d0f54 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to write (create) setting+subid if it does not already exist when it is queried for the first time." into lmp-mr1-dev
2a65688d40dd4f82b217b53eabc63ca41b7ad73c 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to write (create) setting+subid if it does not already exist
when it is queried for the first time.

Bug: 18791109
Change-Id: Ib9dae9401a18f1ec0eb0477486c7c7e4cb0364b0
elephonyManager.java
2e0af53de91a0ba90ea97e515ad05407f911000a 18-Dec-2014 Raph Levien <raph@google.com> am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev
automerge: 28e6910

* commit '28e691010f2990825c2e30ea244ba3bbac935725':
Preserve leading "+" in phone numbers
28e691010f2990825c2e30ea244ba3bbac935725 18-Dec-2014 Raph Levien <raph@google.com> am 51004268: am 0b6e78d9: Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev

* commit '510042688ad8ffee499974b45551cfdf528f86da':
Preserve leading "+" in phone numbers
50e922849399f12d2411a29b2199d8202087492d 16-Dec-2014 Raph Levien <raph@google.com> Preserve leading "+" in phone numbers

The normalizeNumber method in PhoneNumberUtils preserves a leading "+"
but only if it's the first character in the string. Thus it gets
dropped if there is leading punctuation such as "(". This patch
preserves the leading "+" as long as it would be the first character
in the normalized phone number.

Bug: 18418335
Change-Id: Ifcb1d3dd6c2943c729f570e7f3c90d1da9ee8b4b
honeNumberUtils.java
482b4246c25164f8a55c473acec1d2ca9a9e08d2 13-Dec-2014 Stuart Scott <stuartscott@google.com> Update mapping between RAF and Network Type.

bug:18754476
Change-Id: Ibca856fe10bc4a7dc620ab7936a70d1f0427fe56
adioAccessFamily.java
33dba3d4d381350a4ee1ce72162155c3d78093bc 15-Dec-2014 Amit Mahajan <amitmahajan@google.com> am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
automerge: 98cc133

* commit '98cc133f077ba393d6c9a6e302c3e89ade64247f':
Change to treat slotId 0 emergency numbers as default.
98cc133f077ba393d6c9a6e302c3e89ade64247f 15-Dec-2014 Amit Mahajan <amitmahajan@google.com> am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
Change to treat slotId 0 emergency numbers as default.
d060b50b331f540d42c91501d820e3c2601dec18 15-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
d9835f0c16b01847b7b3f6a1d4620912fb4206c2 12-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to treat slotId 0 emergency numbers as default.

Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
honeNumberUtils.java
6cc211669c64878942ee93f592d9c2780f9607a0 12-Dec-2014 Wink Saville <wink@google.com> am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev automerge: 6cc44cc
automerge: 05e2ada

* commit '05e2ada58a79994170e8e98ff9a619715cdddc28':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
05e2ada58a79994170e8e98ff9a619715cdddc28 12-Dec-2014 Wink Saville <wink@google.com> am 6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
automerge: 6cc44cc

* commit '6cc44cce0e375b165580a8061359b2ff163a4556':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
a54bf6583380cf328b9858d942b4c387c6163f0f 11-Dec-2014 Wink Saville <wink@google.com> Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
ubscriptionManager.java
f864e449010d18edd9a8e4594d8df27003f38fc5 11-Dec-2014 Shishir Agrawal <shishir@google.com> am 23172c70: am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd

* commit '23172c706b0422ec2cc5bb9e1988a3bd2944a257':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
23172c706b0422ec2cc5bb9e1988a3bd2944a257 11-Dec-2014 Shishir Agrawal <shishir@google.com> am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd

* commit '960dccebf576d53059fd7d026cdd1b81fb0b5974':
Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
951dcdd9404054f6b7e794b18aad6f50e44732f9 11-Dec-2014 Shishir Agrawal <shishir@google.com> Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
51090417312e46d5d8d7f7b463fa3ae40ba9dd33 10-Dec-2014 Wink Saville <wink@google.com> am 3a426694: am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev automerge: afd6f5a

* commit '3a426694ffa268b331c5b1fc5bb40460d6d883c5':
Update API and documentation for invalid subscriptions id's
3a426694ffa268b331c5b1fc5bb40460d6d883c5 10-Dec-2014 Wink Saville <wink@google.com> am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev
automerge: afd6f5a

* commit 'afd6f5a37ec4c39fffdb5f29fff7450284a3c562':
Update API and documentation for invalid subscriptions id's
eb4de87683a0d1959d64af08f3685e1b3701a314 10-Dec-2014 Wink Saville <wink@google.com> Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev
189c1808574b11b44b0d08b39426313778e27404 10-Dec-2014 Wink Saville <wink@google.com> am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
Add subId as parameter for get/setDataEnabled.
b328d72057234c2ea0bebd07f3eec5858d59469f 10-Dec-2014 Narayan Kamath <narayan@google.com> am 8ff1a5ee: am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '8ff1a5ee0df9abba4fc63bcfc93efbda4a176255':
Fix PhoneStateListener constructor javadoc.
a9f6048a94a4a7edb36955693ecba5e5c858e303 09-Dec-2014 Jeff Sharkey <jsharkey@android.com> am d5b5576d: am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

* commit 'd5b5576dd6565a61030d7769a44bd5189242a7e2':
Offer to "merge" subscribers for data usage.
5fb1118d8c8a19bbbf4abc679b55f08cdfb79ba8 26-Nov-2014 Shishir Agrawal <shishir@google.com> Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.

The calls allow us to specify MCC/MNCs (for GSM) and SIDs for CDMA that should
not be considered as roaming for the current ICCID.

Bug: 13288143

Change-Id: Iae97b02f3eb9954fedf1b005c9ecd2aa09138505
elephonyManager.java
7a4df2b7d8fc162881dd482fb13fe85c780d0351 09-Dec-2014 Wink Saville <wink@google.com> am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev

* commit '2f5cb843553a596d314596c2bb776541db864d63':
Add subId as parameter for get/setDataEnabled.
15b29ac7faf3b8b7845e6623f68ae7a7391dab78 09-Dec-2014 Wink Saville <wink@google.com> Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev
8ff1a5ee0df9abba4fc63bcfc93efbda4a176255 09-Dec-2014 Narayan Kamath <narayan@google.com> am 56206042: am bdc6cde7: Merge "Fix PhoneStateListener constructor javadoc."

* commit '5620604261a24419bb87a4540f1a4ff333d32a3f':
Fix PhoneStateListener constructor javadoc.
88bf9bcb49b4a3725532fd56708a3c0607b268e2 09-Dec-2014 Ihab Awad <ihab@google.com> am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev

* commit '657f25e9641e7c546032adf90b9c4bdaef36eab9':
Add Text-to-Speech annotations for phone number displays (1/3)
85ca687df82e36497278b34e58dce4dd373daf32 09-Dec-2014 Stuart Scott <stuartscott@google.com> am 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev

* commit '6b0025ea7ca0e7343ee95bc622261b2f3e86012a':
Add mapping between RAT and Network Mode
98513d7bd44fe9ce14733c8162544c2114f8f21b 08-Dec-2014 Wink Saville <wink@google.com> Update API and documentation for invalid subscriptions id's

Bug: 18668873
Change-Id: I3ee987b77fef856e97ea09898c695147cb87a517
ubscriptionManager.java
d5b5576dd6565a61030d7769a44bd5189242a7e2 08-Dec-2014 Jeff Sharkey <jsharkey@android.com> am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev

* commit '5b41696c56c124124d48168227a83b63bd55aea7':
Offer to "merge" subscribers for data usage.
657f25e9641e7c546032adf90b9c4bdaef36eab9 08-Dec-2014 Ihab Awad <ihab@google.com> am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev

* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
Add Text-to-Speech annotations for phone number displays (1/3)
6b0025ea7ca0e7343ee95bc622261b2f3e86012a 08-Dec-2014 Stuart Scott <stuartscott@google.com> am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev

* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
Add mapping between RAT and Network Mode
3256601f5e4d94713f59e97b9d4912875c1bdcaf 03-Dec-2014 Jeff Sharkey <jsharkey@android.com> Offer to "merge" subscribers for data usage.

There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective. This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included. When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface. Also correctly create default policies for multi-SIM
devices. This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent. (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
ubscriptionManager.java
elephonyManager.java
69d3e55193f973b92d08ce78e496ae9d9f4a89d1 27-Nov-2014 Karol Wrótniak <karol.wrotniak@droidsonroids.pl> Fix PhoneStateListener constructor javadoc.

Removed sentence in visible javadoc of #PhoneStateListener() which
was useless because it referred to another hidden constructor.

Change-Id: I14a956ac29881000e48bf31e0090e9e1f93bf6e3
honeStateListener.java
0855e7aea22e863f21a546b87acf38b7c3912e2e 05-Dec-2014 Ihab Awad <ihab@google.com> Add Text-to-Speech annotations for phone number displays (1/3)

Bug: 17321294
Change-Id: Id7e48e683694e2f9ea2a7dd7fa7d69acc727489d
honeNumberFormattingTextWatcher.java
honeNumberUtils.java
997ddc8e3e4b9d4daa65294dbd5cc3ecfb79c101 05-Dec-2014 Stuart Scott <stuartscott@google.com> Add mapping between RAT and Network Mode

bug:18416275
bug:18415493

Change-Id: I0b29ec953ec9eb29248a22d582013127ee0fea41
adioAccessFamily.java
36ffb0494dd1045c164b7479b68165e206f8c759 05-Dec-2014 Wink Saville <wink@google.com> Add subId as parameter for get/setDataEnabled.

Bug: 18279333
Change-Id: I2496a2fd92b154e5e6981cbf6b5b5939cda59122
elephonyManager.java
6abe46c472b189dfa05b5ab9c0debea7b0308f7b 04-Dec-2014 Wink Saville <wink@google.com> am 58a3561f: am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev

* commit '58a3561f74204a3c4cf913169ebc990ca9c0db28':
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
58a3561f74204a3c4cf913169ebc990ca9c0db28 04-Dec-2014 Wink Saville <wink@google.com> am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev

* commit '0304c529b6a166547aaf104a46bc876780ba7416':
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values
48af2cf8cdfb2fb8d2cce37ee05d1705729131de 04-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
Separate voice/data roaming state and type
83c0b096b775e7b39f89c2da1c9a8193555c0178 04-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '98f81182fb61953e0712bd788941710b6ad842c2':
Separate voice/data roaming state and type
82611e6d9c48a1a9b5d8b37b25425b7d7354ef4f 04-Dec-2014 Wink Saville <wink@google.com> Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev
647b437d0772a8c73ac3936b2f8e69d4bd1953d3 03-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Separate voice/data roaming state and type" into lmp-mr1-dev
47920fac33efb7ce4bf33a5691e4af1b67ab6019 03-Dec-2014 Wink Saville <wink@google.com> Add getSimStateForSubscriber and additional SIM_STATE_XXXX values

Bug: 18364932
Change-Id: I836b751a443635efcfb9987bb3b91f55c4dff9d6
ubscriptionManager.java
elephonyManager.java
cacd99bd2cbfad3bfd78bef3d4c612ddda2e2ad7 03-Dec-2014 Stuart Scott <stuartscott@google.com> am cc4cd6e1: am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

* commit 'cc4cd6e1abe81d1edda7f1489dbd26298d38a699':
Subscription Info density-dependent text size and localized SIM slot index
cc4cd6e1abe81d1edda7f1489dbd26298d38a699 02-Dec-2014 Stuart Scott <stuartscott@google.com> am 15b2d9ab: am 4e779ecd: Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev

* commit '15b2d9ab44690156e067020e12b329997ef5bba6':
Subscription Info density-dependent text size and localized SIM slot index
4e779ecd56faad5901854e030f593c5d4ad3dee8 02-Dec-2014 Stuart Scott <stuartscott@google.com> Merge "Subscription Info density-dependent text size and localized SIM slot index" into lmp-mr1-dev
e6edb161a78bc9836821fa44fb7e4c81d0a2c1c3 18-Jul-2014 Jing Zhao <zhaojing@motorola.com> Separate voice/data roaming state and type

It is possible for voice and data to register on different networks so
that the roaming state for them could be different. Provide separated
APIs to handle voice and data roaming.

Also, add the configuration of CDMA international roaming indicators.

Bug: 17318123
Change-Id: Iede9132cbf94bc9971702bd9232374585edd5cd0
erviceState.java
b27dbd21510707bcb7957ce587f206b062eba5df 02-Dec-2014 Junda Liu <junda@google.com> am 92205a33: am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev

* commit '92205a33655f8a4f487e8d85a9d6d151d0db21a1':
Add hasMatchedTetherApnSetting to telmgr API.
92205a33655f8a4f487e8d85a9d6d151d0db21a1 02-Dec-2014 Junda Liu <junda@google.com> am 50e2d6c2: am ef6178a9: Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev

* commit '50e2d6c2ce079c00531ecbcf112593cb0263e47a':
Add hasMatchedTetherApnSetting to telmgr API.
ef6178a99c57b6de3dc02455e570f932b154b8e1 02-Dec-2014 Junda Liu <junda@google.com> Merge "Add hasMatchedTetherApnSetting to telmgr API." into lmp-mr1-dev
688b10733007a9587ebd8d87a68bc5f892bba34e 01-Dec-2014 Shishir Agrawal <shishir@google.com> am 7158dfb1: am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev

* commit '7158dfb1be1689282e0014bd779b7510e85022c8':
TelephonyManager.setLine1NumberForDisplay should return a boolean.
7158dfb1be1689282e0014bd779b7510e85022c8 01-Dec-2014 Shishir Agrawal <shishir@google.com> am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev

* commit '592707c5250655cbed2b48848701b288605c01ac':
TelephonyManager.setLine1NumberForDisplay should return a boolean.
0201a6f6f16a872405a5f9ee65026e948eb162d0 01-Dec-2014 Shishir Agrawal <shishir@google.com> TelephonyManager.setLine1NumberForDisplay should return a boolean.

The call can fail and should return the success status of the call.

Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
elephonyManager.java
cf45709e5c14aaaf5a4d91e99118f7e9f2dac133 01-Dec-2014 Amit Mahajan <amitmahajan@google.com> am 719638af: am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev

* commit '719638afea79a3cee77fc75c4c54d36de2ca44a5':
Change to use DATA_ROAMING setting correctly with subId.
719638afea79a3cee77fc75c4c54d36de2ca44a5 01-Dec-2014 Amit Mahajan <amitmahajan@google.com> am b957d11a: am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev

* commit 'b957d11a5375e05b4e6c06c4c8d472d3c472caf7':
Change to use DATA_ROAMING setting correctly with subId.
7151cde3ca742d24ea97f163526519b83431c87e 21-Nov-2014 Stuart Scott <stuartscott@google.com> Subscription Info density-dependent text size and localized SIM slot index

Change-Id: I49fed470ea82c91ff7d77df2c3447b17a203a38d
ubscriptionInfo.java
bc2f1371bbeb0f66c24fafec22b9b18ca6e845cd 26-Nov-2014 Amit Mahajan <amitmahajan@google.com> am 65940c4c: am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev

* commit '65940c4ceb43e81aa720a29a9bb84818bdaabcbc':
Adding helper functions to retrieve settings that are stored per subId.
65940c4ceb43e81aa720a29a9bb84818bdaabcbc 26-Nov-2014 Amit Mahajan <amitmahajan@google.com> am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev

* commit '476520f744a950fc27d6ac466c301a909d92481a':
Adding helper functions to retrieve settings that are stored per subId.
5ed82c8ca040a7afd0bc4497b85584c163d6bb8d 26-Nov-2014 Amit Mahajan <amitmahajan@google.com> Change to use DATA_ROAMING setting correctly with subId.

Bug: 18466745
Change-Id: Ib2d7979d164ca3cf32c6619340fae1dc578ca686
elephonyManager.java
3749541a206390054b22d5f5bddc1b43f348f433 25-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev
421a53900dbdfabb5ab7b6cf6da798ac64bbaa87 20-Nov-2014 Amit Mahajan <amitmahajan@google.com> Adding helper functions to retrieve settings that are stored per subId.

Bug: 18392680
Change-Id: I360bc19c4501020afd9dfa1cfb7e66ce2fad9536
elephonyManager.java
5c11e41b1af60aaaf606b3a9f190edcaba1c5e41 24-Nov-2014 Wink Saville <wink@google.com> am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

* commit 'b4c5410987a6657b71fb0b86e1ef8337628241dc':
Additional changes to SubscriptionManager API as per API council.
b4c5410987a6657b71fb0b86e1ef8337628241dc 24-Nov-2014 Wink Saville <wink@google.com> am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
Additional changes to SubscriptionManager API as per API council.
d09c4cad65c708f2c4810d24295456708a2000d2 22-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
honeStateListener.java
ubscriptionInfo.java
ubscriptionListener.java
ubscriptionManager.java
elephonyManager.java
38531581fc19f9172fabe56047b326e5dab88625 28-Oct-2014 Junda Liu <junda@google.com> Add hasMatchedTetherApnSetting to telmgr API.

Bug: b/18158411
Change-Id: Id1285b79194ad21fb728fd18fb09026e51354656
elephonyManager.java
b638b35757021fc605d0891592b70fa42c1fb475 21-Nov-2014 Wink Saville <wink@google.com> am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 1caab41

* commit '49414b5b2129bf72a847c64a9f83e7b7db4511c0':
Revert "Additional changes to SubscriptionManager API as per API council."
771e952ebce561a8f4805611585001433b95e2a4 21-Nov-2014 Wink Saville <wink@google.com> am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 68c21d6

* commit '07fb24576a5a425798a2aa004dd49682f414cbf7':
Additional changes to SubscriptionManager API as per API council.
49414b5b2129bf72a847c64a9f83e7b7db4511c0 21-Nov-2014 Wink Saville <wink@google.com> am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
automerge: 1caab41

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
Revert "Additional changes to SubscriptionManager API as per API council."
07fb24576a5a425798a2aa004dd49682f414cbf7 21-Nov-2014 Wink Saville <wink@google.com> am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
Additional changes to SubscriptionManager API as per API council.
3e8a9053dcc72631f546ca454fd7eac386fcd2e6 21-Nov-2014 Shishir Agrawal <shishir@google.com> am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev
automerge: 84b988e

* commit '84b988e6eea690c33e5f08b3a7f41d3a8cd8d912':
Carrierprivileges: Addressing API council suggestions.
84b988e6eea690c33e5f08b3a7f41d3a8cd8d912 21-Nov-2014 Shishir Agrawal <shishir@google.com> am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev

* commit '0783a61d8a6f17ca0fe3d0e55a3c48aceec823d4':
Carrierprivileges: Addressing API council suggestions.
816e19eb6d5795f98f072494c763b20fe3412c30 20-Nov-2014 Wink Saville <wink@google.com> Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
2d1ee982276f5dbd0e035778b731b48e4ef34515 20-Nov-2014 Wink Saville <wink@google.com> Revert "Additional changes to SubscriptionManager API as per API council."

This reverts commit baf21da1e17ef358632c078128d381b3be218a08.

Change-Id: I73cbdfadf07ca3cf20b042781b62aafcc72b17d6
honeStateListener.java
ubscriptionListener.java
ubscriptionManager.java
elephonyManager.java
4a57e908177c86819ade1ebb813677698f1a526a 20-Nov-2014 Wink Saville <wink@google.com> Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
a9b67771547a89ad08ffb5008adb89dde4009d9a 20-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev
baf21da1e17ef358632c078128d381b3be218a08 20-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
honeStateListener.java
ubscriptionListener.java
ubscriptionManager.java
elephonyManager.java
ab57c29092eb9185375de86d82ff32e6079f5cec 18-Nov-2014 Shishir Agrawal <shishir@google.com> Carrierprivileges: Addressing API council suggestions.

- hasCarrierPrivileges - renamed to getCarrierPrivilegeStatus
- setLine1NumberForDisplay should not be usable by apps that have MODIFY_PHONE_STATE
- setVoiceMailNumber should not be usable by apps that have MODIFY_PHONE_STATE
- setOperatorBrandOverride should not be usable by apps that have MODIFY_PHONE_STATE

Not addressed:
- setGlobalPreferredNetworkType() should not be usable by apps that have MODIFY_PHONE_STATE

The underlying call is needed by system apps (OMADM) too.

Bug: 18356155
Change-Id: Idc6468a0bd0b0c52b9de1d8446f98c90ac0b3238
elephonyManager.java
5cb315fd0fc2086de74ce90e5f40d0d9369519c6 18-Nov-2014 Amit Mahajan <amitmahajan@google.com> am 51064ec6: am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev

* commit '51064ec6f0f75eb03f86d3b3fa091c857d603506':
Telephony: STK CC feature implementation
51064ec6f0f75eb03f86d3b3fa091c857d603506 18-Nov-2014 Amit Mahajan <amitmahajan@google.com> am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev

* commit 'ca1e3e5e830c1e2eb63a3653117bb6c9c0589ebe':
Telephony: STK CC feature implementation
d4180cc2d43989647dccf96bd85a9f208d01d209 19-Oct-2012 Preeti Ahuja <preetia@codeaurora.org> Telephony: STK CC feature implementation

Add strings and constants required for stk cc feature.

Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
isconnectCause.java
585ad040a173304602ab971e47884731af8afc5e 18-Nov-2014 Shishir Agrawal <shishir@google.com> am b9b2aa2f: am 2f74e913: am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev

* commit 'b9b2aa2f19de547ad0804389e8e18dd20828ec86':
Add new API to set voicemail number.
b9b2aa2f19de547ad0804389e8e18dd20828ec86 18-Nov-2014 Shishir Agrawal <shishir@google.com> am 2f74e913: am c9f1b3a0: Merge "Add new API to set voicemail number." into lmp-mr1-dev

* commit '2f74e913c85ccb405e4fe18a8f3c4c90153663a8':
Add new API to set voicemail number.
c9f1b3a0e8f64ae75f71e363c612b8734031b1b2 18-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "Add new API to set voicemail number." into lmp-mr1-dev
0c29f1b8321168afb588245b7b289d5ebfc29476 17-Nov-2014 Stuart Scott <stuartscott@google.com> am a7697fa8: am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev

* commit 'a7697fa81fc0682494a80e0435cb47c38ad7cbe7':
Updating Subscription Info Icon
a7697fa81fc0682494a80e0435cb47c38ad7cbe7 17-Nov-2014 Stuart Scott <stuartscott@google.com> am 343a88da: am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev

* commit '343a88da1b93642f8d8b75f7de43918378b573f8':
Updating Subscription Info Icon
da5be611d88c40bdb4299fa0d7fa446230035e0d 11-Nov-2014 Stuart Scott <stuartscott@google.com> Updating Subscription Info Icon

bug: 18356155

Change-Id: I8d944e9b547701d51a9c58709cb9777a07c5227e
ubscriptionInfo.java
c78e44e02543a1411f19a43335530fb3fee8bb11 13-Nov-2014 Andrew Lee <anwlee@google.com> am 38f99e55: am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev

* commit '38f99e55d561e8bc7a5a5cbcfd518621d70994f0':
Add telephony.DisconnectCause for merged IMS call.
38f99e55d561e8bc7a5a5cbcfd518621d70994f0 13-Nov-2014 Andrew Lee <anwlee@google.com> am 49b03c23: am 990bbbb3: Merge "Add telephony.DisconnectCause for merged IMS call." into lmp-mr1-dev

* commit '49b03c2374d035524908251113d27733219e9323':
Add telephony.DisconnectCause for merged IMS call.
840162d2b412af9a90b3ab41eb9f7c9de18772f7 13-Nov-2014 Andrew Lee <anwlee@google.com> Add telephony.DisconnectCause for merged IMS call.

When merged, IMS calls are consolidated into one call. Thus they
"disconnect", even though the user can continue to comminucate
with the party on that call.

We want to recognize this scenario so we can control relevant
behaviors (ie.don't play the "end call" tone in this case).

Bug: 18291234
Change-Id: I93247f88ed74467470504bec88fcfb7ed714f0ff
isconnectCause.java
5c1a63c2235c36ce0b520fa88a9d21ffe255756e 10-Nov-2014 Shishir Agrawal <shishir@google.com> Add new API to set voicemail number.

The API is protected by system or carrier privilege.

Bug: 17393589
Change-Id: I33f4a00b30e0f5d72e5d53553a187d974872eab6
elephonyManager.java
f78c50e6dae1dd760ccf2dcba60673fa74a36c86 12-Nov-2014 Wink Saville <wink@google.com> am 93fc415e: Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30 automerge: e76308c

* commit '93fc415e6219f59a5b1f2d6fd5e1647551a27742':
Update SubscriptionManager API as per API council.
5b7dbca7ca3dc82dc6267eead409e5a2a876c8c5 12-Nov-2014 Junda Liu <junda@google.com> am 829519df: Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f automerge: 5716ebe

* commit '829519dfaab9f2c13492d97556a95300a6908ea4':
Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
93fc415e6219f59a5b1f2d6fd5e1647551a27742 12-Nov-2014 Wink Saville <wink@google.com> Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 43bbf30
automerge: e76308c

* commit 'e76308c5d62984132192119f3d0bc407f89a2100':
Update SubscriptionManager API as per API council.
829519dfaab9f2c13492d97556a95300a6908ea4 12-Nov-2014 Junda Liu <junda@google.com> Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f
automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
43bbf30a06a2aee05db9b80b287672017fbada5c 12-Nov-2014 Wink Saville <wink@google.com> Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev
2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4 12-Nov-2014 Junda Liu <junda@google.com> Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev
a374c3d03b28f135cdfba2cadf6fe6f03ac010bd 11-Nov-2014 Wink Saville <wink@google.com> Update SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
ubInfoRecord.aidl
ubInfoRecord.java
ubscriptionInfo.aidl
ubscriptionInfo.java
ubscriptionListener.java
ubscriptionManager.java
870338c946bf79536e543c19c92745bef047a0ec 08-Nov-2014 Stuart Scott <stuartscott@google.com> am bc1d9755: am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev

* commit 'bc1d97556d32a45ceca5db3e2af12cd3d4cf5590':
SubInfoRecord provides a tinted icon with the initial embossed.
bc1d97556d32a45ceca5db3e2af12cd3d4cf5590 08-Nov-2014 Stuart Scott <stuartscott@google.com> am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev

* commit '0e58219f7fbb3f39af109e0fa6c7ed8c47ee9f3b':
SubInfoRecord provides a tinted icon with the initial embossed.
ab45ec177a787fee046f6a9c4d1098d529aff7bb 28-Oct-2014 Stuart Scott <stuartscott@google.com> SubInfoRecord provides a tinted icon with the initial embossed.

bug: 17575308
Change-Id: I895975dfe8d1c4db8381ef9322bd72c8fcb3e22c
ubInfoRecord.java
ubscriptionManager.java
bbdc1c0e044a505d5a200963319a683e4ef1f967 07-Nov-2014 Junda Liu <junda@google.com> Add HIDE_CARRIER_NETWORK_SETTINGS global setting.

Also remove hidden APIs to get/set the preference.

Bug: b/17673255
Change-Id: I8957b0380bf617c953f6665cbfdcc77c3be78411
elephonyManager.java
da30cd5434e47ed90027b9c1ed5510ad9e07e5ab 07-Nov-2014 Sanket Padawe <sanketpadawe@google.com> am d0062dea: am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev
automerge: 0872f2e

* commit '0872f2ee34000dcbafff8d3c0b8e93b23ac4d076':
API changes to add carrier name to subinforecord
0872f2ee34000dcbafff8d3c0b8e93b23ac4d076 07-Nov-2014 Sanket Padawe <sanketpadawe@google.com> am d0062dea: am d227b4aa: Merge "API changes to add carrier name to subinforecord" into lmp-mr1-dev

* commit 'd0062deacc3edcab2aa0b9da94d6605f2080ef66':
API changes to add carrier name to subinforecord
e1013f964dc4eeb28521ed860005e1e21907b0ff 07-Nov-2014 Sanket Padawe <sanketpadawe@google.com> API changes to add carrier name to subinforecord

API changes required to add carrier name of sim as a member of subinforecord.

Change-Id: I08a7f53dc012967005f7b5abd1fbc08f2947da67
ubInfoRecord.java
ubscriptionManager.java
1af72bff509bb2638c2d7a1309dbf3f03736e6fd 06-Nov-2014 Stuart Scott <stuartscott@google.com> am 843133cd: am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8

* commit '843133cd835b2923453bba95599aefa48fe8cb20':
Fix NPE when parceling SubInfoRecord
843133cd835b2923453bba95599aefa48fe8cb20 06-Nov-2014 Stuart Scott <stuartscott@google.com> am a6fc3b1a: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: c7f1ae8

* commit 'a6fc3b1a4bc6e6da5902335273b544b577823411':
Fix NPE when parceling SubInfoRecord
bc6a9601d78ae0227d494a2684146dc9e32010d1 06-Nov-2014 Stuart Scott <stuartscott@google.com> Fix NPE when parceling SubInfoRecord

bug:18256375
Change-Id: I3567f98aeb82b5c0a11060319186460678661bb2
ubInfoRecord.java
35d07c0d562caa7916c8e347f0488eb7ef5d0e85 05-Nov-2014 Stuart Scott <stuartscott@google.com> am 1e5275da: am fc1e8477: am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev

* commit '1e5275da2f04758c4857494dad4fafcae8383144':
Use CharSequence for DisplayName
1e5275da2f04758c4857494dad4fafcae8383144 05-Nov-2014 Stuart Scott <stuartscott@google.com> am fc1e8477: am 8585e0dd: Merge "Use CharSequence for DisplayName" into lmp-mr1-dev

* commit 'fc1e84777c957bb094f793f8d286e873d070e7e0':
Use CharSequence for DisplayName
8b564c2af85c0f796a2396055c0c3e59a4249c7b 04-Nov-2014 Stuart Scott <stuartscott@google.com> Use CharSequence for DisplayName

Change-Id: Ibb93424b85b11913282a4980e756b66a8d7946d5
ubInfoRecord.java
f5845fb75697e1c6f4cff379a27b2bf37b22f2fc 04-Nov-2014 Stuart Scott <stuartscott@google.com> am a93dee63: am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89

* commit 'a93dee63de4ce37343577e171571ac9e1d6effa0':
Clean up public API of SubInfoRecord.
a93dee63de4ce37343577e171571ac9e1d6effa0 04-Nov-2014 Stuart Scott <stuartscott@google.com> am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89

* commit '9017e0613271d35dc4ea1a011268e1cf0165c907':
Clean up public API of SubInfoRecord.
95fc99b33418f228aa0390032ad466814d33b164 30-Oct-2014 Stuart Scott <stuartscott@google.com> Clean up public API of SubInfoRecord.

bug: 17575308
Change-Id: I047ce11fb7835d500652b7ef340a30c052e96b21
ubInfoRecord.java
ubscriptionManager.java
c79e91a69866007f26a1372f0b41f4927766075a 31-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 0c8f8980: am 30e51130: Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev automerge: 40d7655

* commit '0c8f8980f6094bad867bd91910f584875fa10193':
Improve a calculation method for LTE antenna reception level
0c8f8980f6094bad867bd91910f584875fa10193 31-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 30e51130: Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev
automerge: 40d7655

* commit '40d7655026ae25c776a3449af9c661a7f59b5440':
Improve a calculation method for LTE antenna reception level
30e5113000877e053ba4f30b5962a42a4d11fa6e 31-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Improve a calculation method for LTE antenna reception level" into lmp-mr1-dev
c962b1dcfb4bb06d87b5cdcceecc359d5e221eda 27-Feb-2013 Kensuke Ueda <uedake@nttdocomo.co.jp> Improve a calculation method for LTE antenna reception level

RSRP value thresholds is relatively high compared with
other mobile phone platforms, which make android seems
low sensitive to radio. This patch sets better thresholds.

Bug: 17891524
Change-Id: I502e1c3d08b2a52c51fe93da9b77476ac827a25b
ignalStrength.java
34378f3c5db2a712c8a5c42e815fa430d2556751 31-Oct-2014 Nancy Chen <nancychen@google.com> am 6a44c194: am e1678ddf: Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev automerge: 346f907

* commit '6a44c194e7a40af82918cf31d44c00d30e92fa24':
Handle MMI for multi-SIM (1/3)
6a44c194e7a40af82918cf31d44c00d30e92fa24 31-Oct-2014 Nancy Chen <nancychen@google.com> am e1678ddf: Merge "Handle MMI for multi-SIM (1/3)" into lmp-mr1-dev
automerge: 346f907

* commit '346f9070a45798d3edf38b4abaf39600630dd403':
Handle MMI for multi-SIM (1/3)
95e8a679335648388988337fcf08eac325768318 17-Oct-2014 Nancy Chen <nancychen@google.com> Handle MMI for multi-SIM (1/3)

+ Add Telecomm and Telephony methods for handlePinMMIForSubscriber
+ Add Select Account dialog in Dialer for MMI

Bug: 17917937

Change-Id: I26fdc68a07ca0483bf7a052598fe31b1461fd486
elephonyManager.java
305b15fe399b0e11e5ed04329c88c996cfe28de9 30-Oct-2014 Sanket Padawe <sanketpadawe@google.com> am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev
automerge: ef87aff

* commit 'ef87affff7056d600e137d098995064d698ec0ab':
Remove checks to support new sim color selection.
ef87affff7056d600e137d098995064d698ec0ab 30-Oct-2014 Sanket Padawe <sanketpadawe@google.com> am 1ba2b168: am 52f811ec: Merge "Remove checks to support new sim color selection." into lmp-mr1-dev

* commit '1ba2b168c0397e833272acbb4b7b8334e1789a6e':
Remove checks to support new sim color selection.
d95198eb36d483749f1a782e5f61a1684dcf0df2 28-Oct-2014 Sanket Padawe <sanketpadawe@google.com> Remove checks to support new sim color selection.

Remove checks to support new sim color selection in multi-sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
ubscriptionManager.java
831296e84f5929637d437a4b9a9cf7e1d9d539e9 28-Oct-2014 Wink Saville <wink@google.com> am ae85478d: am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev automerge: e5b4c12

* commit 'ae85478d3dbed145825293c307bde4213ff175f3':
Change subId to int from long
ae85478d3dbed145825293c307bde4213ff175f3 27-Oct-2014 Wink Saville <wink@google.com> am 4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
automerge: e5b4c12

* commit 'e5b4c1219a32a086508d83101c10605dd894e4d2':
Change subId to int from long
63f03dd94c43c22f2c77306059b5748e5e1e0e3c 23-Oct-2014 Wink Saville <wink@google.com> Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
honeNumberUtils.java
honeStateListener.java
ubInfoRecord.java
ubscriptionManager.java
elephonyManager.java
84300978a26b4eb0610f4362fe008c187f114c2e 24-Oct-2014 Nancy Chen <nancychen@google.com> am 968c16ce: am 12be45d7: am 9016ecab: am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev

* commit '968c16ce6dec72cb68618c28e6e4709bb0c5f8ca':
Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
968c16ce6dec72cb68618c28e6e4709bb0c5f8ca 24-Oct-2014 Nancy Chen <nancychen@google.com> am 12be45d7: am 9016ecab: am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev

* commit '12be45d7c48bf3c0722a794bb44c37b7264e7244':
Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
9016ecab3be175dace3e1ad3e1c8558fef1a4720 23-Oct-2014 Nancy Chen <nancychen@google.com> am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev

* commit '0145e17db742dff963ea581bc944f99358d2dace':
Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
3ace54b895c97f0e98e989667238be9c96c3b40c 23-Oct-2014 Nancy Chen <nancychen@google.com> Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.

Settings and Dialer need label, icon, and color for UI display of
subscriptions/SIMs. Add getters for these methods in SubInfoRecord. Sets
up for the following changes:
+ getIcon will return a drawable instead of a resource ID
+ getColor will return a color value instead of an index
PhoneAccount will also be adding these changes which will be adopted
from SubInfoRecord. Adds changes that were reverted from ag/563976.

Bug: 17971273
Change-Id: Ie2beedf8475c6deb48a6ab83bc9656c1142cc004
ubInfoRecord.java
c79a9311b5b8ac91d855c5864326ae91c93dba3d 22-Oct-2014 Andrew Lee <anwlee@google.com> am ba2f181a: am 74af6700: Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev
automerge: e56ad3e

* commit 'e56ad3edddd39cc4f9c0e9f9a12abb247cf3ab92':
Add video calling setting to TelephonyManager.
e56ad3edddd39cc4f9c0e9f9a12abb247cf3ab92 21-Oct-2014 Andrew Lee <anwlee@google.com> am ba2f181a: am 74af6700: Merge "Add video calling setting to TelephonyManager." into lmp-mr1-dev

* commit 'ba2f181aa1607e9bd2bf1b723dac8a6c855fab14':
Add video calling setting to TelephonyManager.
4a3084a46d80383c528198a48da5c327d7d08a00 18-Oct-2014 Andrew Lee <anwlee@google.com> Add video calling setting to TelephonyManager.

We want to add a user setting to enable/disable video calling. This
is a telephony-level setting which the user sets using Telephony's
Call Settings, and applies universally to video calls.

But this setting needs to be accessible in places such as Dialer,
so these changes are to support storing the setting in
TelephonyManager (to be implemented in PhoneInterfaceManager) and
providing access to the setting for applications like Dialer
through TelephonyManager.

+ Add function definitions to ITelephony.
+ Add function wrapper implementations in TelephonyManager.

Bug: 16014284
Change-Id: I1dce8bf5ae4f0ee115698ce9627ba8fc424dd855
elephonyManager.java
be11d12462c800d3a7770b2871b1c31128f688fd 20-Oct-2014 Wink Saville <wink@google.com> am f9bec04d: am f4d86a1d: am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev

* commit 'f9bec04d89ce6270d71b738be341f3e443abcce5':
Radio Capability Support.
f9bec04d89ce6270d71b738be341f3e443abcce5 20-Oct-2014 Wink Saville <wink@google.com> am f4d86a1d: am f44628e3: am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev

* commit 'f4d86a1dd9d758f9479a7d486e610930266205d0':
Radio Capability Support.
f44628e3133a6bffd225836b1fff23cd827938a7 20-Oct-2014 Wink Saville <wink@google.com> am 6bacccbf: Merge "Radio Capability Support." into lmp-sprout-dev

* commit '6bacccbfbcdc7952bac7e25c3e3f2d6a6151a215':
Radio Capability Support.
2af2d57d578e0c3a2740628e7c6336b19961cc49 18-Oct-2014 Wink Saville <wink@google.com> Radio Capability Support.

New design of capability switch for L.
Add new RIL requests:
RIL_REQUEST_GET_RADIO_CAPABILITY
RIL_REQUEST_SET_RADIO_CAPABILITY
RIL_UNSOL_RADIO_CAPABILITY

These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.

It can support 2/3/4G switch and has flexible architecture to support
future technology.

Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
adioAccessFamily.aidl
adioAccessFamily.java
47aef501e4a78c8a8401214b57d6efcb5596e62f 16-Oct-2014 xinhe <xinhe@google.com> am 1ee96040: am 1a352f4f: am 36eaa869: Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev

* commit '1ee96040327b2174b18669313c70935276a5158c':
Sprint: MMS proxy authorization does not include NAI
1ee96040327b2174b18669313c70935276a5158c 16-Oct-2014 xinhe <xinhe@google.com> am 1a352f4f: am 36eaa869: Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev

* commit '1a352f4f6b68f5a22baaed3545d5e8d601616019':
Sprint: MMS proxy authorization does not include NAI
6bb21401a4e7c8d1ed4f60a5b1572ce78b5311f6 15-Oct-2014 xinhe <xinhe@google.com> Sprint: MMS proxy authorization does not include NAI

Read the NAI from CSIM and pass it to MMS module
Bug:17752727

Change-Id: Ib7f53bed87183bd9e67103c676218b5748be668f
elephonyManager.java
932408820a87a851cae2fbeda1849fdfcc235cdb 11-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 6e51a36a: am 7c2b29ac: am 1ea2aeda: am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

* commit '6e51a36a97f6e0c4868a7ddd32884d93a583d76e':
Fix to show low LTE signal strength as -140 instead of 0.
6e51a36a97f6e0c4868a7ddd32884d93a583d76e 11-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 7c2b29ac: am 1ea2aeda: am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

* commit '7c2b29ac45342074ec74860d6ba4a66bc8a8de5f':
Fix to show low LTE signal strength as -140 instead of 0.
1ea2aeda29a247de56e7991d16a4ae12d9aff8f1 11-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

* commit '589a4896b0c45f03604db1eb0292ef1c936adaff':
Fix to show low LTE signal strength as -140 instead of 0.
589a4896b0c45f03604db1eb0292ef1c936adaff 11-Oct-2014 Amit Mahajan <amitmahajan@google.com> am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

* commit 'c6c18618e999f24675e23b67e6c488d700199579':
Fix to show low LTE signal strength as -140 instead of 0.
b5c78682ad79be7b7c53cf8a8450ed485cf610e6 10-Oct-2014 Amit Mahajan <amitmahajan@google.com> Fix to show low LTE signal strength as -140 instead of 0.

Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
ignalStrength.java
5fef96c5a6c8aa6e4bac9d4266863bb1f4baeb00 11-Oct-2014 Etan Cohen <etancohen@google.com> am eaecf6a2: am d5ea3240: am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.

* commit 'eaecf6a2c98169534dc8d4bd98099b3731b67b1d':
TD_SCDMA is more like GSM than CDMA - re-classifying.
eaecf6a2c98169534dc8d4bd98099b3731b67b1d 10-Oct-2014 Etan Cohen <etancohen@google.com> am d5ea3240: am c3f8a8b1: am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.

* commit 'd5ea324063b2dedc844b1aca65d485b03196a6a1':
TD_SCDMA is more like GSM than CDMA - re-classifying.
c3f8a8b1ec788a65c247203ddb268a9acc634ab7 10-Oct-2014 Etan Cohen <etancohen@google.com> am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.

* commit '4354e6046e4a35b2f35348c6c131fdd600ac26af':
TD_SCDMA is more like GSM than CDMA - re-classifying.
4354e6046e4a35b2f35348c6c131fdd600ac26af 09-Oct-2014 Etan Cohen <etancohen@google.com> am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.

* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
TD_SCDMA is more like GSM than CDMA - re-classifying.
5e5bc4b13cd1fc657da940c14e2333d8d3b18080 09-Oct-2014 Etan Cohen <etancohen@google.com> TD_SCDMA is more like GSM than CDMA - re-classifying.

Bug: 17788412
Change-Id: Icc6a692a1f038624dde772f8d8f197aab604c166
erviceState.java
7584f634fc6543724b827cdebce5619b9be72b3c 03-Oct-2014 Etan Cohen <etancohen@google.com> am fe980464: am 3b73c5c3: am 53fbb02d: am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

* commit 'fe9804649430b24e2b86be516b854786ff740d5d':
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
fe9804649430b24e2b86be516b854786ff740d5d 03-Oct-2014 Etan Cohen <etancohen@google.com> am 3b73c5c3: am 53fbb02d: am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

* commit '3b73c5c3cfc9754358ba1f4c49582d303fd04d8a':
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
53fbb02d6d15be0e0466ad713b6bca6dd2f2dd08 02-Oct-2014 Etan Cohen <etancohen@google.com> am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

* commit 'b3a29067e956c05fd9f01bb31ae4101b43b95948':
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
b3a29067e956c05fd9f01bb31ae4101b43b95948 02-Oct-2014 Etan Cohen <etancohen@google.com> am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

* commit '81e3e4724d2c506bf9e920fd253c54a0bbd38706':
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
6415fba31c63cc222a8bba762a6088b5cc33c231 02-Oct-2014 Etan Cohen <etancohen@google.com> Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.

Bug: 17784975
Change-Id: Ic887477fac1d45f547e30ed6e3c1158fb9a3b893
erviceState.java
4caa333b832fb7efdda2cdcc8bb440f846939d58 30-Sep-2014 Stuart Scott <stuartscott@google.com> am 3aacaac3: am a541338a: am ec89863a: am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev

* commit '3aacaac344d3bc9699d8dbb89094867310417725':
Get the MCC/MNC using defaults.
3aacaac344d3bc9699d8dbb89094867310417725 30-Sep-2014 Stuart Scott <stuartscott@google.com> am a541338a: am ec89863a: am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev

* commit 'a541338a1eaa0fd3ed53c4eaf4be2551ec1a7350':
Get the MCC/MNC using defaults.
ec89863adec09dbf980b2d2c90c0fa5e78ffa7a9 29-Sep-2014 Stuart Scott <stuartscott@google.com> am 38bfcb4a: Merge "Get the MCC/MNC using defaults." into lmp-sprout-dev

* commit '38bfcb4affb234ca901912155d41ec06dce4f43a':
Get the MCC/MNC using defaults.
015f3b464c42421ade3ce508d9412b217ba2c23d 27-Sep-2014 Stuart Scott <stuartscott@google.com> Get the MCC/MNC using defaults.

First try default data, then default sms, then default voice, finally
try the first sub to come up.

bug: 17396869
Change-Id: I09da19b7b25c2a6aa8affd95847dbb10e039f634
elephonyManager.java
70d7a7a2afd310707689447a48d69b7c4b3d4193 29-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> am cedd0910: am 20bb1511: am 1f228230: am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app

* commit 'cedd0910f9ebfbf40ba8b17c08bc802773a4425d':
redirect RIL_UNSOL_OEM_HOOK_RAW to system app
531b17a2e4875ddc9a0e7ea5a85cb7858ed59a56 29-Sep-2014 Etan Cohen <etancohen@google.com> am 96117a71: am 07719bb5: am 2b267872: Added mechanism to merge voice & baseline ServiceState objects.

* commit '96117a717616b1d3fbf1129084b3b7f4c35b456d':
Added mechanism to merge voice & baseline ServiceState objects.
cedd0910f9ebfbf40ba8b17c08bc802773a4425d 27-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> am 20bb1511: am 1f228230: am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app

* commit '20bb15116147edb3364f68f0b7f0d1a3cb588181':
redirect RIL_UNSOL_OEM_HOOK_RAW to system app
15d9ce3e388f74eaba74d778ad4581d4d4fc8ab7 27-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> am 1f560a73: am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app

* commit '1f560a7368f8e3bf6b31aec78651419e55786e18':
redirect RIL_UNSOL_OEM_HOOK_RAW to system app
36e722983591839e2a3c921c522da55ebf83b542 27-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> am 0f840945: redirect RIL_UNSOL_OEM_HOOK_RAW to system app

* commit '0f84094579696739facbd75a56a4e7b98a6a5edc':
redirect RIL_UNSOL_OEM_HOOK_RAW to system app
485f2095f8ba695b88331c01a2de468b5616a5d7 11-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> redirect RIL_UNSOL_OEM_HOOK_RAW to system app

Add LISTEN_OEM_HOOK_RAW_EVENT and onOemHookRawEvent to PhoneStateListener.

Bug: 17298769
Change-Id: Iaea054d3cc2925eea1e11f8871faabc7bc9dfb2d
honeStateListener.java
96117a717616b1d3fbf1129084b3b7f4c35b456d 27-Sep-2014 Etan Cohen <etancohen@google.com> am 07719bb5: am 2b267872: Added mechanism to merge voice & baseline ServiceState objects.

* commit '07719bb58313a78af087495874358dc4f22b9098':
Added mechanism to merge voice & baseline ServiceState objects.
dcc0736c4341335dc73856d98ac940c2ad7eba8f 24-Sep-2014 Etan Cohen <etancohen@google.com> Added mechanism to merge voice & baseline ServiceState objects.

Needed in the context of separate phones handling baseline connectivity
and voice connectivity (e.g. IMS).

Bug: 17627405
Change-Id: Ifb5a6ea11f6350090b989408e9eed80958d8558b
erviceState.java
bfcc536eb7113bdf4167d2e32233a3d430a180c6 26-Sep-2014 xinhe <xinhe@google.com> am 56ad075e: am feffe6cc: am 753044d3: am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev

* commit '56ad075e34a8036774ba29d130c098bcae00cdd9':
Support multiple SIM/Subscription on telephony registration
12dc15b35529633aebe63bc0b38539c3625ba8f0 26-Sep-2014 xinhe <xinhe@google.com> am feffe6cc: am 753044d3: am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev

* commit 'feffe6cc5019d0a2bd870bcc14d7b92dd3500c4b':
Support multiple SIM/Subscription on telephony registration
31a5a1c15cc1e177693f84c29fe301c5b0ecbc54 26-Sep-2014 xinhe <xinhe@google.com> am 53ba6368: Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev

* commit '53ba6368fe84513f0cd2726938fbf8838dcf68b3':
Support multiple SIM/Subscription on telephony registration
3d4834f0eb20144ae0da499b166bab78771c99f4 26-Sep-2014 xinhe <xinhe@google.com> Merge "Support multiple SIM/Subscription on telephony registration" into lmp-sprout-dev
320ced067459178535d1d5e68ca6b3c4d7508e22 26-Sep-2014 Junda Liu <junda@google.com> am 330bdf85: am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev

* commit '330bdf857fffdbf0e1c6d8e47dd36195eaff4f34':
Revert "Hide CarrierPrivilege APIs in TelMgr."
5c65836f583c1d6d3f135a395a59e9994776e694 26-Sep-2014 Junda Liu <junda@google.com> am 85764048: am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev

* commit '8576404876fe609d74c26945fa4b5beb9a0edf96':
Hide CarrierPrivilege APIs in TelMgr.
5c1d26bac3c57d21a64675ec255d9e38ae1e0fd7 26-Sep-2014 Junda Liu <junda@google.com> am 65f5ce82: am e069ca2b: Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev

* commit '65f5ce82b4d54d1b5156c7196dab9ade34f8f600':
Revert "Hide CarrierPrivilege APIs in TelMgr."
e9f1640b6bb3f10d6c94f05774bcfaa788bea55c 26-Sep-2014 xinhe <xinhe@google.com> Support multiple SIM/Subscription on telephony registration

During calling telephony registry call back API, we force the call back will be
triggered if the registered subId is Default Sub ID. This is due to some risk
condition. Please refer to Issue 17472622 and its fix. This fix is ok for single
SIM/Subscription. However, on multiple SIM/subscription, there is potential problem
on wrong notifications.

Bug:17613629
Change-Id: I3f41e03f37424bcc82a71090d4f4142b4c5ba922
honeStateListener.java
6c49e6e923e993b18beaf7808337a7c2c6b26b70 26-Sep-2014 Junda Liu <junda@google.com> am 73d72b60: am 8e61b503: am 63f0b87e: am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev

* commit '73d72b6067d7b25c6727b054cfcc44997d03fc23':
Hide CarrierPrivilege APIs in TelMgr.
f52ac900caa94236c2cc6da94fb09be22db58e03 25-Sep-2014 Junda Liu <junda@google.com> Revert "Hide CarrierPrivilege APIs in TelMgr."

This reverts commit b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9.

Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5
elephonyManager.java
cb6b5f9bd1aa9e83325310ce15c4978d8df3dce6 25-Sep-2014 Junda Liu <junda@google.com> am 96c54879: Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev

* commit '96c548791145ab33ceb0935f38323d3182d44419':
Hide CarrierPrivilege APIs in TelMgr.
bac6d61ab6d9ea16c305419dfe03e19cc5af9fd9 24-Sep-2014 Junda Liu <junda@google.com> Hide CarrierPrivilege APIs in TelMgr.

Per API council decision, we will polish and public in MR1.

Bug: b/17639966
Change-Id: Id009cd62b4d44dd17fe7a30e0f8037c6fb373c32
elephonyManager.java
cf56442090ae2c269d1884070e62fe814de0d3dd 24-Sep-2014 Wink Saville <wink@google.com> am 3d74e690: am 01632c82: am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev

* commit '3d74e690724ada5f011e0f6c7217a31ce5681a96':
Add SM isUsableSubIdValue
8ac6bb335d752c20d300bc19b99b3dd5b87f3072 24-Sep-2014 Wink Saville <wink@google.com> am 01632c82: am 07aa9ded: am af23987e: Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev

* commit '01632c82fe635fd6501f9fd5190754e229944ce7':
Add SM isUsableSubIdValue
8eab2b6bdffc3a5934796d074f541f1020b26f30 23-Sep-2014 Wink Saville <wink@google.com> Add SM isUsableSubIdValue

Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
ubscriptionManager.java
40aca89a2737b2f7a3c59b2c10956fcc23b3799e 19-Sep-2014 Wink Saville <wink@google.com> am c501947a: Merge commit \'edd57a98\' into fix-conflict

* commit 'c501947a3ebed84792c235f29c73194d095906ed':
5a1216bd6714c14a2e0239b0eead8ed75b200b8f 19-Sep-2014 Wink Saville <wink@google.com> am 7566ef9e: am 78a04d06: Unhide SubscriptionManager and SubInfoRecord

* commit '7566ef9e16ed395ba50d27cafc0c51e0d1219411':
Unhide SubscriptionManager and SubInfoRecord
4b4d68534155e6a2776e2cc7f2168307fd55cb1f 19-Sep-2014 Wink Saville <wink@google.com> am 1ddcdc2d: Merge commit \'e58e59cc\' into fix-merge-conflict

* commit '1ddcdc2d1cef6387612923ad3f9e73de12727dc1':
ksd to lmp-sprout-dev
506e560509bfc194b5792b62a278162893ef5a57 17-Sep-2014 Sailesh Nepal <sail@google.com> am 715683e4: am b1fdc4ba: am d3edb391: am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev

* commit '715683e4f30b601d86d029c1b64c10918d43c98d':
Include code when converting unknown causes to string
c8d894b9f7a0840081eeb523c99774bb6b0db447 17-Sep-2014 Sailesh Nepal <sail@google.com> am 6bdca97a: am 40c4c3eb: am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev

* commit '6bdca97ac497fd17335905281530ffbc978cbe39':
Include code when converting unknown causes to string
285326781661d75c2008362e69c1ad32bb7249e0 17-Sep-2014 Sailesh Nepal <sail@google.com> am 86f939e8: Merge "Include code when converting unknown causes to string" into lmp-dev

* commit '86f939e832c257b5fa2606aed00e9dfaeaef90cd':
Include code when converting unknown causes to string
f56946a81f7024e2b9657d1b3648bf210603c261 17-Sep-2014 Andrew Lee <anwlee@google.com> am 8074424b: am df23ff67: am 14f6fff6: am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev

* commit '8074424b69f0bddf4a802e9650eba6a6ca733b4f':
Add new DisconnectCause class to telecomm.
7f466574543cc43bfc2c1ed5acab282f0d4e358b 17-Sep-2014 Sailesh Nepal <sail@google.com> Include code when converting unknown causes to string

Bug: 17535687
Bug: 17241433
Change-Id: I12f0c3b4334dfcb5ac0cd2439ecab9dc77546680
isconnectCause.java
fb748b69d4bb6fe481c1a8c5c75ab4ac2220f13e 17-Sep-2014 Andrew Lee <anwlee@google.com> am 5325e9bf: am 2167e7dd: am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev

* commit '5325e9bf00c1a0b057cd66ede9f5ef10ee6c7f1e':
Add new DisconnectCause class to telecomm.
0686e30652c0274f68cd92f8dfd0189051f4b9ff 16-Sep-2014 Andrew Lee <anwlee@google.com> am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev

* commit '258f835f705bfcead1769da703c4fdb78d71295a':
Add new DisconnectCause class to telecomm.
7f3d41fd124dd7c4a8b72c1d48df08a8ee7209ec 12-Sep-2014 Andrew Lee <anwlee@google.com> Add new DisconnectCause class to telecomm.

+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
isconnectCause.java
1ecaf1182898bd83582e3ea71ae2a47f9989f843 15-Sep-2014 Wink Saville <wink@google.com> am 78a04d06: Unhide SubscriptionManager and SubInfoRecord

* commit '78a04d069fe0438cdb324cb94351ff79fa2f48cf':
Unhide SubscriptionManager and SubInfoRecord
02e3979d62bf4b85fe7dedeefa357748419db992 15-Sep-2014 Wink Saville <wink@google.com> Merge commit 'e58e59cc' into fix-merge-conflict

* commit 'e58e59cc':
ksd to lmp-sprout-dev

Conflicts:
core/java/android/provider/CallLog.java
telephony/java/android/telephony/SubInfoRecord.java
telephony/java/android/telephony/SubscriptionManager.java
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ISub.aidl
telephony/java/com/android/internal/telephony/TelephonyIntents.java

Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd
ee743e6071787335afce30d8f39e3ce7df9d11ea 14-Sep-2014 Yorke Lee <yorkelee@google.com> resolved conflicts for merge of f3804c3c to lmp-sprout-dev

Conflicts:
telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ibdd0b6c2c9901ec46196ac9460a0908dfb739ad4
4a19862413a3908de8ed612655ad506a19fa6fbe 14-Sep-2014 Yorke Lee <yorkelee@google.com> am 5916e775: am 952a2f89: am f3804c3c: Pipe TelephonyManager.getCallState through TelecommManager

* commit '5916e7752da2ffa29d056ba446f88daf7d1356f0':
Pipe TelephonyManager.getCallState through TelecommManager
2ae312e30652a4d0019b17825b58d558c4483a58 13-Sep-2014 Yorke Lee <yorkelee@google.com> Pipe TelephonyManager.getCallState through TelecommManager

* Add TelecommManager.getCallState (hidden API)
* Make TelephonyManager.getCallState call through to
TelecommManager, to be consistent with
TelephonyManager.ACTION_PHONE_STATE_CHANGED broadcasts for
overall call state. Telephony continues to manage call states for
individual subscriptions.

Bug: 17378767
Change-Id: Ia5e8b21df801ed3af4f6e14c110a72c92f077f88
elephonyManager.java
6c8d6d74c0ee12e6d57bfaede3f7a713bf82f025 13-Sep-2014 Tyler Gunn <tgunn@google.com> resolved conflicts for merge of 66c16547 to lmp-sprout-dev
Also fixed issue in TelephonyManager.

Change-Id: I4dde45e638c2bcf32f8f929d34d0083966f6761f
cc616bca0dc28774ba76c74fd92d86147c4f68af 13-Sep-2014 Tyler Gunn <tgunn@google.com> am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev

* commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089':
Renaming Telecomm to Telecom.
ef9f6f957d897ea0ed82114185b8fa3fefd4917b 13-Sep-2014 Tyler Gunn <tgunn@google.com> Renaming Telecomm to Telecom.

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
isconnectCause.java
elephonyManager.java
1db943197b9004d3c34b5403fd895f134f00defb 12-Sep-2014 Anthony Lee <anthonylee@google.com> am d1155b23: am 821b1df1: am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev

* commit 'd1155b23b3e5d49669462a5f687a0966d72b7ede':
isValidSlotId() and isValidPhoneId() updated to handle negatives.
2222d9bc9ec9a594a8ffc64414ab92f7fdc55c7a 12-Sep-2014 Anthony Lee <anthonylee@google.com> am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev

* commit '12c83b93b13a7e6d37b385c1270c29d8a959bc78':
isValidSlotId() and isValidPhoneId() updated to handle negatives.
b78890c159f9f06617712261e6c9f284841f2357 11-Sep-2014 Anthony Lee <anthonylee@google.com> isValidSlotId() and isValidPhoneId() updated to handle negatives.

The old version of the code wanted to just check to make sure
that the slot/phone id is greater than INVALID_SLOT_ID or
INVALID_PHONE_ID that are both currently defined to be -1000. The
changes are made for 2 reasons. First, INVALID_SLOT_ID and/or
INVALID_PHONE_ID might not always be defined to be a negative value
so there is a big assumption. Secondly, anything greater than
-1000 allows other negative values to be considered valid ids.

Bug: 17243556
Change-Id: I2bbfcc2cfd2d7c4772dfb9c50af2dc88c0f315e2
ubscriptionManager.java
4e77e58cc1f8246ede756fa0aded503d8c852776 11-Sep-2014 Derek Tan <derektan@google.com> am df4aee76: am 5cebc235: am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev

* commit 'df4aee76cc6da4c6f9f1e3ca5153c8dbf537d1a3':
Update the comment in two APIs since we will persist the settings.
e7fc8602eb7d06fc12592518b3c5dc4752191d6a 11-Sep-2014 Derek Tan <derektan@google.com> am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev

* commit '4c8c759106eba4070a46393f2978607964881511':
Update the comment in two APIs since we will persist the settings.
6d955b88c3df55069ada1c33dd45fc1dc3969258 11-Sep-2014 Derek Tan <derektan@google.com> Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev
7d1d2e39f382416ffa8db8771c83e4f9e2f53adc 30-Aug-2014 Brian Williammee <bwill@google.com> Improve equals and hashCode in CellIdentityXxx methods

The equals methods were a lot of dead code that boiled down to
seeing if two references pointed to the same object. The hashCode
methods were likely to result in collisions on unequal objects.

Bug: 10328291
Change-Id: I4bd93efd1f4a34e9dec55ac05868df37368abd6a
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellIdentityWcdma.java
7100d15a9965ce430fafa92df42587ac72a2c7fc 10-Sep-2014 Junda Liu <junda@google.com> am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.

* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
Add ForSubscriber suffix to APIs w/ subId argument.
13e28bb9386a3eb579c457985f0324238f2bfe38 06-Sep-2014 Junda Liu <junda@google.com> Add ForSubscriber suffix to APIs w/ subId argument.

Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
elephonyManager.java
f2090b88b72d89825b9bf9c6ddbf5ae8a7f3116b 06-Sep-2014 Wink Saville <wink@google.com> Unhide SubscriptionManager and SubInfoRecord

Change-Id: I1e6efb4442f0400d404d725c7db5020a26c00f98
ubInfoRecord.java
ubscriptionManager.java
6e9c5aeeee9011ca3cf9ecca5d7614d270df825a 09-Sep-2014 Wink Saville <wink@google.com> am 5dac65ad: Change suffix UsingSubId to ForSubscriber.

* commit '5dac65ad043ee9d0535813ef5dba06dd80c11f82':
Change suffix UsingSubId to ForSubscriber.
bc0272754df7a2fb71bf709a2a8a7c852ee69e5c 08-Sep-2014 Wink Saville <wink@google.com> Change suffix UsingSubId to ForSubscriber.

Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
ubscriptionManager.java
elephonyManager.java
8110da62ed1bddf8150488613a0747cf6d2fd6a9 09-Sep-2014 Wink Saville <wink@google.com> am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev

* commit '26207b53a82f1e8f3d72eaf36bd69dbcb06833fc':
Change getCurrentPhoneType to SystemApi
5dd345286cbf0de2a4983e624cc930d178dd710e 09-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev

* commit '034fe21c638960d8d67711f446c818b93e41641e':
Assisted dialing support of MO SMS
40e9f393df3545af8a068c4b1994ac486597790d 09-Sep-2014 Wink Saville <wink@google.com> Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev
4009b98f73628043f0b3db4c7ace1aa71a191a6b 09-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Assisted dialing support of MO SMS" into lmp-dev
96b3e61ff6476ff1c5ad7cce725b374d9f87e868 09-Sep-2014 Wink Saville <wink@google.com> Change getCurrentPhoneType to SystemApi

Bug: 17394367
Change-Id: I293faa26884e8d63a833e624e6c9a201c7652683
elephonyManager.java
2bae510ccef2da7dd767f8148d4e3539037f4aaa 06-Sep-2014 Derek Tan <derektan@google.com> Update the comment in two APIs since we will persist the settings.

Bug: 17255752
Change-Id: I28926381e8e982579b38c19799078f7a3151aefe
elephonyManager.java
077ffae681d3af4c59a085b56556f619ea6d9238 06-Sep-2014 Junda Liu <junda@google.com> am 8e250c57: Merge "Hide APIs for simplified network settings." into lmp-dev

* commit '8e250c572a6d56ba6b3645faa5b32edf1e795442':
Hide APIs for simplified network settings.
c6bd32e94fae8dc2c394058bc840d239c3b5189b 06-Sep-2014 Junda Liu <junda@google.com> Merge "Hide APIs for simplified network settings." into lmp-dev
79b0cbb7991d2a290cb21126619f0ed802fbf3ec 06-Sep-2014 Derek Tan <derektan@google.com> am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev

* commit 'de6fefb4f5e9da6aedc600abd7c10d14398b47c7':
Update the preferred network type APIs.
54e883bedc8a2402a8b13d27bc055c5ed1a70015 06-Sep-2014 Derek Tan <derektan@google.com> Update the preferred network type APIs.

Bug: 17255752
Change-Id: I8f74749752f8d8c6cd5b28dd5fe4ed89a33481ed
elephonyManager.java
22a3cf83497bc7337d3f75bb837d95346e124033 06-Sep-2014 Derek Tan <derektan@google.com> am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev

* commit '6f25963ebc8f91638b056107a7b7bdb6e182102f':
Remove setCdmaSubscription API.
0bee5f5208768613214d4e358dd4b2fe0c621a6d 06-Sep-2014 Derek Tan <derektan@google.com> am d16f633f: Merge "Update the comment in sendEnvelope." into lmp-dev

* commit 'd16f633fc9c949af155b3dff5f6f2d98c50a7c80':
Update the comment in sendEnvelope.
c4799b6bdc72bc611dc8c7cbc62ce949a044919a 06-Sep-2014 Shishir Agrawal <shishir@google.com> am 32148644: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev

* commit '321486444e6c4d7ee77f8981e9921b923308ced9':
API change: SetOperatorBrandOverride should not take iccId as a param.
b5928445d12d92598845bcef3cd019aa09acb12d 06-Sep-2014 Derek Tan <derektan@google.com> Merge "Remove setCdmaSubscription API." into lmp-dev
a0729d348764424b795cafc9ab175349009e5295 06-Sep-2014 Derek Tan <derektan@google.com> Merge "Update the comment in sendEnvelope." into lmp-dev
77ea3ee5ec0fbd4bc98dbd8c1d62702cff9daa34 22-Jul-2014 Xia Ying <yingxia@motorola.com> Assisted dialing support of MO SMS

This is special for VZW requirement. Follow the specificaitons
of assisted dialing of MO SMS while traveling on VZW CDMA,
international CDMA or GSM markets.

Change-Id: I34a531b817095f4ce035f3f49a3bf7d6e2e8bc13
honeNumberUtils.java
1244333998c5be80b5abe34bbf38922cb4366b57 06-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev
b8025f32605d6e450d3a64381e6da4aee58e54d7 06-Sep-2014 Junda Liu <junda@google.com> Hide APIs for simplified network settings.

Bug: b/17255752
Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734
elephonyManager.java
e30eeb5f560db080c2ef72c0c7dd66f2ad8f0e5e 06-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am a8ceba1c: Merge "Plus code handling for non-NANP CDMA carrier" into lmp-dev

* commit 'a8ceba1cb610c2ce166d4cdcbdb6eaec08886aa9':
Plus code handling for non-NANP CDMA carrier
d2cfa92146ecfa5e00d4a3ce8e63b1a588845fe2 04-Sep-2014 Shishir Agrawal <shishir@google.com> API change: SetOperatorBrandOverride should not take iccId as a param.

Taking ICCID as a parameter is not scure since a carrier can override the
brand for other carriers. We should override only the current ICCID.

Bug: 17390144

Change-Id: I9be2cb5c5fa15367fcb3b548b6e601a294e84dbc
elephonyManager.java
9b656ee3201ee85e1bb3374ea2877aad4adab82b 10-Jul-2014 Steven Liu <stevenliu@motorola.com> Plus code handling for non-NANP CDMA carrier

Since most of CDMA network do not support phone number with "+" for
international dialing, current AOSP support the "+" handling for
NANP CDMA network, this part add the support for non-NANP CDMA Network,
convert "+" to right IDD(International Direct Dialing) code. And adding
a new property for current IDD.

Bug: 17210134

Change-Id: I369083169bb3504f8de9774b65f3993dd561c525
honeNumberUtils.java
1eda68766be31fdf4a0c038ed6a459b3df0311fe 05-Sep-2014 Derek Tan <derektan@google.com> Update the comment in sendEnvelope.

Bug: 17255752
Change-Id: I4b56447e28bc9838b9ae0425a3673891647116d1
elephonyManager.java
274baa73c51490e10fffe2ccac9c626c8f459cc4 05-Sep-2014 Derek Tan <derektan@google.com> Remove setCdmaSubscription API.

Bug: 17255752
Change-Id: I0adc5c3d1b690d86f538c084d17d239f7ffccfca
elephonyManager.java
d1d5b97bc0570bc0ad83b2cb9870b6def54e9934 05-Sep-2014 Shishir Agrawal <shishir@google.com> am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev

* commit 'e90b1315a83fd75906fa1bc876fb2973cf6f8676':
IccOpenLogicalChannelResponse: Adding final to fa few constants.
949bb79f70e088b29efb6d4af8ac7f3ae62c035e 05-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev
eb805eb7678fe928c2bcd298e3bc7a52b2eb5a6d 05-Sep-2014 Wink Saville <wink@google.com> am a829f8e2: Merge "More cleanup prior to unhiding" into lmp-dev

* commit 'a829f8e2462157c16f60a52edd39b3c49209ab76':
More cleanup prior to unhiding
905bb54108d380555dbec1c9961a675740fe6e96 05-Sep-2014 Wink Saville <wink@google.com> More cleanup prior to unhiding

Adding comments and rename publci SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
ubInfoRecord.java
ubscriptionManager.java
ed62dd4e7f873ac9681658ad92c3c008f373e23b 04-Sep-2014 Shishir Agrawal <shishir@google.com> IccOpenLogicalChannelResponse: Adding final to fa few constants.

Bug: 17390620
Change-Id: I81d02b5b0d6e353a04d46663baad1b90398f5b36
ccOpenLogicalChannelResponse.java
719126b87c3f0a0e029636bf0d71869ee0b070d9 04-Sep-2014 Tom Taylor <tomtaylor@google.com> am d1006b0f: Merge "Add mcc/mnc to SubInfoRecord" into lmp-dev

* commit 'd1006b0f0372e068eac20c5c48f825a087577bae':
Add mcc/mnc to SubInfoRecord
7a96207e2ba549843e9fcbbc7f2fde7ed96ada84 04-Sep-2014 Tom Taylor <tomtaylor@google.com> Add mcc/mnc to SubInfoRecord

Bug 17157686

Change-Id: I47d19dea73f038a8d748f95dd33452da62ebf26b
ubInfoRecord.java
ubscriptionManager.java
c7880d3f985f90dbfc348e3d3d1a9305d9f0248d 04-Sep-2014 Nancy Chen <nancychen@google.com> am c27868a6: Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev

* commit 'c27868a6d085f10f6ca4f4a83c382078648f21e7':
Remove check for voicemail number when parsing URI phone number.
81a0cbcda3fbcb42d19fd8c5cf7877f3fb574405 04-Sep-2014 Nancy Chen <nancychen@google.com> Merge "Remove check for voicemail number when parsing URI phone number." into lmp-dev
34f1382d692883c9e91a9fef31070c5b2e3bad79 04-Sep-2014 Wink Saville <wink@google.com> am f8773dfb: Merge "Add PhoneStateListener(Looper looper) and some documentation." into lmp-dev

* commit 'f8773dfbbc84b52f308f61d75ae2a028773dc749':
Add PhoneStateListener(Looper looper) and some documentation.
343feb701900f73d882cc7a95ca019333ea55b45 04-Sep-2014 Wink Saville <wink@google.com> Merge commit '3432c20c' into fix-merge-conflict

* commit '3432c20c':
Hide SubscriptionManager using individual @hide on fields and methods.

Conflicts:
telephony/java/android/telephony/SubscriptionManager.java

Change-Id: Ic8d528b7a046f0b2a9735ba62720de142952d7ef
cf39f86b50c6cb78c64b786b8777e86605827ff3 04-Sep-2014 Wink Saville <wink@google.com> Merge "Add PhoneStateListener(Looper looper) and some documentation." into lmp-dev
aea3bf798a8bf2a0678e30fe2ed720a034ac249a 04-Sep-2014 Wink Saville <wink@google.com> am 3c95cae1: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev

* commit '3c95cae1ab33a0fd3bd93422e91a8182bf49d017':
Rename getActivatedXxx to getActiveXxx
2e40ba9dca6c00394e8ce267281f113b1c3320d8 04-Sep-2014 Wink Saville <wink@google.com> Add PhoneStateListener(Looper looper) and some documentation.

Bug: 17374935
Change-Id: I1eeb77fd7478cb81cde92f43a26ed19697323e6a
honeStateListener.java
f5bca080a231e45e1694651c012c74ba52436635 04-Sep-2014 Wink Saville <wink@google.com> Hide SubscriptionManager using individual @hide on fields and methods.

Doing this so the unhide for API Council will just be unhiding a few
fields/methods.

Change-Id: Iebc995c1aebe1f17a6552c28f771be7584bf0acb
ubscriptionManager.java
8d50c2029e432acd76af65906916b4dc7d8f21ba 04-Sep-2014 Stuart Scott <stuartscott@google.com> resolved conflicts for merge of dadcc85e to lmp-sprout-dev

Change-Id: Ib457b076a94ef51e63fce3e9a5ad49a56495b830
8a38a203a9754be85e12484adff69f7577fa4fad 03-Sep-2014 Wink Saville <wink@google.com> Rename getActivatedXxx to getActiveXxx

Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
ubscriptionManager.java
fe99099ea7dda76031343c8e412bd9f7cb816987 03-Sep-2014 Nancy Chen <nancychen@google.com> Remove check for voicemail number when parsing URI phone number.

Getting the voicemail number will be done in Telephony instead of in
PhoneNumberUtils which is called by Telecomm.

Bug: 17317190
Change-Id: Ia88a56516b4f57ac62dc5696ae359fd042fec040
honeNumberUtils.java
c650e0b12a656060de767d91d99f6b33e51c6ab2 03-Sep-2014 Wink Saville <wink@google.com> Prepare to make SubscriptionManager public.

Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.

In SubscriptionManager and SubscriptionController:
-Rename getActivatedSubInfoList to getActiveSubInfoList.
-Remove context as a parameter
-Cleanup

Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
ubInfoRecord.java
ubscriptionManager.java
05e6dde3a0b9ba1eb3d13d511fe2e27a0d10c851 01-Sep-2014 Wink Saville <wink@google.com> ksd to lmp-sprout-dev

Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
honeNumberUtils.java
honeStateListener.java
ubInfoRecord.java
ubscriptionManager.java
elephonyManager.java
3892fc0349a91097f53152eaf2801dfebb2066ca 28-Aug-2014 Diego Pontoriero <diegs@google.com> Change TelephonyManager method name to accurately reflect functionality.

Bug: 17163860
Change-Id: I4390d79c49831454146a42b89520a16984c5f260
elephonyManager.java
ef489ef8ef1ccb283485d2c308cef58067654cb2 25-Aug-2014 Shishir Agrawal <shishir@google.com> Modify IccOpenLogicalChannelResponse: Document and rename constants.

Bug: 17189780

Change-Id: Iac96e3bc7265d20f21b29d4a05b615c5ff3cdd6e
ccOpenLogicalChannelResponse.java
83749f347938d3955c887588756aa7b4fcb32c78 22-Aug-2014 giseok.seo <giseok.seo@lge.com> Use proper ril.ecclist when no sim state

Bug: 17139446
Signed-off-by: giseok.seo <giseok.seo@lge.com>
Change-Id: I2f420973b29092b8a6cceb8cf4bd77d0ee8372bd
honeNumberUtils.java
cad78a801d7cf8635928cb77febbf4c2d185d668 21-Aug-2014 Junda Liu <junda@google.com> Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev
dbc6689664156a42ecd2b4bd53ffd772e276bf63 21-Aug-2014 Amit Mahajan <amitmahajan@google.com> Merge "Adding APIs to get IMEI/MEID" into lmp-dev
284f1ec16e816f60cbbf243cebb2de90c50322bb 19-Aug-2014 Amit Mahajan <amitmahajan@google.com> Adding APIs to get IMEI/MEID

Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce
elephonyManager.java
2b2469b07d6ea9410bdb8d1234aa2320b02bdaa9 15-Aug-2014 Junda Liu <junda@google.com> Add getCdmaMdn and getCdmaMin as system api to telmgr.

Bug: b/16966140
Change-Id: I36d8f850eca7c392f7ed5186254ef9862d4177f7
elephonyManager.java
64820af4e56cd5d6a6afcfde93d94427257a7677 14-Aug-2014 Shishir Agrawal <shishir@google.com> Add public qualifier to TelephonyManager.TeleiccExchangeSimIO.

Seems to have gotten overlooked in the last change.

Bug: 17031384
Change-Id: If7f92c128ddddd606510d7acf88168aebc061e80
elephonyManager.java
125cf62d596f544db4cb7b314f94c2757f5afaa7 11-Aug-2014 Wink Saville <wink@google.com> Fix CellIdentityLte.equals

Bug: 16902094
Change-Id: I92786dc792bf318d2236212eb2acf955ec41e066
ellIdentityLte.java
43d94347a6feb14870a4ffd7682a816210e5e676 06-Aug-2014 Shishir Agrawal <shishir@google.com> Return APDU status code on tramsit channel command failure.

Change-Id: I2d506a6ddbb4e27a04f57941247924d36c9d279b
elephonyManager.java
063b8d665e08ed2af8afa5a14eeaf2f4a61dc1a8 01-Aug-2014 Wink Saville <wink@google.com> Fix double DBG check.

Change-Id: I45e175df698240b80374f98043b50a014fd9779a
honeStateListener.java
6d13bc8e3b1cf0dac56590a0a76e9da4a1ecab75 01-Aug-2014 Wink Saville <wink@google.com> Turn off extra debugging

Change-Id: I3d7c68d3d7bcef5be084398807389f4a485bedb0
honeStateListener.java
1521e5ad31125d39eec6e8a27711a983f633b662 01-Aug-2014 Shishir Agrawal <shishir@google.com> IccOpenLogicalChannelResponse: Single character fix.

Change-Id: I345e9a6b4cefc1d96111a7cf62dc402fd48b35c0
ccOpenLogicalChannelResponse.java
a122e8df741456ea34e4a57d205411b8371a16db 30-Jul-2014 Shishir Agrawal <shishir@google.com> Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.

The new APIs are needed to support SEEK.

Also modifies TelephonyManager.iccOpenLogicalChannel to return the status of
the command.

Change-Id: Iff2674fb0e23210f2579cb883e64571347ade5e6
ccOpenLogicalChannelResponse.aidl
ccOpenLogicalChannelResponse.java
elephonyManager.java
9d0f7c4fbce9445de763ac08b5f387412393359c 25-Jul-2014 Santos Cordon <santoscordon@google.com> Add more disconnect causes 1/4

Bug: 15692074
Change-Id: Ib94c33fac8450b70e53dbe12d71f41777e9e140c
isconnectCause.java
0bf65d2d71d20d8e3e0bd24be4bd97bb208ef443 24-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "Add API invokeOemRilRequestRaw" into lmp-dev
3099c831441e861328cd4965011c854e060ce56a 17-Jul-2014 Steven Liu <stevenliu@motorola.com> Add API invokeOemRilRequestRaw

this API is used by system app, app could communicate with RIL
with it.

Change-Id: I5397c1cf2b108d9dc3a9694b1f071dc60bb5b341

Conflicts:
telephony/java/com/android/internal/telephony/ITelephony.aidl
elephonyManager.java
e647099e14114475e9a2827a10dab2d2e36308c4 18-Jul-2014 ram <ram.pl@samsung.com> IMS: getPCSCF() API enhanced to support multiple APN types.

Change-Id: I014f341b93a9ea7280e04cdfc13418fe81c9fc8b
Signed-off-by: ram <ram.pl@samsung.com>
elephonyManager.java
63c4c06be44fe8bd4506e6f9f57361d31e947c21 21-Jul-2014 Shishir Agrawal <shishir@google.com> Expose getCarrierPackageNamesForBroadcastIntent as a hidden @SystemApi

It will be required by setup wizard to delegate initialization to the carrier
app.

Change-Id: Icc0fc728e1e24235632ac38a482b06a7b829de78
elephonyManager.java
5552cc5c9dd111c5fb1db512240b5daf15866c88 19-Jul-2014 Shishir Agrawal <shishir@google.com> Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev
86578cca383562c72751d747905280afdeb2bdfb 18-Jul-2014 Shishir Agrawal <shishir@google.com> Adding the ability for carrier app to override SPN and carrier name.

The change allows system apps (holding MODIFY_PHONE_STATE permission) or
carrier apps to override the "carrier branding" on a per ICCID basis. The
override affects the service provider name as well as the network operator
name. The override is also saved as a SharedPreference and will persist for
the iccId across reboots.

Change-Id: I985ba247e10e2501e3d0d21567ccadc46f365879
elephonyManager.java
5da0fd5e76794d415a9cfa501194980d5679eff6 08-Jul-2014 Nancy Chen <nancychen@google.com> API changes to enable account selection for a call

If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
elephonyManager.java
06b41ea23f3fb6be2f483e1e051ff42a2591a208 15-Jul-2014 Derek Tan <derektan@google.com> Remove @hide annotations from important carrier privileged APIs.

Most of these APIs are protected by MODIFY_PHONE_STATE or carrier
privilege. Some APIs are protected by READ_PHONE_STATE.

Change-Id: Ifa04b5fb6d4bb5f21af7f728bee7dcbf77c8583b
elephonyManager.java
807fe0a19a710ae4e053e80f610807ff5718f1a1 09-Jul-2014 Ihab Awad <ihab@google.com> Implement multi-SIM capabilities (1/6) [DO NOT MERGE]

- Split PhoneAccount into PhoneAccount & PhoneAccountMetadata
- Move PhoneAccount methods from TelephonyManager to TelecommManager

Bug:16292368
Change-Id: Ib440368d6bd0572b63c942360450fde5c27d84b9
(cherry picked from commit 936b3552b4a3569be9904c826b95b632886fb45d)
elephonyManager.java
391c8323fc6c70b18accc3412d20520bfaf4ea0b 12-Jul-2014 Wink Saville <wink@google.com> Unhide isSmsCapable.

Bug: 14113863
Change-Id: I57af2cf2482747e77c9bdf53559345b6b31f01a5
elephonyManager.java
818631b679171ffb49eaa641bee06b9c953651da 03-Jul-2014 Derek Tan <derektan@google.com> Allow 1st party app to set Line 1 number for display purpose.

After the number is set, TelephonyManager.getLine1Number will actually
return this one instead of the actual MSISDN/MDN.

Bug: 11900806
Change-Id: I4df3fac7b483ddae2bbda14b5a85629486e400cf
elephonyManager.java
f9aefdb534c6cb2af22dfb7614a1c15c2d67dd9c 09-Jul-2014 Derek Tan <derektan@google.com> Different Mobile Network Settings screen for Nova multi-profile SIMs.

Simplify the Mobile Network Settings screen regardless CDMA or GSM activeness
to provide a unified experience for Nova users.

For more details, please refer to b/15854628.

Bug: 15854628
Change-Id: Ieba04eff49824aa09a056cd4fb142cbd268207a3
elephonyManager.java
56be215bcc5df95447c49d99915c299965b44207 12-Jul-2014 Shishir Agrawal <shishir@google.com> ITelphony.aidl: Rename hasCarrierPrivileges for packages to checkCarrierPrivilegesForPackage.

Fixes the build breakage due to overloading in the aidl.

Change-Id: Id3199bf2d21b1834183c90904417ed016d34e052
elephonyManager.java
142529702dad9a6612271f487d500db80173ba7b 11-Jul-2014 Junda Liu <junda@google.com> Add hidden systemapi hasCarrierPrivileges(pkgname).

Change-Id: I153f5c7cff1734c87587c3741051177ce54ba654
elephonyManager.java
0bae09fdde0905e24f6c3079d9e01c669d046289 07-Jul-2014 Santos Cordon <santoscordon@google.com> Move showCallScreen & isInAPhoneCall to PhoneManager.

Change-Id: I852da78ae80eba120932fb7acb1e5c3db2a8f18a
elephonyManager.java
6792a233eb70c660370093b591d1e94f68b0fc8a 08-Jul-2014 Junda Liu <junda@google.com> Merge "Add calculatePreferredNetworkType to TelephonyManager."
1365703d4964466472904dc84117a0946d9e1a44 02-Jul-2014 Junda Liu <junda@google.com> Add calculatePreferredNetworkType to TelephonyManager.

Bug: b/14134668
Change-Id: Iba7dcd50c1ba84b634eed53030456a2f84af6e3c
elephonyManager.java
b708ce5f1a30a63ed79a86a23ead4e5ad972a48a 08-Jul-2014 Shishir Agrawal <shishir@google.com> Remove permission SIM_COMMUNICATION.

The permission is replaced by the MODIFY_PHONE_STATE permission which is
System|Signature.

Change-Id: I74dbd242fc0fdbb5884fdc7a5c3f0063424fbfcf
elephonyManager.java
762d5a091f5e19b568bb0ff81a2cb6785b69075f 23-Jun-2014 Shishir Agrawal <shishir@google.com> SIM based carrier app privileges.

Adding support for SIM based carrier app privileges.

WIP - Missing bits:
- Notifications.
- Certificate check.

Change-Id: Ied3aa6c7d51cc0cde06f5bb58f30893d7a7b1c34
elephonyManager.java
3c4ff9effc801525aaa6bc3fa9bf2898b32b3464 02-Jul-2014 Santos Cordon <santoscordon@google.com> Move cancelMissedCallsNotification to PhoneManager.

Change-Id: I2ce26e77ef1f0acc11552bf28efc039391e09766
elephonyManager.java
9c3f18846aaa9340cc222f825c9c32ec42f9d0c9 01-Jul-2014 Ihab Awad <ihab@google.com> Rename Telecomm "Subscription" to "Account" (1/7)

Change-Id: Ieb29f6ba9dadacb2c7e26969a47141e11a339a40

Conflicts:
telecomm/java/android/telecomm/InCallCall.java
elephonyManager.java
ddb74d8eb05bf50ebae673fda87730b80e52a758 30-Jun-2014 Junda Liu <junda@google.com> add setCdmaSubscription to telephonymanager.

Bug: b/12799863

Change-Id: Ieeb3e800cd7757335135901b1e4e94aaf6f4ede7
elephonyManager.java
19f01ebe90722487d72e4ef16375c661004b3087 18-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove Obsolete enable/disableApn functions."
e356825e4a92e045a51d09b63e31dd9ce8e83d5a 17-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Remove Obsolete enable/disableApn functions.

ConnectivityService now uses NetworkAgents instead and apps should use
ConnectivityManager.

Change-Id: Ifc5c8f5be802183e70a5d92b224c819815de00e6
elephonyManager.java
b576cec2626d469868f0908b7926790ea5b91493 18-Jun-2014 Wink Saville <wink@google.com> Merge "Empty triangle displayed for radio signal but calls & data work"
eeacf9374748a5f7fc96a1beaf18c353d473d752 18-Jun-2014 Wink Saville <wink@google.com> Empty triangle displayed for radio signal but calls & data work

TelephonyRegistry: when default sub id is requested set isLegacyApp to
true so when ACTION_DEFAULT_SUBSCRIPTION_CHANGED is received the
TelephonyRegistry.Record.subId will be updated.

SubInfoRecord: Add SubInfoRecord toString for easier debugging

SubscriptionManager: Add putPHoneIdAndSubIdExtra(intent, phoneId, subId)
as this allows explicit setup of phoneId and subId and does not rely on
a phone's subId being set.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
ubInfoRecord.java
ubscriptionManager.java
c35ad0252d1ad9ae50e2dadd670783d4a6259df6 13-Jun-2014 Ihab Awad <ihab@google.com> Add methods to TelephonyManager for Subscription management (1/3)

As part of the effort to permit third-party suppliers of telephone
connectivity, we permit clients of TelephonyManager to obtain the
currently valid Subscription objects describing these suppliers. The
Subscriptions are intended to be self-describing such that an end-user
can choose from among them based on the information they contain. One
of these objects may then be attached to an ACTION_DIAL or ACTION_CALL
Intent to represent the end-user's choice of how to make a call.

Change-Id: I2ad1930079042d7bfe762b47c22f0538f7403bff

Conflicts:
telephony/java/com/android/internal/telephony/ITelephony.aidl

Conflicts:
telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
elephonyManager.java
1b5916b26e121df91702c3bb40aa433dde9b6404 16-Jun-2014 Wink Saville <wink@google.com> Check for subId array being null.

Bug: 15665102
Change-Id: I9424da81311eacebf280a30c4e32a530be4a3278
elephonyManager.java
fb40dd4d00bd3361b2535bc866e6c21eadc52558 13-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
honeNumberUtils.java
honeStateListener.java
ubInfoRecord.aidl
ubInfoRecord.java
ubscriptionManager.java
elephonyManager.java
oLteServiceState.aidl
oLteServiceState.java
d5a5b5a547462f3e7c6315a501909bce2418ba86 06-Jun-2014 Jeff Brown <jeffbrown@google.com> Rename PrivateApi annotation to SystemApi.

Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
elephonyManager.java
282129fd3f789739c47fe5506bcf29c1a2712b3e 05-Jun-2014 Yorke Lee <yorkelee@google.com> API changes to Telephony per API review

* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
honeNumberUtils.java
8c2d8c0c27ebd155e9e9d2c066df0297f265b5a6 06-Jun-2014 Yorke Lee <yorkelee@google.com> Revert "API changes to Telephony per API review"

The original change was submitted into lmp-preview-dev and should
not have been auto-merged to master.

This reverts commit 80327f7a31b19213ec48e1ab66e6bdc8e76cb0fe.

Change-Id: I9ff8a868ffa3135583c52ef97b15311107716899
isconnectCause.java
honeNumberUtils.java
f537259ec420052cae342c213579aec26c488055 06-Jun-2014 Yorke Lee <yorkelee@google.com> am 87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev

* commit '87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
API changes to Telephony per API review
d8819baf858b294bab16ea811da4acf39dc4552c 05-Jun-2014 Yorke Lee <yorkelee@google.com> API changes to Telephony per API review

* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

* Hide DisconnectCause
Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
isconnectCause.java
honeNumberUtils.java
fbb092f26e796fe638fb8bb4a91de2d4525bcacc 04-Jun-2014 Ihab Awad <ihab@google.com> DO NOT MERGE. Implement connection error dialogs (1/4)

Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
(cherry picked from commit 976bfe497da31fa8322969648ffbe77898941d0c)
isconnectCause.java
fc91b7d448507448703ce7c51c045578e20d9274 04-Jun-2014 Ihab Awad <ihab@google.com> DO NOT MERGE. Implement connection error dialogs (1/4)

Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.

Bug: 15195720
Bug: 15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
isconnectCause.java
faa3ff9ba89486aad83eab0526aea46ea7bbcfe6 03-Jun-2014 Evan Charlton <evanc@google.com> Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev
b69f1bddfe39c93f1e120e13a835768f68451e36 30-May-2014 Santos Cordon <santoscordon@google.com> am 6d052adc: Merge "Update showCallScreen to use Telecomm (1/6)" into lmp-preview-dev

* commit '6d052adc910bf2d2775881528cef3e41fe2cd14b':
Update showCallScreen to use Telecomm (1/6)
3534ede5722b98c5be1526ba0bc2cd8acfbe0e55 29-May-2014 Santos Cordon <santoscordon@google.com> Update showCallScreen to use Telecomm (1/6)

- Add API methods to InCallService and ITelecommService.
- Remove old methods from ITelephony.
- Route the TelephonyManager methods through ITelecommService instead of
ITelephony.
- Update Lock screen to use TelephonyManager instead of ITelephony.

Bug: 15008165
Change-Id: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
elephonyManager.java
fda1855eaa61daad528cb444e99d0fc5195a7bd1 28-May-2014 Evan Charlton <evanc@google.com> Revert sendEnvelope changes [DO NOT MERGE]

Revert the following changes from the I/O preview. This reverts the
following changes:

Revert "Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."""

This reverts commit 452e185fb6df92358701fb68d4fe6c65f172cc29.

Change-Id: I6bbff508b2f542d6ef3d372956db53d63a9165eb

Revert "Revert "Revert "Expose sendEnvelope."""

This reverts commit 0d5e5b9cce8af40494f72ff9decc169f99780254.

Revert "Adding support for SIM communication from Android over logical channels."

This reverts commit 57f656b9f6271cf857b5ecec5f8c7eacb321ec0b.

Change-Id: I975eb468841e85d63e506f68a5d8c879e110d9f6
elephonyManager.java
3afed57a7d8a6e9d9fcaaa483a3c3e3652e2199a 22-May-2014 Santos Cordon <santoscordon@google.com> Adding ITelecommService definition for Telecomm.

Until telecomm code moves into a system service, we need a way for
other apps to call into it for call-related functionality.

Initial implementation only has silenceRinger.
This is to be implemented by the telecomm code and used by
TelephonyManager (until we have a TelecommManager).

Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit b895606acf18dbb050c9a32106b3c9c2e5111829)
elephonyManager.java
afa05c0b43cbc065181d5c2d6ee368a08bb00c3b 22-May-2014 Robert Greenwalt <rgreenwalt@google.com> Move dis/enable of mobile data to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 53013c87496980b534e447e717a32698fbd4bca0)
elephonyManager.java
d42f945a3ce0205a98845ea3db7eaa653efd1c66 26-May-2014 Wink Saville <wink@google.com> Hide LogicalChannel operations developer preview.

Bug: 15193354
Change-Id: I0e41ab7bd8bb3aab9af855f022cb89349802f63f
elephonyManager.java
5c013261a941fabfb33df4f8d4e3799fab5e7a3e 22-May-2014 Santos Cordon <santoscordon@google.com> Merge "Adding ITelecommService definition for Telecomm."
6848f72a49f05509e6bc95a8a73c9dcd629af62c 22-May-2014 Santos Cordon <santoscordon@google.com> Adding ITelecommService definition for Telecomm.

Until telecomm code moves into a system service, we need a way for
other apps to call into it for call-related functionality.

Initial implementation only has silenceRinger.
This is to be implemented by the telecomm code and used by
TelephonyManager (until we have a TelecommManager).

Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
elephonyManager.java
47eecf03307acfb1bc7d4ad51311beb4eeb99366 22-May-2014 Robert Greenwalt <rgreenwalt@google.com> Move dis/enable of mobile data to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
elephonyManager.java
cb9086c5bfd84f8a78eb6072d9eb133bf3a523d8 19-May-2014 Santos Cordon <santoscordon@google.com> Fix build break.

Change-Id: If80984f9a62809829b3767193eff981ccb1185c7
elephonyManager.java
94a873de0f6d2e1579bc2634712d9212fbe87dc8 19-May-2014 Santos Cordon <santoscordon@google.com> Merge "Remove methods added in TelephonyManager."
14816d669b29607808e6d0ee72c602d340692d0e 17-May-2014 Santos Cordon <santoscordon@google.com> Remove methods added in TelephonyManager.

Change-Id: I771502ab76dfc24eb19b9ff58b029bea45d6832c
allStateListener.java
elephonyManager.java
b8894ab1aec9c9ffa749f9369e412a51b942de27 16-May-2014 Evan Charlton <evanc@google.com> Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""

This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750.

Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
elephonyManager.java
210889e91cb2da74e0323292ca156d17df03fe08 16-May-2014 Evan Charlton <evanc@google.com> Revert "Revert "Expose sendEnvelope.""

This reverts commit 23745256000bffaad4038ad9fe6e2b0941074a53.
elephonyManager.java
4a644e390359a1715c88f54ed0174ffb5113d617 15-May-2014 Evan Charlton <evanc@google.com> Merge "Remove obsolete ThirdPartyCall APIs"
fcca6cd019bb4c0aec336dd3c5905de761c0bd18 15-May-2014 Evan Charlton <evanc@google.com> Merge "Revert "Expose sendEnvelope.""
605e4942d66e69134495a24e925dc30549d2b507 15-May-2014 Evan Charlton <evanc@google.com> Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
0082e3302fcaef4a770b620cf03c23d618668f71 14-May-2014 Evan Charlton <evanc@google.com> Remove obsolete ThirdPartyCall APIs

These should have been reverted long ago. Additional cleanup will need
to happen, but this is a good first pass.

Change-Id: I6d3c2919299c0a0b9714ffecd30da68e5c880b6a
elephonyManager.java
hirdPartyCallListener.java
hirdPartyCallProvider.java
hirdPartyCallSendDtmfCallback.java
hirdPartyCallService.java
4268b243ded3b58c463c4f78219686ab0bf06ce6 14-May-2014 Andrew Lee <anwlee@google.com> Merge "Handle normalization of a "null" phone number."
8f402c36cb48905034e6ab689f614f21e8766639 14-May-2014 Evan Charlton <evanc@google.com> Revert "Expose sendEnvelope."

This reverts commit 6eac2ee0fc8a652c4cb1e7ca6602a080d4f82dbd.

Change-Id: Ie04a873bb1d4935208e687917e86cbe80312a6d1
elephonyManager.java
c0d138ab86459883c46551130190d97f76bd7e2f 14-May-2014 Evan Charlton <evanc@google.com> Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."

This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976.
elephonyManager.java
b31c310fcf9739729ef2e64eaf49ce2e86a8a058 14-May-2014 Andrew Lee <anwlee@google.com> Handle normalization of a "null" phone number.

Bug: 14900155
Change-Id: I1c4c5c6dec4c4c470b436102c72a7476d3d5237c
honeNumberUtils.java
784f90facfe32263a295fe512e20a10d1d8a250a 01-May-2014 Wink Saville <wink@google.com> am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '192384bb2708c49ca6c91432b8c848f43557429a':
Add support for NETWORK_TYPE_GSM
51d427ca9bca22d709f2940fb949cb38892c28a7 01-May-2014 Wink Saville <wink@google.com> am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '437994578272f9770748b152c53ec655059d19ec':
Add support for NETWORK_TYPE_GSM
74ec580873bb56cb5045a25efdb1eb7e2bac384c 01-May-2014 Wink Saville <wink@google.com> am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '7e411f74efe6dd383e59634760cccd96da1c209b':
Add support for NETWORK_TYPE_GSM
10731a6140ad9e1be895406206ced1db7b6d85cd 10-Aug-2013 Sandeep Kunta <skunta@codeaurora.org> Add support for NETWORK_TYPE_GSM

Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries for getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.

Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
erviceState.java
elephonyManager.java
293513a59d36cd96a3e474dde5981380d372d8c9 30-Apr-2014 Bill Yi <byi@google.com> Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
994a9a39b56a6cf7538c1b4254cdd604bc1c2557 26-Apr-2014 Wink Saville <wink@google.com> am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"

* commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57':
Telephony: Add functionality to handle ICC IO error
ae166fe9e074de30c24f5bd567f6404b50cd9cfa 26-Apr-2014 Wink Saville <wink@google.com> am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"

* commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d':
Telephony: Add functionality to handle ICC IO error
c79963c3cb6d0127e2fc9ce5bf000fa05811504d 26-Apr-2014 Wink Saville <wink@google.com> am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"

* commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
Telephony: Add functionality to handle ICC IO error
3f4867f49d6c1932117e3519ce10d11f37829f19 26-Apr-2014 Wink Saville <wink@google.com> Merge "Telephony: Add functionality to handle ICC IO error"
5e78e76ad7e33cf25082c815bfba2ab08a214af8 24-Apr-2014 Evan Charlton <evanc@google.com> resolved conflicts for merge of 806047ca to master-nova

Change-Id: I6754198919b952bd733733572f64a316cb41b101
2ffa11e4b71c545e34533ef827bdc1a07fbe8246 22-Apr-2014 Dianne Hackborn <hackbod@google.com> Start collecting mobile radio activity from the radio.

Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
ataConnectionRealTimeInfo.java
honeStateListener.java
a3db73388562d335864d646441dedd1fa2071e9b 16-Apr-2014 Evan Charlton <evanc@google.com> resolved conflicts for merge of 8d966e42 to master-nova

Change-Id: Ibcc7d1eb4f0349e90b8e97d5235a08efb8226ef6
070e061a289d771e62b58379eaed153fd285b04f 16-Apr-2014 Wink Saville <wink@google.com> Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event

Also added DataConnectionRealTimeInfo structure which passed as a
parameter to onDataConnectionRealTimeInfoChanged.

Change-Id: Iadcbf9765af57c125bcdf74e3fc652ed6c8f7d42
ataConnectionRealTimeInfo.aidl
ataConnectionRealTimeInfo.java
honeStateListener.java
9710faff3bf5107ada279047643832fe5d4b4cc8 11-Apr-2014 Brian Williammee <bwill@google.com> am 7217f380: Correct some comments (LTE->CDMA)

* commit '7217f3805819b6feca7ec1cc378a9ca56cf2d275':
Correct some comments (LTE->CDMA)
7217f3805819b6feca7ec1cc378a9ca56cf2d275 09-Aug-2013 Brian Williammee <bwill@google.com> Correct some comments (LTE->CDMA)

Change references to LTE in CellSignalStrengthCdma to CDMA.

Change-Id: I2c003746dcef84949af69e2fbd4e5db4906e1125
ellSignalStrengthCdma.java
20e3f02c2de4efd4ccf56112b39b6056582f283a 27-Mar-2014 Santos Cordon <santoscordon@gmail.com> Add disconnect cause to setDisconnected.

Change-Id: I4ba9b8f47a942b82b7a3d4bed43c0ca945957592
isconnectCause.java
6d21b125b917357502f4f6c2eb8c47849138737f 28-Mar-2014 Anders Kristensen <andersk@google.com> am 83ee4429: am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."

* commit '83ee4429f13896c82f3f29c8164888f1f6fe8309':
Remove duplicate call disconnect codes.
83ee4429f13896c82f3f29c8164888f1f6fe8309 28-Mar-2014 Anders Kristensen <andersk@google.com> am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."

* commit '7bce23f733cfaa1028e553852ff7762d7b32a893':
Remove duplicate call disconnect codes.
7bce23f733cfaa1028e553852ff7762d7b32a893 28-Mar-2014 Anders Kristensen <andersk@google.com> am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."

* commit 'aee03bb1a1077427c918ad9fea5fdd1ab204f60e':
Remove duplicate call disconnect codes.
fb48c1c722f1eff661a1f5e37cebb856b3e952cf 25-Mar-2014 Sailesh Nepal <sail@google.com> resolved conflicts for merge of 5e44cadf to master-nova

Change-Id: Ieacfbba60109a60b268c116a40e598c0745e8a3b
00ffde305da868401b78f92c3ad33fef0221bf7c 25-Mar-2014 Sailesh Nepal <sail@google.com> resolved conflicts for merge of 2d72d000 to master-nova

Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d
8b5f2b080d841fa44d970058dfb7d5c653c6deb6 20-Mar-2014 Gabriel Peal <gpeal@google.com> resolved conflicts for merge of c1edfc2c to master

Change-Id: Ica42d8ac1552040f7ea2864ff529f5fc1470001b
elephonyManager.java
f1e1e7714375b3b83f2cc3956b112293face56a1 21-Mar-2014 Gabriel Peal <gpeal@google.com> resolved conflicts for merge of 74fb97de to master

Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a
allStateListener.java
elephonyManager.java
4668f1ed0d9b4fbb321d25803192d53c31d1ec3d 25-Mar-2014 Gabriel Peal <gpeal@google.com> am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

* commit '8ee4491dc80943429cd79d0c7b87c28056067a58':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
8ee4491dc80943429cd79d0c7b87c28056067a58 25-Mar-2014 Gabriel Peal <gpeal@google.com> am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
16578caea887c258510a885476c11a2a9bc29f71 23-Mar-2014 Gabriel Peal <gpeal@google.com> am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
83da75d938d519bbcffb9c3b52802fd2daad4aee 20-Mar-2014 Gabriel Peal <gpeal@google.com> Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

The first set of these APIs is for telephony:

Added some APIs to ITelephony and created a first party framework for them

toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)

Bug: 13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
allStateListener.java
elephonyManager.java
37384dedab38239433a41641fe87fc3e51bb6976 14-Mar-2014 Shishir Agrawal <shishir@google.com> Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.

The RIL sendEnvelope command does not return the response from the SIM while
the sendEnvelopeWithStatus does. Since the response is required for certain
envelope commands, its better to expose sendEnvelopeWithStatus.

Change-Id: I209bfc59e396bb6f91345d6f99c51cfa35f2d650
elephonyManager.java
f099a5f389a43a1a1f0abc6577e45c7dfca14c5c 06-Feb-2013 Rakesh Pallerla <rakesh@codeaurora.org> Telephony: Add functionality to handle ICC IO error

At present in Android all ICC Card states other than
ICC PRESENT are treated as ICC ABSENT.Adding functionality
to handle ICC IO error card state.

Change-Id: I229bd80cb5e487f4345bef9fb7fee60850f085d9
Bug: 10643652
elephonyManager.java
9bbb37116d2c5b597f9b5e3094ff328971e03c0b 06-Mar-2014 Evan Charlton <evanc@google.com> resolved conflicts for merge 322f7d6e to master-nova

Change-Id: I31de6084253ce21f50224582f82b7f7e630ef34e
b584e690a69a3c286ba490a24575c03f4fdb283c 27-Feb-2014 Anders Kristensen <andersk@google.com> Remove duplicate call disconnect codes.

The Android code base defines call disconnect codes in three places:
- android.telephony.DisconnectCause
- android.internal.telephony.Connection.DisconnectCause
- com.android.services.telephony.common.Call.DisconnectCause

This CL consolidates the code to use the integer codes from
android.telephony.DisconnectCause everywhere.

Change-Id: I84a3fd5182a51d07fc7d81076e4b2c15ff26c61c
isconnectCause.java
4a2fa35a6ad03d5ee1cd03ae94b4e7d70b50811c 03-Mar-2014 Jake Hamby <jhamby@google.com> Add get/setPreferredNetworkType() for OMA DM client.

Add get/setPreferredNetworkType() commands for OMA DM client.

Bug: 8847590
Change-Id: Ia898d712b90ec583d61efe7385a5a1844d8beff1
elephonyManager.java
4a4db51194d64bf46d7e21acfef97b90eed378c6 24-Feb-2014 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 786e71ab to master-nova

Change-Id: Ibe5e0a68f59d95c4a8c721d9e21626714d33ccd0
786e71ab11f2d89afffc9db7473f16206395c813 06-Feb-2014 Jake Hamby <jhamby@google.com> Remove unneeded new RIL command.

Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.

Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
elephonyManager.java
7692be41290faccf3f38ab7ccf8844a7014cc6c1 12-Feb-2014 Evan Charlton <evanc@google.com> Delete telephony's CallService

This moved to telecomm; kill it again.

Change-Id: I6ae581ac3fe5417f3a17f10f8615caacc69a21ad
allService.java
968740b5f574fee11d71a35c321f4e9e13d13570 12-Feb-2014 Sailesh Nepal <sail@google.com> Add abstract base implementation of CallService.

Base implementation takes care of a lot of boilerplate code.

Change-Id: Iaf5a16f5718727cee0f7efb4af53a021536f50d8
allService.java
d13e1d2babf9e3d14d3fe661c7c701b3b18b3eca 13-Dec-2013 Ben Gilad <gilad@google.com> Remove the telecomm entries now that we have https://googleplex-android-review.git.corp.google.com/#/c/398927

DO NOT SUBMIT until the above CL is uploaded.

Change-Id: I4e4f19175b502ba81c882d1379d1d225b0e6ba67
allService.java
f86a9221a448178f4760192f082f3701ac487a47 19-Feb-2014 Sailesh Nepal <sail@google.com> Delete Third Party Call APIs

Change-Id: I6121c53362804a228e0316a1666b5032817530ab
hirdPartyCallListener.java
hirdPartyCallProvider.java
hirdPartyCallService.java
ded7d1871d702ce628bb8041f28677c801179a38 13-Feb-2014 Derek Tan <derektan@google.com> Fix the inconsistent name on @param and the real param.

Change-Id: If9853e91f55c0be89cdf77ae7c4369f274a45bb6
elephonyManager.java
51c66e72cfed0626c0e50c05f32f922d51a96406 13-Feb-2014 Derek Tan <derektan@google.com> Merge "Expose sendEnvelope." into master-nova
40f12d98248a8b4a6a34fc43538e349bda4289ef 13-Feb-2014 Narayan Kamath <narayan@google.com> am 00515148: resolved conflicts for merge of 396b9e79 to master

* commit '005151484546fb0bf7f83c5a6ee065715230bf26':
Telephony API extension v2
005151484546fb0bf7f83c5a6ee065715230bf26 13-Feb-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 396b9e79 to master

Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
bba3a694b8400fd340c0400bf42ef3d79a4285b1 13-Feb-2014 Wink Saville <wink@google.com> Merge "Telephony API extension v2"
6eac2ee0fc8a652c4cb1e7ca6602a080d4f82dbd 04-Feb-2014 Derek Tan <derektan@google.com> Expose sendEnvelope.

Change-Id: I21565fae9ba8f163aed9104db355aecf9bae1796
elephonyManager.java
2cde710fe42b706b368aec9b85f134f2d2452f7f 12-Feb-2014 Sailesh Nepal <sail@google.com> Update TelephonyManager.WifiCallingChoices API

This CL updates the order of the WifiCallingChoices values
to match the wifi_calling_choice_values resource.

Change-Id: Iaa643d7a70938877c760ff4a65f737a4c1c750da
elephonyManager.java
bdd484f6f263f44f31709b71c4d2843442fd830a 12-Feb-2014 Sailesh Nepal <sail@google.com> Add abstract base implementation of CallService.

Base implementation takes care of a lot of boilerplate code.

Change-Id: Iaf5a16f5718727cee0f7efb4af53a021536f50d8
allService.java
1bd7876d76167922f38d78747c5696c82020c1ea 12-Feb-2014 Sailesh Nepal <sail@google.com> Add Wi-Fi calling state setting to telephony interfaces

Change-Id: I01029ade0eb1ff981cb92a536d042a02129a053f
elephonyManager.java
512b28309d3ee5dd506e62fb14913047b6049236 12-Feb-2014 Sailesh Nepal <sail@google.com> DO NOT MERGE ThirdPartyCallSendDtmfCallBack API

This API is needed to implement post dial.

Change-Id: Iefdeae81d0eae6be86e7ee1e8ab0251ae43ed079
hirdPartyCallProvider.java
hirdPartyCallSendDtmfCallback.java
960fe9a5ff2a629d62e3252a37e4ec598af54b6a 12-Feb-2014 Sailesh Nepal <sail@google.com> ThirdPartyPhone: DTMF & callerDisplayName API DO NOT MERGE

This CL extends the ThirdPartyCall API to support DTMF and
callerDisplayname.

Change-Id: Ia3b4730e852a95d0c11fbddfbe1b780aec39dbb5
elephonyManager.java
hirdPartyCallProvider.java
aae9216320328e6b865725219a31a029ea46c1b0 12-Feb-2014 Sailesh Nepal <sail@google.com> Add new phone type (public API) DO NOT MERGE

This CL adds a new public API to allow services to implement calls.

Change-Id: I4d30eb4d91bd342506cad4ced059bd8446c2bec4
elephonyManager.java
hirdPartyCallListener.java
hirdPartyCallProvider.java
hirdPartyCallService.java
b47ed4f44a8ef802143fbc68d24384b4847ad834 12-Feb-2014 Sailesh Nepal <sail@google.com> Revert "Add new phone type (public API) DO NOT MERGE"

This reverts commit 0590ac70a93c713c6cf28c3bcbce287d9864f037.

Change-Id: I1f4b34c0f8246bb601e2ba5f14eabe9c36d33d94
elephonyManager.java
hirdPartyCallListener.java
hirdPartyCallProvider.java
hirdPartyCallService.java
0590ac70a93c713c6cf28c3bcbce287d9864f037 12-Feb-2014 Sailesh Nepal <sail@google.com> Add new phone type (public API) DO NOT MERGE

This CL adds a new public API to allow services to implement calls.

Change-Id: If6fef93aebc8b199880ad44d35b7d8ae69f71f9e
elephonyManager.java
hirdPartyCallListener.java
hirdPartyCallProvider.java
hirdPartyCallService.java
8f9b33e77686de8e917ba61c5e2f2e31a1e0e49b 15-Jan-2014 Jake Hamby <jhamby@google.com> Add new RIL commands to read/write NV items and reset NV config.

Add new RIL commands and generic code cleanups.

The only changes required for OMA DM support are the
addition of five new methods in ITelephony.aidl for
reading/writing NV items and performing NV config and
radio resets (requires MODIFY_PHONE_STATE), along with
the new RIL request IDs in RILConstants.java.

Bug: 12864208
Change-Id: I958d2571580d98a49936ef2e6822e5ac086acbe2
ellInfo.java
honeStateListener.java
elephonyManager.java
bef895865286ed6ce01e37af7e2e213bd52f9bb0 16-Jan-2014 Wink Saville <wink@google.com> am 9bc74c4b: am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"

* commit '9bc74c4b20bc0c88d01b832517122c28439aa406':
Fixed mistaken reference to "LTE". Bug 7637224
c5ac15a3e11c03951e269b243674858411204b67 27-May-2013 Antonio Marín Cerezuela <amarin@swissms.ch> Telephony API extension v2

Added new AndroidManifest permission:

android.permission.READ_PRECISE_PHONE_STATE

Added the following PhoneStateListeners and corresponding broadcast intents:

onPreciseCallStateChanged(PreciseCallState callState);
onPreciseDataConnectionStateChanged(PreciseDataConnectionState dataConnectionState);

broadcastPreciseCallStateChanged(int ringingCallState, int foregroundCallState, int backgroundCallState,
int disconnectCause, int preciseDisconnectCause)
broadcastPreciseDataConnectionStateChanged(int state, int networkType, String apnType, String apn,
String reason, LinkProperties linkProperties, String failCause)

Added TelephonyManager intent actions with their extras and constants:

public static final String ACTION_PRECISE_CALL_STATE_CHANGED = "android.intent.action.PRECISE_CALL_STATE";
public static final String ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.PRECISE_DATA_CONNECTION_STATE_CHANGED";

public static final int PRECISE_CALL_STATE_*

Moved public static final int DISCONNECT_CAUSE_* from PreciseCallState.java to a new class DisconnectCause.java

Moved public static final int PRECISE_DISCONNECT_CAUSE_* from PreciseCallState.java to a new class PreciseDisconnectCause.java

Change-Id: If3b88c679507c529b746046c4a17cf6d9974bd09
isconnectCause.java
honeStateListener.java
reciseCallState.aidl
reciseCallState.java
reciseDataConnectionState.aidl
reciseDataConnectionState.java
reciseDisconnectCause.java
elephonyManager.java
5ceef3288d9a0b3e5510addb0abe6f358bc8c2ee 09-Jan-2014 David Friedman <dmail@google.com> Fixed mistaken reference to "LTE".
Bug 7637224

Change-Id: I9c78fe6edd1182f8132cc5db9ecedbb69681b473
ellSignalStrengthCdma.java
710de6dc03ff4b3105638461cfc03313f60ba147 19-Dec-2013 Yorke Lee <yorkelee@google.com> Merge "PhoneNumberUtils API changes"
375890841df7aad36a042861f6a70f11e1f32766 17-Dec-2013 Shishir Agrawal <shishir@google.com> Fixing build breakage due to: c4d41755d73ffe85d179d42a4f0c993b49303145

Mismatched @param in javadoc.

Change-Id: I9034fac389e89e59c0245203543f52504bfc58d7
elephonyManager.java
57f656b9f6271cf857b5ecec5f8c7eacb321ec0b 28-Oct-2013 Shishir Agrawal <shishir@google.com> Adding support for SIM communication from Android over logical channels.

Expose the folowing commands in ITelephony.aidl and TelephonyManager:
- iccOpenLogicalChannel
- iccCloseLogicalChannel
- iccTransmitApduLogicalChannel

Also add a new SIM_COMMUNICATION permission (maked as dangerous) to control
access to the above commands.

Change-Id: I89c08adc6f9738907e3b547c749f3cc61f300710
elephonyManager.java
99d16995167f076b385aadb6f383c0ac62d5dd27 16-Nov-2013 Yorke Lee <yorkelee@google.com> PhoneNumberUtils API changes

Unhide the following methods:
PhoneNumberFormattingTextWatcher(String countryCode)
formatNumber(String phoneNumber, String defaultCountryIso)
formatNumber(String phoneNumber, String phoneNumberE164, String defaultCountryISO)
formatNumberToE164(String phoneNumber, String defaultCountryIso)
(The previous 3 formatting methods use an instance of PhoneNumberUtil to do the formatting)
isLocalEmergencyNumber(String number, Context context)
isVoicemailNumber(String number)
replaceUnicodeDigits(String number)
normalizeNumber(String phoneNumber)

Deprecate the following methods. These formatting-related methods don't use
PhoneNumberUtil to perform the formatting, and so are considered broken:
formatNumber(String source)
formatNumber(String source, int defaultFormattingType)
getFormatTypeForLocale(Locale locale)
formatNumber(Editable text, int defaultFormattingType)
formatNanpNumber(Editable text)
formatJapaneseNumber(Editable text)

Change-Id: Ibf854092b7db05f7e3e9401cc909c9f1ed4997b0
honeNumberFormattingTextWatcher.java
honeNumberUtils.java
6090995951c6e2e4dcf38102f01793f8a94166e1 19-Nov-2013 John Spurlock <jspurlock@google.com> Remove unused imports from frameworks/base.

Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
ellLocation.java
ellSignalStrength.java
honeStateListener.java
log.java
hirdPartyCallListener.java
hirdPartyCallService.java
697d9f2f30dfaf87fbebdd182e47fc552d345ce5 12-Nov-2013 Sailesh Nepal <sail@google.com> Add ThirdPartyCall APIs to master

These are APIs for the new ThirdPartyPhone feature.

Note, these APIs can't actually be used yet on master for two reasons:
- initiating a call from a 3rd party app isn't possible yet because
the TelephonyManager APIs aren't being added to master.
- the TeleService implementation of these APIs aren't being added to
master.

Also, these APIs will be removed and the final ones will be added
once they're ready to be merged into master.

Change-Id: Ie783290451da448a011f813983e55b12047b5d99
hirdPartyCallListener.java
hirdPartyCallProvider.java
hirdPartyCallService.java
921bf624622962ad862e470c11e0f6cc508f25a8 05-Nov-2013 Jake Hamby <jhamby@google.com> Add PhoneNumberUtils method for CDMA SMS number formatting.

For CDMA networks, convert "+" prefix to "011" if the home network
is using the North American Numbering Plan (NANP). New method is
only used for MO SMS messages.

Bug: 11360679
Change-Id: I534e0322b566de3fb49d7333bfcf62cfbfafb78a
honeNumberUtils.java
46401a312dd18ec738295e7796a8014f60080bf1 20-Oct-2013 Sungmin Choi <sungmin.choi@lge.com> Fix typo for radio technology

Bug: 11317677
Change-Id: I792517f4c3aa568b014d6c2bc0023ce5255f8abb
erviceState.java
3fd9cb155c2b4c28eed9cd886a3dfb01854f477b 14-Oct-2013 Wink Saville <wink@google.com> Merge "Telephony: Read signal strength values as expected" into klp-dev
306ed4fd4f7e05d0e87b06816fd8bc6bc7d91846 14-Oct-2013 Scott Main <smain@google.com> am 3a920545: am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE

* commit '3a92054541864c1831fc1a67ea711acd2c4f3690':
more documentation for SEND_RESPOND_VIA_MESSAGE
3a92054541864c1831fc1a67ea711acd2c4f3690 14-Oct-2013 Scott Main <smain@google.com> am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE

* commit '2cc953f19ad5b7bd2ff1ef4d239cd638daf90744':
more documentation for SEND_RESPOND_VIA_MESSAGE
9006c422909a13e61aa10bac385f05940f345b3b 14-Oct-2013 Scott Main <smain@google.com> more documentation for SEND_RESPOND_VIA_MESSAGE

Change-Id: I51ffd122a99481694088d84d46a50752c4c07a48
elephonyManager.java
dbf09ffed27b35cf310e3c53402edf0f56f5e7d1 01-Oct-2013 Jaime Lopez <jaimel@codeaurora.org> Telephony: Read signal strength values as expected

Telephony framework expects Lte rsrp and rsrq, as well
as dbm and ecio values for cdma and evdoe to be negative.
RIL Interface provides positive values.
Fix that by changing the constructor from Parcel to
also multiply by -1
Writing to parcel also modified for consistency

Bug: 10440827
Change-Id: I6a8112a5b343c5e6c6dc12332a6e9a489b093cc1
ellSignalStrengthCdma.java
ellSignalStrengthLte.java
d2078bc8c927af17c367bc53b198ad3787b2ff72 03-Oct-2013 Yuhao Zheng <yuhaozheng@google.com> New Telephony APIs to return MMS UA and UAProfUrl

Added two public APIs under TelephonyManager to return MMS UserAgent and
UAProfUrl strings, for apps that handle SMS/MMS.

Bug: 11054501

Change-Id: Ifa1a64990fa2bf7d0e340d784a9672bf79525338
elephonyManager.java
95d785346b4dae808a2d8f77356175e55a572d96 11-Sep-2013 Dianne Hackborn <hackbod@google.com> Fix issue #10688644: Java crash in com.android.phone:

java.lang.SecurityException: Operation not allowed

There was a situation I wasn't taking into account -- components
declared by the system has a special ability to run in the processes
of other uids. This means that if that code loaded into another
process tries to do anything needing an app op verification, it will
fail, because it will say it is calling as the system package name but
it is not actually coming from the system uid.

To fix this, we add a new Context.getOpPackageName() to go along-side
getBasePackageName(). This is a special call for use by all app ops
verification, which will be initialized with either the base package
name, the actual package name, or now the default package name of the
process if we are creating a context for system code being loaded into
a non-system process.

I had to update all of the code doing app ops checks to switch to this
method to get the calling package name.

Also improve the security exception throw to have a more descriptive
error message.

Change-Id: Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25
elephonyManager.java
67c81341660965517079de07a1fc9affc5a28681 07-Sep-2013 Wink Saville <wink@google.com> For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM

Bug: 9710534
Change-Id: Iba999579d30045f18b5d370359dbce65d9646c69
elephonyManager.java
04dfb5ec3cb9f5a1dac737b429919a3e82768aab 28-Aug-2013 Santos Cordon <santoscordon@google.com> Protecting against NPE with null country detector.

bug:10514454
Change-Id: I316c47eddbe4929599866a3f9da9129d0056e3e2
honeNumberUtils.java
ef8267c6ad54eb4c8c00d3d36333fb12dd519588 21-Jun-2013 Wink Saville <wink@google.com> am 7334d25e: am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."

* commit '7334d25e79d733b419aacfd706aad762f823f2f9':
Fix misspelling of getLteSignalStrenght.
7334d25e79d733b419aacfd706aad762f823f2f9 21-Jun-2013 Wink Saville <wink@google.com> am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."

* commit '34fb4eae36bc926886149718672809a1ad43be97':
Fix misspelling of getLteSignalStrenght.
29c8b00f14675aa35ef44a58a60947f477247a1a 21-Jun-2013 Wink Saville <wink@google.com> Fix misspelling of getLteSignalStrenght.

Change to getLteSignalStrength.

Change-Id: Ie2acec9e01af0e64a61902383f06729a7cee1975
ellSignalStrengthLte.java
ignalStrength.java
d11a3103046554e70023294446969a321779231a 19-Jun-2013 Wink Saville <wink@google.com> am 7f081794: am c80e3d43: TelephonyManager.listen can have notifyNow always true.

* commit '7f081794074c1356ba347b802729adf36f06ad19':
TelephonyManager.listen can have notifyNow always true.
c80e3d434f034d8594014df2fe028e9420930ea8 19-Jun-2013 Wink Saville <wink@google.com> TelephonyManager.listen can have notifyNow always true.

Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.

This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.

Bug: 9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
elephonyManager.java
0f34894ed83a20ab4fcf9edb6437b59527ca9585 05-Jun-2013 Scott Main <smain@google.com> am aafed1df: add link to required permission from ACTION_RESPOND_VIA_MESSAGE

* commit 'aafed1df0404e2fb64c1adeb127dc7f300a2c07b':
add link to required permission from ACTION_RESPOND_VIA_MESSAGE
aafed1df0404e2fb64c1adeb127dc7f300a2c07b 05-Jun-2013 Scott Main <smain@google.com> add link to required permission from ACTION_RESPOND_VIA_MESSAGE

Change-Id: Iafa9c72c9bbd8258c7f961f7ab8ad78c96b61e54
elephonyManager.java
8ca5d64a39395ef6d9f800e843ef706c7ab8bf51 01-Jun-2013 Wink Saville <wink@google.com> am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"

* commit '39136d391ab04e93fd0a01b760e57b6ea079cf4c':
Fixing crash in PhoneNumberUtils getNumberFromIntent
2227067d99af771e86ce507e952fd5ff5d429a89 06-Feb-2013 Magnus Karlsson <magnus3.karlsson@sonymobile.com> Fixing crash in PhoneNumberUtils getNumberFromIntent

Handling intent with no data when trying to retrieve number from
intent.

Change-Id: If7c5930e7048aec732fb7a3fbeb3391e1408b071
honeNumberUtils.java
ca3597d4369b308c7c4d3553abfcc5788d10414a 26-Apr-2013 Wink Saville <wink@google.com> Enhance TelephonyManger javadocs.

Bug: 856818
Change-Id: Idd30361f57b0f6627132a25e5b9520f30fce548c
elephonyManager.java
e3a9cbc052db7f00a96cc7b9580097d67538f360 18-Apr-2013 Wink Saville <wink@google.com> Add CellInfoWcdma and related classes.

Update javadoc's to define invalid values are Integer.MAX_VALUE.

Bug: 8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellIdentityWcdma.java
ellInfo.java
ellInfoWcdma.java
ellSignalStrengthGsm.java
ellSignalStrengthWcdma.java
e5ac8217727e792fc378e70d7439b373952e7674 10-Apr-2013 Wink Saville <wink@google.com> Update function comment for getAllCellInfo

Bug: 8235566
Change-Id: Iae9b11480605d5302ee45601d1357fc07f9bd3e1
elephonyManager.java
094beeccf5bf6e68d73f94a1aeaeda6690f4bf06 06-Apr-2013 Wink Saville <wink@google.com> Add FW support for CellInfo RIL commands.

Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellInfo.java
ellInfoCdma.java
ellInfoGsm.java
ellInfoLte.java
elephonyManager.java
efbca4d01d2fe6ecb9e697aea71da44fefcfc094 08-Apr-2013 Wink Saville <wink@google.com> Fix SignalStrength response.

Add makeSignalStrengthFromRilParcel for use by
RIL responseRilSignalStrength.

Bug: 8561333
Change-Id: Ie6eb3b0335e8d7ea114ec70b3fb72e917094632e
ignalStrength.java
52a08cf683a6d183222d795862cfd135cec5694f 21-Mar-2013 Sungmin Choi <sungmin.choi@lge.com> make new API to retrieve group identifier level1

For mvno, user can add or edit mvno data field. To pre-provide
the mvno data of the edited apn when the user selects one of
the mvno types, need to support IMSI, SPN, and GID1 data.
To support GID1, make API to retrieve group identifier level1.

bug:6445254
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
elephonyManager.java
e2c508121825d37c12669c642b6c43e1bf84b566 12-Feb-2013 Wink Saville <wink@google.com> Turn off debug in CellInfoLte.

Change-Id: Icf3ea5dad9eef71f644de2292db0b0d3960ced9d
ellInfoLte.java
8a747410e19f1bfd0cbae7415f2aabe35481b22f 04-Feb-2013 Santos Cordon <santoscordon@google.com> Fixing up doc links.

Change-Id: Id0e7f5007ce04fa714e3c1f21914b750b59aed3c
elephonyManager.java
3b53da493440efbacd147d1aedcea8679c3a642b 04-Feb-2013 Santos Cordon <santoscordon@google.com> Merge "Sort out permission around "instant text response""
f265ea9d8307282ff1da3915978625a94fc2859e 01-Feb-2013 Dianne Hackborn <hackbod@google.com> App ops: vibration, neighboring cells, dialing, etc.

Improve handling of vibration op, so that apps are
better blamed (there is now a hidden vibrator API that
supplies the app to blame, and the system now uses this
when vibrating on behalf of an app).

Add operation for retrieving neighboring cell information.

Add a new op for calling a phone number. This required
plumbing information about the launching package name through
the activity manager, which required changing the internal
startActivity class, which required hitting a ton of code that
uses those internal APIs.

Change-Id: I3f8015634fdb296558f07fe654fb8d53e5c94d07
elephonyManager.java
d0c4ce4c3d7315642d3b06fbb95512a9ce8e498c 23-Jan-2013 Wink Saville <wink@google.com> am 24dbdc7d: am 23d85a91: am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."

* commit '24dbdc7d0e1e20b5c598561e7f5ed9c4dd335b7b':
Telephony: Consider EVDO ecio zero value as valid.
d84d289f443f5799fb1a81432428703dadb026dd 23-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Consider EVDO ecio zero value as valid."
c48233c60d8fdb93b62c19a7f77cb56242fe1f65 04-Jan-2013 Wink Saville <wink@google.com> am c6e41cf2: am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes"

* commit 'c6e41cf2680773b02a7d8caacb6047ed31d6c260':
frameworks/base: Support for LTE network modes
ec7f4a69535151e04d11b66bd2de5c69c133f022 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> frameworks/base: Support for LTE network modes

Change-Id: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
elephonyManager.java
22b1e80c24c5fbd702a19f2511ee2897baaf3e98 07-Dec-2012 Wink Saville <wink@google.com> Use Rlog

Change-Id: I44919126606cd55f7dce7c942027ed0d914f04bd
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellInfoCdma.java
ellInfoGsm.java
ellInfoLte.java
ellSignalStrengthCdma.java
ellSignalStrengthGsm.java
ellSignalStrengthLte.java
honeNumberUtils.java
honeStateListener.java
erviceState.java
ignalStrength.java
elephonyManager.java
149ceec6ebac9dd000c213fc91ee8e5c08522cc6 26-Mar-2012 Daisuke Miyakawa <dmiyakawa@google.com> Sort out permission around "instant text response"

- Remove SEND_SMS_NO_CONFIRMATION

- Add SEND_RESPOND_VIA_MESSAGE Permission
This permission is held by the phone and applications that want to
handle respond-via-message should require this permission of the
sender. This permission is signature/system and currently only held
by the Phone app.

Bug: 5108429
Change-Id: Ib611368d488de2f8e1e853f550eb2c654305eda4
elephonyManager.java
7ba6a6778e1583f45bcfc81505d5b9016bc1eb60 06-Dec-2012 Wink Saville <wink@google.com> Add Rlog.java

Rlog is like Log except that the destination buffer is
the radio buffer instead of the main buffer.

Change-Id: Ib4ce47abfda31dfc0b9193b10f8f42b225275f61
log.java
599a90c2a02645a5f2d189b9065b863397a4076e 27-Nov-2012 Wink Saville <wink@google.com> Use Rlog instead of Log

Change-Id: I2332f4210ead8a6d751fc9c0505db25033641da2
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellInfoCdma.java
ellInfoGsm.java
ellInfoLte.java
ellSignalStrengthCdma.java
ellSignalStrengthGsm.java
ellSignalStrengthLte.java
honeNumberUtils.java
honeStateListener.java
log.java
erviceState.java
ignalStrength.java
elephonyManager.java
0dde2c20a07770bc2f1b21e49222c968f3d8b39a 16-Nov-2012 Wink Saville <wink@google.com> Separate voice and data radio technology/network type & registration state.

Change-Id: Ic9622e3fd637751b427c1627bbdf4d142acbc66e
erviceState.java
elephonyManager.java
69e25226a3020bfcd33f7f8beee6004dd2a292c3 16-Nov-2012 Wink Saville <wink@google.com> Revert "Separate voice and data radio technology/network type & registration state."

This reverts commit b690ac3b27d9b782a23a5f9a82bb3421e88716e3

Change-Id: I006ab1fb9c7fb8da64e2c481a2b6f0cb137deba4
erviceState.java
elephonyManager.java
b690ac3b27d9b782a23a5f9a82bb3421e88716e3 15-Nov-2012 Wink Saville <wink@google.com> Separate voice and data radio technology/network type & registration state.

Change-Id: I2802eb5c5833e3b81891da82b71acc51ca5af81f
erviceState.java
elephonyManager.java
58ed5d748c0b9b64845975ef5844ad313de7c3f6 07-Nov-2012 Kenny Root <kroot@google.com> am 768d9e1a: Merge "Correct executable bit for source files"

* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
3a084af2e90849aaa8beb3a610189e3399c63ea0 07-Nov-2012 Kenny Root <kroot@google.com> Correct executable bit for source files

Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
ignalStrength.java
elephonyManager.java
8ab862cbd4eeeb52ab921a555b7a006e89fd2abc 21-Sep-2012 Banavathu, Srinivas Naik <snb@codeaurora.org> Telephony: Consider EVDO ecio zero value as valid.

When mEvdoEcio receives 0 getEvdoEcio returns -1.

Ecio valid values are positive integers, to fix this
consider EVDO ecio zero value as valid.

Change-Id: Ice8415150e7502c7f39e1a4135d35ea2bec1eb1f
CRs-Fixed: 402159
ignalStrength.java
8a06969d5be623d4efd3bdf2c3ecddcde557eca7 24-Sep-2012 Wink Saville <wink@google.com> Merge "Refactor Cell Location public API." into jb-mr1-dev
c6e4917adda19beb780386bcc26b652748b8ab13 21-Sep-2012 Wink Saville <wink@google.com> Refactor Cell Location public API.

Bug: 7189651
Change-Id: I173412095a5f7ae6116ee65b5315782f1c0c7688
ellIdentity.java
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellInfo.java
ellInfoCdma.java
ellInfoGsm.java
ellInfoLte.java
ellSignalStrength.java
ellSignalStrengthCdma.java
ellSignalStrengthGsm.java
ellSignalStrengthLte.java
a12a7b3d3d8fc8678411295df4d001447b33a994 20-Sep-2012 Wink Saville <wink@google.com> Suppress location information for non-active users.

Specifically, don't allow call backs for LISTEN_CELL_LOCATION and
LISTEN_CELL_INFO.

Bug: 7087342
Change-Id: Ida7f60b5bde3f28264dcb454b38fcfb1f1616d11
elephonyManager.java
82e6ee62b2be3c716c215e4ba72c8a12c58620fb 28-Aug-2012 Wink Saville <wink@google.com> Unhide some CellSignalStrength methods.

When submitting originally I'd missed unhiding these methods.

Change-Id: I627a5ea0c8c29b6ddfe5b1c49f9c0789d5e86456
ellSignalStrength.java
ellSignalStrengthCdma.java
ellSignalStrengthGsm.java
ellSignalStrengthLte.java
2900a3fae6e3da65522ffc16673ab1757352afbb 14-Aug-2012 Wink Saville <wink@google.com> Fix build.

I tried to get these into the merge conflict resolution,
but didn't succeed.

Change-Id: Id474415869182da438c09f7a75ee54c098fbc81e
ellSignalStrengthLte.java
ignalStrength.java
c1e68d133cb587be4f77a0a7f3affd42b2408412 14-Aug-2012 Wink Saville <wink@google.com> Merge commit 'e0df2c4f' into fix-merge-conflict

* commit 'e0df2c4f':
Telephony: Signal Strength cleanup & LTE support

Change-Id: I655fcc0cf430820a50a8751ac132c73f7d8e0c6f
e0df2c4f5df793236707f573b5318ce43630c848 13-Aug-2012 Wink Saville <wink@google.com> am eca64977: Merge "Telephony: Signal Strength cleanup & LTE support"

* commit 'eca64977041c5df0c987bdae56006ebbe86de677':
Telephony: Signal Strength cleanup & LTE support
a44b137648c44cc29a8ce43f44a7934ff8045135 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> 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
ignalStrength.java
9742553603af071b5087df3e352e2ad4ac1d382f 02-Aug-2012 Wink Saville <wink@google.com> Merge "Unhide the new location API's" into jb-mr1-dev
432139b5c3bcbb3762fb7de1717e816d2b7c90f0 28-Jul-2012 Robert Greenwalt <rgreenwalt@google.com> Reduce log spam.

Turn off DBG in SignalStrength.java

Change-Id: Ida1bded2551272956115aef5f3eda0f2a8cf3aed
ignalStrength.java
3caf66d2ea63c75039daf43af30d3727e5ce6b58 26-Jul-2012 Wink Saville <wink@google.com> Unhide the new location API's

Change-Id: I41cc89998b8bd1e6686ea30475ab8905a133e312
ellIdentity.java
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellInfo.java
ellInfoCdma.java
ellInfoGsm.java
ellInfoLte.java
ellSignalStrength.java
ellSignalStrengthCdma.java
ellSignalStrengthGsm.java
ellSignalStrengthLte.java
honeStateListener.java
elephonyManager.java
6f65b6ee71f566a8c35374f95a280f65b4c08d07 26-Jul-2012 Jake Hamby <jhamby@google.com> am 0c8a7768: am 893d93d2: Implement CMAS service category program results.

* commit '0c8a7768e04513f5175add42c7be6240a703ff73':
Implement CMAS service category program results.
b208a24cf521401912cfce16fce550a995cf1250 25-Jul-2012 Wink Saville <wink@google.com> Revise and update CellInfo API's

Change-Id: I25a46076a244f50edb9da65816b3717e00820b34
dmaCellIdentity.java
ellIdentity.java
ellIdentityCdma.java
ellIdentityGsm.java
ellIdentityLte.java
ellInfo.java
ellInfoCdma.java
ellInfoGsm.java
ellInfoLte.java
ellSignalStrength.java
ellSignalStrengthCdma.java
ellSignalStrengthGsm.java
ellSignalStrengthLte.java
smCellIdentity.java
teCellIdentity.java
honeStateListener.java
ignalStrength.java
elephonyManager.java
893d93d2076ccbb4d8c9d37bf6ffe14e4847a470 25-Jul-2012 Jake Hamby <jhamby@google.com> 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
dma/CdmaSmsCbProgramData.java
dma/CdmaSmsCbProgramResults.java
33034b13cae1429d526722374bd39be3f9605ae4 10-Jul-2012 Wink Saville <wink@google.com> 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
ellBroadcastMessage.java
ellLocation.java
honeStateListener.java
msCbCmasInfo.java
msCbEtwsInfo.java
msCbLocation.java
msCbMessage.java
msManager.java
msMessage.java
elephonyManager.java
sm/SmsManager.java
sm/SmsMessage.java
a639b311e93ad14d9ee5c2b2c215ed2d86c32d2a 10-Jul-2012 Wink Saville <wink@google.com> Create telephony-common and mms-common

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
ellBroadcastMessage.java
ellLocation.java
honeStateListener.java
msCbCmasInfo.java
msCbEtwsInfo.java
msCbLocation.java
msCbMessage.java
msManager.java
msMessage.java
elephonyManager.java
sm/SmsManager.java
sm/SmsMessage.java
e0f8b91e049b51770329c43e38aa88ccbb957104 12-Jun-2012 Wink Saville <wink@google.com> 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
f75e3e01f6e574a411fa936e070a7a9f2f606da7 12-Jun-2012 Wink Saville <wink@google.com> am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"

* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
Adds documentation to CdmaCellLocation get lat/long methods
3fe79dfdf4ca63535ec9e586ebed553a862061ea 12-Jun-2012 Wink Saville <wink@google.com> Merge "Adds utility method to convert 0.25 secs to decimal degrees"
bc69f97c663ec37aabf8ac4192752ecba0e00200 12-Jun-2012 Wink Saville <wink@google.com> Merge "Adds documentation to CdmaCellLocation get lat/long methods"
e69ec2253cd2e151a6a98e87d1bbf5d5cfa05bed 09-May-2012 Daisuke Miyakawa <dmiyakawa@google.com> Remove STOPSHIP part of the logging in telephony

We still need the log itself to trap the exceptional case.

Bug: 6201805
Change-Id: I62d12f6a1ed41817ee12c0f5c7fc4aa0a967a60f
honeNumberUtils.java
67662767d98c42c34519767956aebe9d90f31c3a 13-Jan-2012 Sean Barbeau <sjbarbeau@gmail.com> Adds utility method to convert 0.25 secs to decimal degrees

This patch adds a utility method that converts latitude and longitude
in quarter seconds units to decimal degrees units. The Telephony API
returns CDMA base station latitude and longitude in quarter seconds
due to a 3GPP telecom standard, while the Android Location API, and
the vast majority of application-level code, uses decimal degrees.

For example, to measure the distance from the user's current location
to the base station using the Location API Location.distanceBetween()
method (http://goo.gl/YjO8O), the base station lat and long would need
to be converted to decimal degrees first.

Since most application developers will likely never use lat/long information
in quarter seconds units, and instead will need this information in decimal
degrees, this utility method will frequently be used by anyone querying
base station location data from CdmaCellLocation.

Sample values to test conversion:

0.25 seconds: lat = 399491, long = -1189145
is equivalent to
decimal degrees: lat = 27.742430555555554, long = -82.57951388888888

Change-Id: If03e741f5035a37519f50d4fb2fb3e3eef2505da
Signed-off-by: Sean Barbeau <sjbarbeau@gmail.com>
dma/CdmaCellLocation.java
0205537536431204b11459e9d2d2eccf3924c6cd 24-Apr-2012 Daisuke Miyakawa <dmiyakawa@google.com> Add debug log for 5914560 and 6383850

This won't be shown in usual condition since in most cases the method
will just use the block just above the logging and return true/false
there. On the other hand this might be useful if the case is truely
exceptional and thus this path is really used.

Bug: 5914560
Bug: 6383850
Change-Id: I2242f93a9b905b5a39d997aa30d9fd6f5bfbdf49
honeNumberUtils.java
c3296ffdfc70c6778b6ae760b812b4e53e335f97 18-Apr-2012 Jake Hamby <jhamby@google.com> Add ContentProvider for apps to read received SMS cell broadcasts.

The CellBroadcastReceiver app will allow apps with the new permission
"android.permission.READ_CELL_BROADCASTS" to read previously received
cell broadcast messages from a new ContentProvider database at URI
"content://cellbroadcasts". This will enable third parties to provide
additional information to users in the event of emergencies without
delaying or interfering with the initial system alert dialog to warn
the user when the alert is received.

Includes a new android.telephony.CellBroadcastMessage class which
can be instantiated from the Cursor retrieved from the ContentProvider.
This was previously a part of the CellBroadcastReceiver app, but can now
be used by third party apps with read permission on the ContentProvider.

Change-Id: I2c31f62b63c050c7946de2d81c28a5f4dc6f00b0
ellBroadcastMessage.java
f80310d3c56387091ccd4111b698c09f76b8c53d 13-Jan-2012 jshin <jgsin@samsung.com> Added API to replace unicoded digits to ascii numbers

Users can enter arabic phone number or click arabic phone number
to send MMS. Works for generic Unicode digits (full-width, etc.).

bug:5615791
Change-Id: Ieec8c5c6c3736ee2b4ac8ddf17f8c41b2001460e

Signed-off-by: Jake Hamby <jhamby@google.com>
honeNumberUtils.java
e333c82da35119cfa25109328c3db98fa84f965e 13-Jan-2012 Jake Hamby <jhamby@google.com> Convert Arabic phone numbers to ASCII when sending SMS.

Modify PhoneNumberUtils to automatically convert non-ASCII digits,
such as Arabic-Indic numbers, CJK full-width digits, etc., to ASCII
in normalizeNumber(), extractNetworkPortion(), and stripSeparators().

This enables the SMS application to support sending SMS's to phone
numbers written with Arabic, or other non-ASCII digits. The number will
be converted to ASCII digits and formatted for the user according to the
country formatting rules.

Bug: 5615791
Change-Id: I42039285db5795b1dda22e4251f54af302e27f13

Signed-off-by: Jake Hamby <jhamby@google.com>
honeNumberUtils.java
2119ade6d737345d58145e773f5877c199a3e20d 06-Apr-2012 John Wang <johnwang@google.com> Merge "Enhance Cell Location Api."
8fc27e8b87bd1def854a03d84009143b315d4176 05-Apr-2012 Jeff Sharkey <jsharkey@android.com> Support metered Wi-Fi NetworkPolicy.

Add networkId field to NetworkIdentity to identify Wi-Fi networks by
SSID. Add support for policies without usage cycles.

Only apply mobile policies when SIM state is ready, which is cleaner
than just checking for airplane mode. Also avoids creating no-op
default policies when subscriberId is null.

Bug: 3001465, 3291052
Change-Id: I1f8aaa49a5db306df022c402ea7f3f5d4bc0cfc7
elephonyManager.java
963db55d59a170f4b17ff907c96615a19ef6fe17 31-Mar-2012 John Wang <johnwang@google.com> Enhance Cell Location Api.

To boost accurary and enhance capability of cell location api,
two new APIs, TelephonyManager.getAllCellInfo() and
TelephonyManager.listen(LISTEN_CELL_INFO), are added. Two new
Class, CellInfo and CellIdentity, are created.

This API change returns all information of one cell locaiton
at the same time. It also provides additional LTE and timestamp information.

Change-Id: I4d0f813107e625ec4ac88c8d980ffd171aa5fc30
dmaCellIdentity.java
ellIdentity.java
ellInfo.aidl
ellInfo.java
smCellIdentity.java
teCellIdentity.java
eighboringCellInfo.aidl
honeStateListener.java
erviceState.aidl
ignalStrength.aidl
elephonyManager.java
3e3c3f80a90b156ff500076f8655647dfb317acf 06-Feb-2012 Jake Hamby <jhamby@google.com> Add support for CMAS warning notifications over CDMA.

Refactor SMS Cell Broadcast support to enable receiving CMAS warning
notifications over CDMA. The CellBroadcastReceiver app must also be
updated with the corresponding change. All cell broadcasts are now
delivered as a Parcelable SmsCbMessage object in the "message" extra
of the SMS_CB_RECEIVED_ACTION or SMS_EMERGENCY_CB_RECEIVED_ACTION,
instead of as a GSM/UMTS "pdu" byte array.

Existing functionality for ETWS and CMAS alerts over GSM/UMTS continues
to be supported using the new radio-technology independent SmsCbMessage
and related objects. Test cases are added to verify that valid and
invalid broadcast data is handled appropriately.

Unit testing discovered a bug in the BitwiseOutputStream utility class
used by the added test cases. When the BitwiseOutputStream object must be
expanded (in the private possExpand() method), the mEnd field is not
updated to the new array size. This causes a new array to be allocated
on every new write, and for all data beyond the original array allocation
to be replaced with zeroes. Fixed by adding a line to possExpand() to
update mEnd. Added a test case to BitwiseStreamsTest to verify the fix.
Besides the test cases, BitwiseOutputStream is only used by BearerData in
two places, both of which allocate a sufficient initial buffer. So the
bug in BitwiseOutputStream is not critical to fix for normal operation,
but should be fixed so that the test cases using it function correctly.

Bug: 5856308
Change-Id: I201ecbf11607fd200aaae3cbb32561efabf65672
msCbCmasInfo.java
msCbConstants.java
msCbEtwsInfo.java
msCbLocation.java
msCbMessage.java
dma/CdmaSmsCbProgramData.java
26a92257b43e8941e1505a5f9df42b00f23a87ee 05-Mar-2012 Todor Kalaydjiev <todor@google.com> Support auto-complete in PhoneNumberFormattingTextWatcher. Also, simplify logic.
Previously, the assumption was that only a deletion or an insertion can happen
at a time; but with auto-complete, a deletion and insertion happen at the same time.

Needed for bug 5992672 in the Messaging app and is nice to have in the platform.

Change-Id: I2d80cecc486e7a1ceeaeb34866bcd834074f5ead
honeNumberFormattingTextWatcher.java
efba344b5a7b20e400daf5f41b2fbd688337f789 29-Feb-2012 Jake Hamby <jhamby@google.com> Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready.

This reverts commit 0c49f03a0429b5c0c4a619256f7bca86a4997ae8
msCbCmasInfo.java
msCbConstants.java
msCbEtwsInfo.java
msCbLocation.java
msCbMessage.java
dma/CdmaSmsCbProgramData.java
0c49f03a0429b5c0c4a619256f7bca86a4997ae8 06-Feb-2012 Jake Hamby <jhamby@google.com> Add support for CMAS warning notifications over CDMA.

Refactor SMS Cell Broadcast support to enable receiving CMAS warning
notifications over CDMA. The CellBroadcastReceiver app must also be
updated with the corresponding change. All cell broadcasts are now
delivered as a Parcelable SmsCbMessage object in the "message" extra
of the SMS_CB_RECEIVED_ACTION or SMS_EMERGENCY_CB_RECEIVED_ACTION,
instead of as a GSM/UMTS "pdu" byte array.

Existing functionality for ETWS and CMAS alerts over GSM/UMTS continues
to be supported using the new radio-technology independent SmsCbMessage
and related objects. Test cases are added to verify that valid and
invalid broadcast data is handled appropriately.

Unit testing discovered a bug in the BitwiseOutputStream utility class
used by the added test cases. When the BitwiseOutputStream object must be
expanded (in the private possExpand() method), the mEnd field is not
updated to the new array size. This causes a new array to be allocated
on every new write, and for all data beyond the original array allocation
to be replaced with zeroes. Fixed by adding a line to possExpand() to
update mEnd. Added a test case to BitwiseStreamsTest to verify the fix.
Besides the test cases, BitwiseOutputStream is only used by BearerData in
two places, both of which allocate a sufficient initial buffer. So the
bug in BitwiseOutputStream is not critical to fix for normal operation,
but should be fixed so that the test cases using it function correctly.

Bug: 5856308
Change-Id: Ie3e6af747976ce9b8a3e71e76fec71709cf86545
msCbCmasInfo.java
msCbConstants.java
msCbEtwsInfo.java
msCbLocation.java
msCbMessage.java
dma/CdmaSmsCbProgramData.java
d13f9aa8b1d59f4d8baf21960f18f5f7dc75dad7 25-Feb-2012 Mathias Agopian <mathias@google.com> attempt to fix IMSFramework crash

Change-Id: Iad6dd85afe8f37c1e443c116162d75f116c24316
erviceState.java
6513daef5e34082d9670c4149252703d40f8d937 25-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Seperate RIL constants from the framework."
1434d7b855108cb14c210b26cabb7bdb15f31887 17-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Seperate RIL constants from the framework.

We have two sets of constants for network type. One used by the RIL can't
be changed without big pains with OEM/Radio vendors. The other has been published
as part of the framework and can't be easily changed either.

Separate the two so it's clear where one should be used versus the other.

bug:5717664
Change-Id: Ibf21f9165662e75557c7254fc9ad9a4870ba4af9
erviceState.java
510db8feb611a924d235b9b8a1d55ebbd36e9022 15-Feb-2012 Daisuke Miyakawa <dmiyakawa@google.com> Introduce convertAndStrip()

Phone app will use this for actual phone calling, coping with
IccProvider, etc.

Add unit tests for the method, and stripSeparators() which is missing

Bug: 5546664
Change-Id: I49b996abe7a44f7db4301b62f667189281fc40e9
honeNumberUtils.java
75400e775e7f291720aa43fbe6bf2b4ab41265b1 14-Feb-2012 Makoto Onuki <omakoto@google.com> Merge "Fix the 3-parameter formatNumber to correctly handle IDDs."
17cbdd39ea0319ca2d50ab6ee4b5733312417ec6 07-Feb-2012 John Wang <johnwang@google.com> am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1

* commit '7e6295b32310afddccf5fb030d4c475ed3678e0f':
Don't use SNR in the invalid check.
7c70cefcae2d6a096112d746ae72f515898a3f45 06-Feb-2012 John Wang <johnwang@google.com> Don't use SNR in the invalid check.

Since some RILs use -1 instead of INVALID_SNR as invalid vlue for
LTE SNR, SignalStrength will not use LTE SNR to check if LTE valid.

bug:5970403
Change-Id: Ia948e076f8f5878e081e87680076b187857879c8
ignalStrength.java
26cd243601fc05c5ed39c2d1e3ab203a8eb97c25 02-Feb-2012 Shaopeng Jia <shaopengjia@google.com> Fix the 3-parameter formatNumber to correctly handle IDDs.

Also added more unittests.

Bug: 5726454

Change-Id: I7fd96b47e7b0c34b66a2fe698308342e125ec0f3
honeNumberUtils.java
7f8ab4b786321d8f298e7b4084b099b561481397 31-Jan-2012 Justin Ho <justinho@google.com> am 66146c4f: am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1

* commit '66146c4f5b3930f7f5f08b845fb30f2bc24f8c3d':
Use LTE SNR and RSRP to set signal level bar.
5e39519396918f9e2312d1c355a9b6889851d887 31-Jan-2012 John Wang <johnwang@google.com> Use LTE SNR and RSRP to set signal level bar.

The LTE signal strength level is the smaller one
between lte rsrp level and lte snr level if both
rsrp and snr are valid.

The lte snr mapping are

Four bars: SNR >= 45
Three bars: 10 <= SNR < 45
Two bars: -30 <= SNR < 10
One bars: SNR < -30
No bars: No Service

The invalid value of lte snr is changed to INVALID_SNR
from -1, since -1 is a valid value of lte snr.

bug:5640958
Change-Id: If26aaba0c7fcc0fee3db488b5adfa02922f06715
ignalStrength.java
7a41c7013d0ed319fcb4384cc4b5cf26b22d3580 30-Jan-2012 John Wang <johnwang@google.com> am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1

* commit '136704a803ed7dd419a452315d1c0fe4885ce441':
Adjust the LTE signal bar mapping.
2c911b24163c9bcb50bc548c828b7fc2f6ef8bce 27-Jan-2012 John Wang <johnwang@google.com> Adjust the LTE signal bar mapping.

The new mapping are

Four bars: RSRP >= -95dBm
Three bars: -105 dBm <= RSRP < -95 dBm
Two bars: -115 dBm <= RSRP < -105 dBm
One bars: RSRP < -115 dBm
No bars: No Service

bug:5640958
Change-Id: I9efabaeac33b624ea0a58a4d3760169dff6544f6
ignalStrength.java
9a18320ef4c9019807423ea05d350a005e136bcc 13-Jan-2012 Sean Barbeau <sjbarbeau@gmail.com> Adds documentation to CdmaCellLocation get lat/long methods

Adds better documentation to the getBaseStationLatitude() and
getBaseStationLongitude() methods to indicate the units for latitude
and longitude in CdmaCellLocation. Unlike the Android Location API
methods, latitude and longitude in CdmaCellLocation are not in decimal
degrees but instead in 0.25 seconds due to a more obscure 3GPP standard
underlying the Telephony API. The current Javadocs on the Android
developer page (http://goo.gl/hvWo6) do not indicate the units for
latitude and longitude in CdmaCellLocation, making it very difficult
for developers to interpret the output of these methods, especially
since 0.25 seconds is not a commonly used unit for latitude and longitude
in application-level code. This patch adds clear documentation to
these methods so developers can clearly understand the units for
latitude and longitude without having to dig through the Android
platform source code.

Change-Id: I259bfe3b68e3999804877821680fb99a22937651
Signed-off-by: Sean Barbeau <sjbarbeau@gmail.com>
dma/CdmaCellLocation.java
1f7b23dda211f419f0a140b871de44339c4a10c7 12-Jan-2012 John Wang <johnwang@google.com> am 70205788: am 6ad68ba9: Adjust the mapping of LTE signal bars.

* commit '70205788fa39968b8331085597e3d3b61e271fbe':
Adjust the mapping of LTE signal bars.
6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd 11-Jan-2012 John Wang <johnwang@google.com> Adjust the mapping of LTE signal bars.

bug:5640958
Change-Id: I91efc5a81b505aae59dac9b1d69314efaffda6b6
ignalStrength.java
fc2cbe9b46ab17a401dc50f8e0dbb677ed012299 30-Dec-2011 Naveen Kalla <nkalla@quicinc.com> Separate SIM states from Radio states

Radio state reflects the state of the modem. SIM_READY, RUIM_READY,
NV_READY are subscription states and it is possible that the new cards
have multiple subscriptions. Remove the SIM states from Radio State and
introduce a new VOICE_RADIO_TECH message to identify the exact voice
technology. SIM states will continue to be identified from the
SIM_STATUS messages.

Change-Id: Ia67d54f43b6c3340d9cf5c27fcb6f7ef49ef4d40
erviceState.java
ab971d3c26346cfd94a37e40591318bf3b3ae4fd 20-Nov-2011 Shaopeng Jia <shaopengjia@google.com> Add support for country specific emergency number handling.

Bug: 5247602, 5615428
Change-Id: I1bdfbc987f45e0f2ebbe68adaab215395c83ca35
honeNumberUtils.java
158f116eb7fdc23a12d6822d34a549f33605bc8c 17-Nov-2011 David Brown <dab@google.com> Fix a crash caused by SIP addresses containing "%40" instead of "@"

CallerInfo.doSecondaryLookupIfNecessary() was assuming that SIP addresses
would always contain the character '@', but that's not always true since
the username/domainname delimiter can actually be "%40" (the URI-escaped
equivalent.)

This would cause the in-call UI to crash if you ever called a SIP address
like "xyz%40example.com".

TESTED:
- Make an outgoing call to the SIP address "xyz%40example.com"
==> The call ultimately fails, but the in-call UI no longer crashes when
it first comes up.

Bug: 5637074
Change-Id: I62d15a7ccd509924d38b780b92e657b9efa26125
honeNumberUtils.java
277b13e091aa81ddaf4ac40b9cf4073d997ea4fb 17-Nov-2011 David Brown <dab@google.com> SIP addresses containing "911" shouldn't be considered emergency calls

This change updates isEmergencyNumberInternal() to always return false if
you pass in a SIP address, since the concept of "emergency numbers" is
only meaningful for calls placed over the cell network.

Previously we *did* try to compare SIP addresses against the list of known
emergency numbers, which caused bad behavior with SIP addresses that even
contained "911"/"112"/etc as a substring (since we were filtering out
non-dialable characters before doing the comparison!)

TESTED:

- Before this change, calls to "abc911def@example.com" or
"911abcdef@example.com" were incorrectly detected as emergency
numbers, and fail.

- After this change, SIP addresses like "abc911def@example.com" and
"911abcdef@example.com" work fine.

- Also, confirmed that this change doesn't break the restriction that
3rd party apps shouldn't be able to make emergency calls.

Specifically, I fired off ACTION_CALL intents (using the CallDialTest
activity) for a bunch of numbers *similar* to emergency numbers, and
confirmed that none of them actually resulted in an emergency call
being placed.
The specific ACTION_CALL intents I tested were:
"911" ==> Didn't place the call; brought up dialer instead
"tel:911" ==> Didn't place the call; brought up dialer instead
"911@foo" ==> Tried to start a SIP call (which failed)
"911%40foo" ==> Tried to start a SIP call (which failed)
"tel:911@foo" ==> Tried to start a SIP call (which failed)
"tel:911%40foo" ==> Tried to start a SIP call (which failed)
"911@example.com" ==> Tried to start a SIP call (which failed)
"sip:911" ==> Didn't place the call; brought up dialer instead
"sip:911@foo" ==> Tried to start a SIP call (which failed)
"sip:911%40foo" ==> Tried to start a SIP call (which failed)

Bug: 5515452
Change-Id: I6f9f8690b08564c53c7a76f480654477b475d94d
honeNumberUtils.java
8f4f814beb03400e9143b7c88307b2fd68abd77c 16-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Fix TelephonyManager to grab the best context

It may not be called from an app so the app context may not exist.
Check and grab the best one.
Also remove the log that nobody paid attention to if the constructor
is called again from the same process. One context seems to be as
useful as another.

bug:5572369
bug:5622514
Change-Id: Iad23b30c7c8fe5b8d1f81a1e060eaf0cd0e3019d
elephonyManager.java
59882fb8e0ba7c47b780d62c9a9c46b63d779677 09-Nov-2011 David Brown <dab@google.com> Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
1a811695f9ae2ac806a64fd3b6c440c83262dc52 08-Nov-2011 David Brown <dab@google.com> Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()

The phone app needs a way to distinguish between (a) numbers that are
definitely emergency numbers, and (b) numbers that *might* result in an
emergency call being dialed, but aren't specifically emergency numbers
themselves.

(The phone app needs this distinction in order to enforce the restriction
that 3rd party apps should not be allowed to make emergency calls using
the ACTION_CALL intent, while still making sure that the in-call UI only
displays the "emergency call" state for numbers that are *definitely*
emergency numbers. See bug 5493790 for the full details;)

So this change adds a full set of "isPotentialEmergencyNumber()" methods
to go along with the "isEmergencyNumber()" methods we've had all along.
The "potential" variants behave identically to the original methods,
*except* that they ultimately use number.startsWith() rather than
number.equals() when comparing against the list of emergency numbers.

TESTED:

- Unit test 'PhoneNumberUtilsTest#testIsEmergencyNumber' passes.
(The PhoneNumberUtilsTest class doesn't pass in its entirety, but it was
broken before this change also.)

- Also see the commit description of change
Ib949fea3c0ce6b341a90e617a03ba3f22c69018b for the exact tests I ran
against the phone app.

This change should be submitted along with
Change-Id: Ib949fea3c0ce6b341a90e617a03ba3f22c69018b
in apps/Phone (but this change must go in first to avoid breaking the
build.)

Bug: 5493790
Change-Id: Ic528cfcc555734cdaf4ca8a18a50199771ba49b1
honeNumberUtils.java
141da403c0ad2d06b8f55e737ddf5d9e2b64c536 02-Nov-2011 bi4004.lee <bi4004.lee@samsung.com> Fix exception when sending multi-page SMS with Turkish characters.

- Precondition: config_sms_enabled_single_shift_tables is configured as
1 (Turkish) in frameworks/base/core/res/res/values/config.xml

- Cause: There is no consideration for National Language Shift Tables in
SmsMessage::fragmentText function.

- Solution: The header length is calculated properly according to
National Language Shift Table

- modified to add test cases and fix calculation bug (jhamby@google.com)

Bug: 5553544
Change-Id: I9eaefbbd6b3d75f8c41cbf9d0cb03a701cfa1cb3
msMessage.java
b7945cae5ad0feaad09378d0db77f2b3105e5235 22-Sep-2011 Jake Hamby <jhamby@google.com> Enable support for multiple SMSDispatchers in CDMALTEPhone.

Refactor framework to support multiple SMSDispatcher objects on
dual-mode devices that require support for both 3GPP and 3GPP2
format SMS messages. Each dispatcher registers to receive events for
the appropriate message format.

Note: All applications which handle incoming SMS messages by processing the
SMS_RECEIVED_ACTION broadcast intent MUST pass the "format" extra from the intent
into the new createPdu() method in android.telephony.SmsMessage that takes an
extra format parameter. This is required in order to correctly decode the PDU on
devices which require support for both 3GPP and 3GPP2 formats at the same time,
such as CDMA/LTE devices and GSM/CDMA world phones.

- moved code to manage device storage events from SMSDispatcher to a
new class, SmsStorageMonitor, which is shared among all dispatchers.

- moved code to monitor per-application outgoing SMS usage from
SMSDispatcher.SmsCounter to a new class, SmsUsageMonitor, which
is shared among all dispatchers.

- fixed a bug that prevented CDMALTEPhone from setting the MCC/MNC
operator numeric value in the telephony provider from the UICC,
as GSMPhone does, when the SIM records have loaded.

Change-Id: I2789ac07b6ca2948138bca7f75481f9b31514f20
msManager.java
msMessage.java
sm/SmsMessage.java
2613e0064b4a43b7de4205d5a6aaae64416972ed 26-Sep-2011 Flavio Lerda <flerda@google.com> Do not format numbers starting with hash or star.

If the user asks to format a number that starts with either a hash or a
star symbol, do not further format the phone number since we are not
actually able to parse such a number correctly and current this results
in the star or hash being dropped.

Bug: 5362177
Change-Id: Iff8d317c087d0ca07f2b107459ce8c47882ef367
honeNumberUtils.java
c6027ee46486bcc6e0df457c5678eb697d6ed321 22-Sep-2011 Shaopeng Jia <shaopengjia@google.com> Temp fix to the problem of incorrectly classifying Brazilian local
numbers as emergency numbers.

Bug: 5247602
Change-Id: Ib1626ef25ced2e149c526601bfac72de39e3f1b9
honeNumberUtils.java
6b7c3f8a1cd8b638defc28a3249746e99b8039ae 14-Sep-2011 Shaopeng Jia <shaopengjia@google.com> Update code to use location aware isEmergencyNumber.

Bug: 5247602
Change-Id: Ieeda4a17464795b3591db754bc991759609f88c2
honeNumberUtils.java
80c32a37b63ceff885199e22a8505ac557c86d35 15-Sep-2011 duckyoung.chai <duckyoung.chai@samsung.com> [toro] Add telephonyManager API ( getMsisdnNumber() ) for IMS Module.

IMS Module need the MSISDN value for IMS registration.(VZW Requirement)

Change-Id: I8713b6c55788276246ee1c2f91eaf2d3ab8cc813
Signed-off-by: duckyoung.chai <duckyoung.chai@samsung.com>
elephonyManager.java
9683f990a282776ac8a588a9d5e1a73b61f43dcf 07-Sep-2011 Shaopeng Jia <shaopengjia@google.com> Adding isEmergencyNumber which also takes in a defaultCountryIso.

Also update CallerInfo and CallerInfoAsyncQuery to use the new method.

Bug: 5247602
Change-Id: I2bbb0806ad2787d53b19bc1e9bdfb0ee8be26980
honeNumberUtils.java
52d0f9882fc8f33d1aef1d0e79f15733daf4ebe2 31-Aug-2011 Jeff Sharkey <jsharkey@android.com> More robust check around TelephonyManager init.

Only complain when Context radically changed.

Bug: 4676714
Change-Id: Ia183f9ba51056c857e634d901c618a73e45d2d05
elephonyManager.java
463f22114587344c96460179069a08d7381fbfd6 22-Jul-2011 Jake Hamby <jhamby@google.com> Add ISIM application support for LTE devices.

- Add methods to TelephonyManager to provide access to IMS records on
the ISIM application of the UICC, as well as access to the ISIM
AKA authentication algorithm.

- Add support for the new IMS methods to CDMALTEPhone, using the helper class
ImsUiccRecords to load the IMS records from the ISIM. The same approach
can be used to implement IMS support for UMTS/LTE devices.

- There is a new RIL request, RIL_REQUEST_ISIM_AUTHENTICATION, which is
used to perform IMS AKA authentication using the algorithm on the ISIM
application of the UICC. The challenge nonce and response are both encoded
as Base64 strings.

Change-Id: I73367c7d9bc573d0d883d68adf09891de1319129
elephonyManager.java
4eb45cc98bdcee575cc21f5ad5754cde57197a81 12-Aug-2011 inshik <inshik.shin@samsung.com> Add utility functions for pause and tonewait pause.

Add a function that converts a string with RFC3601 defintion
of pause and wait into android representation.

Change-Id: Id8a17c3a166422d62247acb227506549990ace12
honeNumberUtils.java
e713576292fc72086de47066981b86ad2f27ab0f 12-Aug-2011 Shaopeng Jia <shaopengjia@google.com> Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers
to avoid name collision.

Bug: 5157607
Change-Id: Ic397f371e381a71f17b0b70b955e89d08f7a9867
honeNumberFormattingTextWatcher.java
honeNumberUtils.java
de4c26fa1a5adf3efa8995cbf69e45aa10111b8f 17-Jul-2011 Dianne Hackborn <hackbod@google.com> Fix a couple static leaks.

Change-Id: If2564dc822fbcb3bb3baf270ad2b3c29c78bf421
elephonyManager.java
23b444a2e4e808262c22fa5254db9861eb961879 01-Jul-2011 David Brown <dab@google.com> Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code."
de89a4645822996e8d751d16c27f9e584f993076 01-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> am 672c468c: am a2267451: Don\'t ever report a null ServiceState

* commit '672c468c453ea0b5195f42150d6772ac33d1f7e3':
Don't ever report a null ServiceState
bc2e82d45432f7bd546d0fcc57e1ad1816ade9a3 01-Jul-2011 Shaopeng Jia <shaopengjia@google.com> Remove explicit toUpperCase after CountryDetector is fixed to return
uppercase region code.

Change-Id: I111d5792b67eb0e16a7278a731097f305cb9a059
honeNumberFormattingTextWatcher.java
672c468c453ea0b5195f42150d6772ac33d1f7e3 30-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am a2267451: Don\'t ever report a null ServiceState

* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
Don't ever report a null ServiceState
a2267451ddf91cc330f4c283e86811e38328915b 30-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> Don't ever report a null ServiceState

Report out of service if we don't know any better. Sometimes when switching radios
we were finding nulls reported - it crashed some code and highlighted this problem.
If we don't have a service state we're certainly out of service, so this isn't a lie.

bug:4553701
Change-Id: I094798a5f9f39f45c0ba30179aaa8f88f9b3e405
erviceState.java
f9ab96f9d3d97e65537e487d1c05c69df2313618 17-Jun-2011 John Wang <johnwang@google.com> Revert "Do not merge. Return null id for Non-phone device."

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42

Change-Id: I68470e729d9304f1c27473a71334e1b0de99ff01
elephonyManager.java
5b0b167f7fd74d8e238508badb0af2cd6038d522 24-Jun-2011 Shaopeng Jia <shaopengjia@google.com> Uppercase region code so that AsYouTypeFormatter works correctly.

Change-Id: Iaf46ec5241a1a8984753bd6d8f9f842884efaa15
honeNumberFormattingTextWatcher.java
e21217af6480c45212517a68b2b6e583c4dc27c9 17-Jun-2011 John Wang <johnwang@google.com> am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
Revert "Do not merge. Return null id for Non-phone device."
c6b32054c67901b0627ad99e4bd8b15c5cc2fb90 17-Jun-2011 John Wang <johnwang@google.com> am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
fe9aa2706ff9e5059d5e2737d751122fb5d692b9 17-Jun-2011 John Wang <johnwang@google.com> Revert "Do not merge. Return null id for Non-phone device."

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
elephonyManager.java
0cf353e0527983fcb239d3896cf8084c309cecec 09-Jun-2011 Jake Hamby <jhamby@google.com> am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
Fixes for SMS Cell Broadcast support.
3fa5f373467054c673c5fd6296adba4c6de41520 09-Jun-2011 John Wang <johnwang@google.com> am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

* commit '229d3a0cbce70db82003705abf6844deec136d20':
Make getDeviceId return null for Non-phone device.
d4f1bacca50a74a74a02bf6a242bb22c495e4034 09-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 7ca13deb to master

Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
cea03df201dc6659654234bc5fbfebf1b6a06e42 08-Jun-2011 John Wang <johnwang@google.com> Do not merge. Return null id for Non-phone device.

For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
elephonyManager.java
8a02401129e5805025d3a39e552a2840e73fb8cf 08-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of e139167c to master

Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
d2a458750e5a3d490af09cecb5c28370baf0a913 29-May-2011 Jeff Sharkey <jsharkey@android.com> Map network identity using ConnectivityService.

Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService. Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates. Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
elephonyManager.java
22165bb54af1cd3cb636c1d65da7c643d854c385 08-Jun-2011 Jake Hamby <jhamby@google.com> am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
Fixes for SMS Cell Broadcast support.
ae62b7b0bca9c46dea30ee81a7aada3e7576638b 08-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
229d3a0cbce70db82003705abf6844deec136d20 08-Jun-2011 John Wang <johnwang@google.com> am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
Make getDeviceId return null for Non-phone device.
fc94d45fc209dbcfdf7f57e0c04c581e1e51988b 08-Jun-2011 John Wang <johnwang@google.com> Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
e19736f0520689747b9e703a40b5f574bd9a7fce 08-Jun-2011 John Wang <johnwang@google.com> Make getDeviceId return null for Non-phone device.

For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
elephonyManager.java
7d259626d009a45195ec341646ce06658b842e40 08-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp

Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
e139167c9109aee203f5fbbdeeab656994d9c9ac 07-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE

* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
5df69fad6e5021d2862bff0553a510f8d6729fbd 07-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 8de47a2f to honeycomb-LTE

Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
66040bbb087b04c4bbac8429f91bbff1029e1440 03-Jun-2011 Jake Hamby <jhamby@google.com> Fixes for SMS Cell Broadcast support.

Add support for ETWS primary notification messages.
Add method for easy concatenation of GSM multi-part broadcasts.
Add test cases for SmsCbHeader, SmsCbMessage and IntRangeManager.

Change-Id: Ifc646a011e79ad6c7eace9afcf84b1216eb42b7a
msCbConstants.java
msCbMessage.java
0cb17a52ee278e6fd1575a086dac155e11574287 07-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp

Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
59242cf65ec775ccb6cb3639df4eab6af09f3108 06-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."

* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
3699c3d7c8a450cc39fd1c3db23b64208bd43353 03-Jun-2011 Wink Saville <wink@google.com> am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE

* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
Refactor ServiceStateTracker handling of radio technology.
db09b5db60fa05ba65662faa86422b9ec69493a1 03-Jun-2011 Wink Saville <wink@google.com> Refactor ServiceStateTracker handling of radio technology.

Also add a little more debugging.

Change-Id: I832872c876b290a3e83a79068059a21894472a1d
erviceState.java
147510145f7b619f86a71065f2d62f444aee7f3d 03-Jun-2011 Wink Saville <wink@google.com> am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE

* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
CdmaLte: Use SPN from SIM card if SIM card is presend
c91c7f92c9d2da557d4187fa24519f1dc1f1e2ec 02-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> CdmaLte: Use SPN from SIM card if SIM card is presend

Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
erviceState.java
ab79ee4adcbc6eb9fb9c509766753f65d3857739 27-Apr-2011 Jake Hamby <jhamby@google.com> Enable full support for SMS Cell Broadcast.

Implement full support for SMS Cell Broadcast (3GPP TS 23.041).
Includes support for ETWS and CMAS emergency message types.
Includes GSM and UMTS support (CDMA will be added later).

Note: the change to GsmAlphabet.java is only necessary if the
SMS national languages support patch has been applied. If that
change has not been applied, then the changes to GsmAlphabet.java
in this patch set can safely be ignored.

Change-Id: Ia0362c53695b8ef9a0982f558f1cffa912def34b
msCbConstants.java
msCbMessage.java
msManager.java
97ab2d4f86ee9c2b661a00688e934fc7030df22e 27-May-2011 Robert Greenwalt <rgreenwalt@google.com> Reveal some network constants.

Since we've already decided to inc the sdk version we should try to get these in too.

bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
elephonyManager.java
038e8f99845e171c0d9d606f5697e36b1b684d01 25-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
74af525e400bb9da80082b1bd6beea3ea0e5a7de 13-May-2011 Wink Saville <wink@google.com> am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE

* commit '55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
5e9270bfd566c32a60dfeb34435a158eb4ceb9a9 12-May-2011 Wink Saville <wink@google.com> Add getLteOnCdamMode.

Change-Id: Iebf027f956d543d7a69cad64aaba47900937a785
elephonyManager.java
ee60f3fb1b4e61ac8027293a658ba710e36d36b6 11-May-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
ba54feb094fdf0eb2201eae5751104a144a2a31d 10-May-2011 Wink Saville <wink@google.com> am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE

* commit '45364dc4bfe3e6118ad61f1d38489fe63418699a':
Telephony: Signal Strength Changes.
5d7b9271b3f8a5f27c789a2b673e4bfd532b280c 09-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Signal Strength Changes.

Change-Id: Ia406d21d860533e699a90d15130edcbc705ec645
ignalStrength.java
18cc814c94edb188b73a92f0d34878d9dc054ff6 05-May-2011 Jake Hamby <jhamby@google.com> am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread

* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
Enable support for SMS national language shift tables.
737b5c58c9094e5759bd4162f23f73be2b71faaf 30-Apr-2011 Conley Owens <cco3@android.com> am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."

* commit '520dd927cbe02ae52add1f90e282750582a9e95e':
Fixing wrong Japanese phone formatter.
b49a73dfc4c9817bba1f227e9330555acdf9b56f 16-Mar-2011 Jake Hamby <jhamby@google.com> Enable support for SMS national language shift tables.

Add support for encoding and decoding SMS 7 bit user data using the
national language shift tables defined in 3GPP TS 23.038 (GSM/UMTS only),
including the new tables added in Release 9 for Indic languages.

Decoding is always supported, but encoding is only enabled for the
specific language tables added to the new integer array resources
"config_sms_enabled_single_shift_tables" and
"config_sms_enabled_locking_shift_tables" defined in
frameworks/base/core/res/res/values/config.xml. The default empty arrays
should be overridden in an OEM overlay for the specific nationalities where
SMS national language shift table encoding is allowed/mandated (e.g. Turkey).
GsmAlphabet.countGsmSeptets() will try to find the most efficient encoding
among all combinations of enabled locking shift and single shift tables.
If no 7 bit encoding is possible, 16 bit UCS-2 encoding will be used.

This change also fixes a bug in the decoder: when an escape septet
is followed by a septet with no entry in the extension (single shift)
table, TS 23.038 Table 6.2.1.1 states that the MS shall display
the character in the main GSM 7 bit default alphabet table, or the
active national language locking shift table. Previously, we were
decoding this sequence as a space character. Two consecutive escape
septets will continue to decode as a space character, according to
Note 1 of table 6.2.1.1.

Change-Id: I4dab3f0ffe39f3df2064ed93c9c05f26e274d18b
msMessage.java
sm/SmsMessage.java
94191d43491a38305ca17456a9b806e58fbda99d 18-Mar-2011 Wink Saville <wink@google.com> am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1

* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
Change stopship to todo.
e5d6e10a73cc93676cd8a6b70cda1b78fd0a99b6 18-Mar-2011 Wink Saville <wink@google.com> Change stopship to todo.

For MR1 LTE isn't supported so the various lte routines aren't used
and are not a stopship.

bug: 4126216
Change-Id: I2a5f86161b616b57c6fe4b9de85db2492914009a
ignalStrength.java
f57276154aaa587524374db8e0d7228383611bf3 08-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Do not merge: Telephony: Corrections to LTE and eHRPD constant values.

LTE and EHRPD values are not consistent with ril.h

Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
erviceState.java
9d7d62801ddb206d2ea96d74864a9edfe54d2eee 12-Mar-2011 Wink Saville <wink@google.com> Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
erviceState.java
77359e7af334a9c976e8d597ede59c74cd45dac5 26-Feb-2011 Keiji Ariyama <keiji_ariyama@c-lis.co.jp> Fixing wrong Japanese phone formatter.

http://code.google.com/p/android/issues/detail?id=15383

Adding rules that Japanese number start with 050 and 060.

Change-Id: Id324d7ecfb18b348230a3903b356647045700d80
apanesePhoneNumberFormatter.java
eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7 03-Mar-2011 Wink Saville <wink@google.com> DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82.

Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
erviceState.java
2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82 25-Feb-2011 Wink Saville <wink@google.com> LTE Changes for Telephony including Multiple PDN support and IPV6 support

Added init for CDMAPhone.java

Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
erviceState.java
5284090631e638b916d9a453212e9dc802656a67 18-Feb-2011 Wink Saville <wink@google.com> Changes for ril.h version 6.

Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
ignalStrength.java
5e9bf7a908f1249bae911382e94a0c8d81664097 03-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add new network type for HSPA+."
9e4ba121dc5168398bb29badfa2b35a57b1077a1 02-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Add new network type for HSPA+.

Change-Id: Ia949a02e5cb66bc9f7d4d5e7e771e592231c729b
elephonyManager.java
1938e314e34fb11ec5398716dfe9704cea66e31e 02-Feb-2011 Wink Saville <wink@google.com> 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
msMessage.java
sm/SmsMessage.java
6e2884817d7f51257fbf5195f3a47e3cfa3b5d98 02-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> 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
elephonyManager.java
9d72be33181f1bd1386017ce0b0ce17d8ce1cb66 02-Feb-2011 Wink Saville <wink@google.com> 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
ellLocation.java
elephonyManager.java
9b9e6778dd9a0f04eb22e4fdd83d7d0d56b6b1a9 01-Feb-2011 Wink Saville <wink@google.com> Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.

bug: 3198435
Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
elephonyManager.java
7ea919c44b05daf99c045d09eb3edafb96019da7 29-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge 6b739dc7 from gingerbread

Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
aa3866e6fa2d0c0e026b78cf43dccce67a2021e5 29-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> 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.
e12aec941dfc93b76b5efb9bc9f30d2ba3469434 28-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> 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
elephonyManager.java
4f95b1250fb4d58b525311d0c6f267284ca85e8d 25-Nov-2010 Henrik Hall <henrik.hall@sonyericsson.com> Adding support for parsing of SMS-CB pdus in UMTS format.

This enables RIL to dispatch pdus in both GSM or UMTS format.
The RAT that was used will be transparent to clients.

Change-Id: I57c53ec79496d274e18b3fee196551af97c0857d
msCbMessage.java
c049f9ad5b4f5bc32f368646e624aef7707b7252 10-Dec-2010 John Wang <johnwang@google.com> Block SMS service for non-sms-capable device.

If device doesn't support sms service, SMSDispatcher
will ignore incoming SMS in dispatching messge and return
ERROR_NO_SERVICE in sending sms messgae.

bug: 3250029
bug: 3038102
Change-Id: Ic72a9192aa128c43cf31da04907620bc680656c6
elephonyManager.java
488a0d5ece8d68a2a49117e698ecaa6de4faf6b9 09-Dec-2010 John Wang <johnwang@google.com> Merge "Add iDEN to getNetworkTypeName."
1234ce117adc6fef495688ed8032c43e77445f90 07-Dec-2010 Nick Kralevich <nnk@google.com> Modify emergency number detection

It's possible for an application to dial an emergency
number by appending extra digits to the phone number.

For example, one could dial "9111" instead of "911",
and a strict .equals wouldn't detect this as an emergency
number.

Replace .equals() with .startsWith()

Change-Id: I87f34fc2b9bbee2c4fa6be511bcc3b955559e0a9
honeNumberUtils.java
4d76f364226cf049bfc850a339ea2cf63e3ae3e7 04-Dec-2010 John Wang <johnwang@google.com> Add iDEN to getNetworkTypeName.

For bug 2667143.

Integrated Digital Enhanced Network (iDEN) is a mobile telecommunications

technology which provides its users the benefits of a trunked radio and

a cellular telephone.

Change-Id: I4a1f5dbdd22a2c4ce5252688053ec4a47805d6b9
elephonyManager.java
8503144665894f1b5008f540e0cf36c948c763ef 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 8484e57f to master

Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
8484e57f3006dd3aa925792e6414387c233c1a8d 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp

Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
95bc625e294e14a651321b5172f31406cdebbefb 19-Nov-2010 Henrik Hall <henrik.hall@sonyericsson.com> Enabling cell broadcast (SMS-CB) support in the platform.

Adding a simple API enabling applications to control SMS-CB reception.
Implementing parsing, assembly and dispatching of SMS-CB messages over GSM.

Change-Id: Iee841605a45a3af60c7602af175056afb03a38da
msCbMessage.java
msManager.java
e613adcc555731aab2a0684d709da3d0df97a9e5 17-Nov-2010 Wink Saville <wink@google.com> Cleanup some debug output.

Change-Id: Iac39e7ffb1f7409647ce112f9347c42d2909846a
erviceState.java
8e7e0a9fd5c377294bfe2e09fca9b7551871f3c2 09-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Fix data state change callbacks

Initial state should be unknown or we miss the first connected change.
Don't send a disconnected msg when changing network types.
Filter out redundent disconnects.
Add some logging.

bug:3060742
Change-Id: Idc797c1276b7417337a91ed60b12b1bf392d57c0
elephonyManager.java
962a990a45a2a9f9c3002064e71f9c2fed86acf1 02-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Add some network/phone type constants.

Support for LTE (and SIP-based voice) and the stepping-stone eHPRD.

bug:3125398
Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
eighboringCellInfo.java
elephonyManager.java
fd2d01302781af91d77557a99874111a4fee8365 28-Oct-2010 Wink Saville <wink@google.com> Add PhoneStateListener.onOtaspChanged.

Bug: 3102320
Change-Id: I46e8d33a4ed80e5e074e92135653d57598d4c865
honeStateListener.java
a23935ab334b2dec47735608383608ca3093b4b2 12-Oct-2010 David Brown <dab@google.com> am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone

Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
Don't manually create CallerInfo objects from SipPhone
bd6d5098a7995429713ae0ae43b3f666f7b9aed3 11-Oct-2010 David Brown <dab@google.com> am d07833f5: Don\'t manually create CallerInfo objects from SipPhone

Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp

* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
Don't manually create CallerInfo objects from SipPhone
d07833f54b6e8e361b666ae16efa15fdf60159de 08-Oct-2010 David Brown <dab@google.com> Don't manually create CallerInfo objects from SipPhone

Currently the SipPhone class manually creates a CallerInfo object, and
populates it with very basic info from the SIP address, when making an
outgoing call.

But this is no longer needed, now that we do caller-id lookup properly for
SIP addresses (based on real data from the contacts database -- see
bug 3004127 and change https://android-git.corp.google.com/g/70555).
And in fact the presence of this initial CallerInfo object actually
*disabled* contacts lookup for outgoing calls (bug 3072731).

This change removes all that CallerInfo-related stuff from SipPhone.

(Thus SipPhone is now consistent with the other phone objects, like
GSMPhone and CDMAPhone, in that it doesn't muck with CallerInfo data at
all, but instead lets the phone app do it.)

Also, update isUriNumber() to handle "%40" in case the passed-in string is
URI-escaped. (Nobody depends on that now, but it may be needed in the
future, and it's certainly safe to say that "%40" will never be found in a
legal PSTN number.)

TESTED:
- Outgoing SIP call:
- In-call UI shows correct contact info
- After the call, Call Log shows correct contact info

- Incoming SIP call:
- In-call UI shows correct contact info
- After the call, Call Log shows correct contact info

- PSTN calls:
- correct contact info everywhere

Bug: 3072731

Change-Id: I51434e4e5ad66d2e8ff51fc220001fb74485f0f5
honeNumberUtils.java
19c5df745229374748f38c76a222ec8ce1d08e81 15-Sep-2010 jsh <jsh@google.com> am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread

Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94'

* commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94':
Unhide GsmCellLocation.getPsc().
b30f21882080bd4c0d7c3b25878151dd19ac3f94 15-Sep-2010 jsh <jsh@google.com> am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread

Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp

* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
Unhide GsmCellLocation.getPsc().
2ec0e6fe1e5382d93cb28c97d24c7b0a0387c8ee 09-Sep-2010 jsh <jsh@google.com> Unhide GsmCellLocation.getPsc().

bug: 2465036
Change-Id: If071c4e0f1f3484c010ec908b02800361cbf8a86
sm/GsmCellLocation.java
b55df4471ed55a0e91dee79304f3b1209ffa4b35 05-Aug-2010 Sang-il, Lee <gendoh@google.com> Support MBCS characters in contacts and SMS messages that are stored in SIM cards.

Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
msMessage.java
7e0598d066e58ad9cadbd2c654a42563e56adbab 08-Sep-2010 Chung-yih Wang <cywang@google.com> am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread

Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e'

* commit '4f24aed2a13d9ba89e2402894353176e19571e6e':
Fix the dialing from contact for internet address.
4f24aed2a13d9ba89e2402894353176e19571e6e 08-Sep-2010 Chung-yih Wang <cywang@google.com> am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread

Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp

* commit '669070787cc10377c2e5c3fa187babc728d96245':
Fix the dialing from contact for internet address.
6f0f870f16003adc60e0c5f37c86b2d5e7895940 08-Sep-2010 Chung-yih Wang <cywang@google.com> Fix the dialing from contact for internet address.

the bug is http://b/issue?id=2982290

+Log outbound proxy address if exists for debugging.
honeNumberUtils.java
2a4e96067d074ef78aeafea13469a85690346b60 25-Aug-2010 Bai Tao <michaelbai@google.com> Added new method to format the phone number when neccessary.

Change-Id: I90fb38c1d36dc1ccf7eaa3b4cc34cd29f5151493
honeNumberUtils.java
b422ca809c92e3136bdf1f3820c4d59c61bc8e57 24-Aug-2010 Wink Saville <wink@google.com> am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'

* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
Change CDMAPhone.getDeviceId to return MEID or ESN.
d90348796829f3d3a443e73ea3b3f2f9e79071c2 21-Aug-2010 Wink Saville <wink@google.com> am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp

* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
Change CDMAPhone.getDeviceId to return MEID or ESN.
b2cc86da29452769ff6210f1dfef4b51aac1d75e 21-Aug-2010 Wink Saville <wink@google.com> am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread

* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
Change CDMAPhone.getDeviceId to return MEID or ESN.
3158cf689f4994ec53c3b727f9b6ad7751a5551b 21-Aug-2010 Wink Saville <wink@google.com> Change CDMAPhone.getDeviceId to return MEID or ESN.

This allows devices with only ESN's to work.

bug: 2938223
Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
elephonyManager.java
ae3efa53a9bd52c6eddde2a8e4bb1ae4d86a9c21 18-Aug-2010 David Brown <dab@google.com> Move the "voice_capable" resource into the framework.

There's currently a config.xml param in the phone app saying whether the
current device is "voice capable", which is used to determine (among other
things) whether the OTASP call should run in interactive mode.

But both Contacts and Settings are about to need this flag too, so it
really belongs in the framework instead. As of this change it's now
"com.android.internal.R.bool.voice_capable".

Also add a corresponding TelephonyManager call so that unbundled and 3rd
party apps can access it too.

Change-Id: Ie9a8803295bf97eb32154291aac8fce1e21c7b25
elephonyManager.java
a774f5817b5a24f5ccbb15c97fc4d5038310245b 16-Aug-2010 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 31202b1a to master

Change-Id: Ia8ae32c5ebcd13843ed9cc82c80bf551b38e586f
31202b1a40e7daccf69e284492494f9ff739f324 14-Aug-2010 Jake Hamby <jhamby@google.com> am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread

Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp

* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
Fix character count bug and Javadoc typos in SMS (with test cases)
17f616823a562ceb3a008f91e05d43bc56d37cae 13-Aug-2010 Jake Hamby <jhamby@google.com> Fix character count bug and Javadoc typos in SMS (with test cases)

Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").

You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.

Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
sm/SmsMessage.java
3e4b7c332fcdeb3adf359b5fcf8cba08c474c9c0 13-Aug-2010 Dmitri Plotnikov <dplotnikov@google.com> Keep the '+' when normalizing the phone number

Change-Id: I24731735ed18dbc92a643a0d99d35a1b58be40c8
honeNumberUtils.java
c178b95c1fbd4644a088ca9739d173d5bf69939c 13-Aug-2010 John Wang <johnwang@google.com> am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gingerbread

Merge commit '2835391c1709a2b655940200dab0fc74ef08512d'

* commit '2835391c1709a2b655940200dab0fc74ef08512d':
Update switch call and accept call.
2835391c1709a2b655940200dab0fc74ef08512d 13-Aug-2010 John Wang <johnwang@google.com> am 686a9505: Merge "Update switch call and accept call." into gingerbread

Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp

* commit '686a95055896c221c62fe7f4c3dda137809df91e':
Update switch call and accept call.
c159c84699d4b739a14cdfb22c5807f419e1754f 11-Aug-2010 John Wang <johnwang@google.com> Update switch call and accept call.

Change-Id: Ifdd1af77e3eca08f6c931605ecfb275835b78709
honeNumberUtils.java
0b4e3ad356c6e4f2f4152d02de7a4dc395825bba 04-Aug-2010 jsh <jsh@google.com> am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread

Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp

* commit '82cadee3ca830315c617dfdbf3a8eef207c58436':
Add support for PSC of serving cell.
05a5a88a171721705685d1ae3dcfe82780907210 24-Jun-2010 jsh <jsh@google.com> Add support for PSC of serving cell.

Bug: 2465036
sm/GsmCellLocation.java
ae2036a8f9365cec0f343f2668424e8e964a971c 02-Aug-2010 Wink Saville <wink@google.com> am 7472c219: am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.

Merge commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2'

* commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
7472c219a13e3f9f74d9a4adf1478e9c4f9248a2 02-Aug-2010 Wink Saville <wink@google.com> am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.

Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp

* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
1540a7ea1afcb772b5fcf90f635153f6489eb8ed 02-Aug-2010 Wink Saville <wink@google.com> am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.

Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
c69f5be0ed3529564e5db6874de52775c2c99007 02-Aug-2010 Wink Saville <wink@google.com> Add PhoneSubInfo.getCompleteVoiceMailNumber.

PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
honeNumberUtils.java
elephonyManager.java
aae052324fb1d3add554158974c5a6ee609739b3 29-Jul-2010 Dmitri Plotnikov <dplotnikov@google.com> Merge "Throws IllegalArgumentException if the country code is null."
1e80299bd4761df8328be15476ca88f2d1f9b1d8 29-Jul-2010 Bai Tao <michaelbai@google.com> Throws IllegalArgumentException if the country code is null.

Also removed unnecessary Locale check

Change-Id: I547713372900f1ea71e2215c0023a0981b6aca94
honeNumberFormattingTextWatcher.java
fae6ec9e9673e96085fdbde69866a41b5491fa0d 28-Jul-2010 Bai Tao <michaelbai@google.com> Added country based formatNumber methods

a. Format the number to E164.
b. Format the number based on country convention.
c. Normailize the number.

Change-Id: I39d59b99aa1a5136371dd20c74d9d9c8ec855369
honeNumberUtils.java
295d45bef4cf35bdf128a6d4dcc3df869a70b522 24-Jun-2010 jsh <jsh@google.com> Add support for PSC of serving cell.

Bug: 2465036
Change-Id: Id4bc0a60463510d5fd89113af7815360e09d2125
sm/GsmCellLocation.java
1b1f0bc1f8725901a34d05cf741ed3d91b1b8cbd 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 4248d588: merge from open-source master

Merge commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5'

* commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5':
Makes PhoneNumberUtils support international numbers after a CLIR command.
adff0ad3cdae6c9bf043ab40fb0f40a54d5151ac 08-Apr-2010 Babis Triantafyllou <babis.triantafyllou.x@sonyericsson.com> Makes PhoneNumberUtils support international numbers after a CLIR command.

Makes PhoneNumberUtils.java support numbers in international
format (starting with ‘+’ character) after a CLIR command.

Previously a plus character would always be removed unless it
occupied the first position of the number string. In this case,
when the number is preceded by #31# (CLIR), the plus character
will be removed as well.

This is an error, prohibiting a type approval of the phone.

This change will detect the plus character after the CLIR command
and will insert it at the right position.

Change-Id: Ib220aee7b3eda30cde960db8c7470523dc5fd313
honeNumberUtils.java
5ddd127d5a38d80c0d8087d1770f41f61f84f048 12-Jun-2010 Dianne Hackborn <hackbod@google.com> Implement ListFragment and Fragment context menus.

Also fix the docs build.

Change-Id: I96f24cc03e6debd897171e503957284b140a9f27
honeNumberFormattingTextWatcher.java
4dc643eb6749afe5211198c920e739475590f92c 13-Jun-2010 Wink Saville <wink@google.com> Fix some javadoc link/see's to fix the build for the sdk-win_sdk target.

Change-Id: I243c19d3d7f1ed2decbd6bfc7ecbe6ce2b582fc2
honeNumberFormattingTextWatcher.java
ef4fd8e12e1928b1e9cdc03378bb1185d9e05cbe 07-Jun-2010 Bai Tao <michaelbai@google.com> Reimplement the PhoneNumberFormattingTextWatcher

a. Built the external/libphonenumberutil into the ext.jar. The file size increased 50K, the phone number meta file is 90K before the compression.
b. Used the external/libphonenumberutil to format the phone number for about 200 countries.
c. Beside the phone number formatting, the external/libphonenumberutil will also be used for phonenumber match and international dialing.

Change-Id: Ie5165dc60d66e1eddab7134725a8d1d1c826434a
honeNumberFormattingTextWatcher.java
02648a4b8422733ed401f07edf8e426318bb2f8d 18-May-2010 Robert Greenwalt <robdroid@android.com> Clean up APN notifications.

Add APNType info to notifications so you can tell what's happening. Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42
honeStateListener.java
d994dcbd816d5431dfaa59de7457e28bdfc8f523 08-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am cefdedc3: merge from froyo-plus-aosp
7ad843d66d3ebb9250f00e836f0e8e9502d7287b 08-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
47633f86279bc1854660d95a0b02bfa5ff14ad04 08-Feb-2010 Lars Dunemark <lars.dunemark@sonyericsson.com> Removes dashes when locale and number is not NANP or Japan

Removes all dashes if locale isn't NANP or Japan and the number
don't have there country code.

Use case: If adding a number starting with 1nnnnnn and then
trying to add a country code before (ex +46) we will first
trigger NANP formatting with +1-nnn-nnn so when we get
+41-nnn-nnn we will still have the old NANP formatting.
This number should be shown as +461nnnnnn.

Change-Id: I5cab830350d785a58367eba79e268d9e8ee16aac
honeNumberUtils.java
cae1bfd26629a83cf8646c4606ff6cf19fd1937d 19-May-2010 The Android Open Source Project <initial-contribution@android.com> am 634e9a12: am 54525412: am 3aecdb9d: merge from open-source master
3aecdb9d7e92b1a91860600feefb5c0062b652cf 18-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
e25863c9093d3f60a1f6feab1d17d38946a8d020 18-May-2010 Jean-Baptiste Queru <jbq@google.com> fix build

Change-Id: I86ee569ec81e6c690f7697237be7d94307014142
erviceState.java
390de220248d05ccb9dc10a197700ad3c1595937 11-May-2010 Jake Hamby <jhamby@google.com> Fix some typos and other cosmetic cleanups in telephony framework.

- Fix typos in Javadoc and comments.
- Fix Javadoc @link references to other classes/methods.
- Rename MISSING_UKNOWN_APN to MISSING_UNKNOWN_APN in DataConnection.
- Remove unused (and misspelled) RETRYIES_* consts in RetryManager.

Change-Id: I3b44ac8320d6c1e4c350be600c7ef266aaf735e4
erviceState.java
sm/SmsManager.java
a4bb6410403d7cc4e5cac82243ad2cc3fc1d3c60 13-May-2010 The Android Open Source Project <initial-contribution@android.com> am 1331ded8: am e28776bb: am b1110149: merge from open-source master
b1110149cccc3b99e59ead34ca46e5ac026f6db9 13-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
381b55863efcd65ed43d66924beae550c18d8930 13-May-2010 The Android Open Source Project <initial-contribution@android.com> am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master
4adacd23d4c91569b16fe50419f1a91f68d805bd 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
24d9c149c831f9793002af67f9e5436e415dfbea 12-May-2010 The Android Open Source Project <initial-contribution@android.com> am fc97669a: am 72a6af1a: am 7d952644: merge from open-source master
7d9526445c8631f347c7bf7d944e5bb1dc35b0b5 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
ce2a97aeb82d3f34a63472720ee9d53e53c248c2 24-Feb-2010 Samuel Holmberg <samuel.holmberg@sonyericsson.com> Preserve '+' in phone numbers imported from SIM.

Contacts with phonenumbers beginning with '+' lose the '+' in the
phonebook when imported from SIM.

This was only noticable on ADN-records with unknown NPI-values which
isn't very usual.

Change-Id: I181249759ae3d4181dd3cf627c7a588394b80419
honeNumberUtils.java
0a5174a6e947d5cbeb8846a1273a90b6de065cbf 21-Apr-2010 Naveen Kalla <nkalla@codeaurora.org> Add support for EVDO Rev B

Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
erviceState.java
elephonyManager.java
18573e9281d6e5621fa1663dac29b558291913d7 29-Mar-2010 Naveen Kalla <nkalla@codeaurora.org> Support to display message when operation is blocked due to FDN being enabled

The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.

Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
msManager.java
108817f3d85f80ddeb8db0ced75502520449a550 06-May-2010 The Android Open Source Project <initial-contribution@android.com> am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master
f78964490d8098387d51444c87bf520ad3f674e2 06-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
bcd573229e5ec6d59bb7931a84a2baa86e0d200a 24-Apr-2010 Jake Hamby <jhamby@google.com> Fix some more typos, remove unused imports, and remove unnecessary cast.

More minor code cleanups in the telephony framework.

Change-Id: I27abe11e02fc6fea12885eea4fe275240a546332
honeNumberUtils.java
145ff609de3206b585819ef974fab20cdc2d9f5e 16-Apr-2010 Jake Hamby <jhamby@google.com> Spelling corrections and other minor cosmetic cleanups.

- Fixed a bunch of typos in comments (plus a few variable names)
- Removed unused import lines from telephony classes
- Added @Override attribute to overriding methods
- Made SmsMessage.PduParser inner class private & deleted unused constructor
- Added type specifiers to declarations of ArrayList and HashMap
- SimulatedCommands.getRegistrationState() had an ArrayIndexOutOfBoundsException
trying to write to index 14 of a 14-element array. I removed the
out-of-bounds assignment.

Change-Id: I054b5156aa64ab6639028d5b45a7e688b2deee08
honeNumberUtils.java
msManager.java
msMessage.java
c6dd77d04a94b7fa0659a099e5b85b70f5f2ea9f 08-Apr-2010 Naveen Kalla <nkalla@codeaurora.org> telephony: Fix CID when CID is unknown

Unknown CID is indicated as 0xFFFFFFFF by ril. When telephony receives that
value, set CID to UNKNOWN.
eighboringCellInfo.java
56c2d2ff27536a1d8edf0037cd41ff3ea3272fd9 07-Apr-2010 John Wang <johnwang@google.com> Add emergencyOnly indicator in ServiceState.

For bug 2536842 to show signal strength in Emergency mode.

The STATE_EMERGENCY_ONLY of ServiceState is not in-use.

So add a hide interface to indicate Emergency mode.

Change-Id: I19398ac5e73a722dcaaf744347f961d1fa7513ac
erviceState.java
633dfb6da6d70cb369797b42df4bf046fdb3a07f 19-Mar-2010 Jake Hamby <jhamby@google.com> Fix some typos and logging of calls to CDMA methods.

Fixed some comment typos and cleaned up logging of unexpected calls to
CDMA-specific methods on a non-CDMA device.

Change-Id: Ia6e5fba765122cbf3186fd9fecca7a3931a76dcc
msMessage.java
elephonyManager.java
8214deb542392f48b6c3fdc377fdf976c0b17a32 12-Mar-2010 jsh <jsh@google.com> Add definitions for WiMAX and iDen network types.

b/2509185

Change-Id: Icf07ce857874e200712218713edbdbb47e646297
elephonyManager.java
15a4d2ffd04dc6c70f2cd17dae12ac6bc14c69ab 12-Mar-2010 Kenny Root <kroot@google.com> Add correct copyright headers to multiple files

Format for the list of changes shows the origin commit reference followed
by the file name.

33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java

Copyright header moved to top in following file:

core/tests/coretests/src/android/widget/ListViewTest.java

Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
honeStateListener.java
41a46718b3deec95661e149b3acea2a9e54016be 10-Mar-2010 John Wang <johnwang@google.com> Make getCellLocation return null if not available.

For bug 2422284.

Check the cell location and return null if the location is not available.

Change-Id: Ie9a331b906a8253c9a9596365af8705dc03823ce
ellLocation.java
elephonyManager.java
dma/CdmaCellLocation.java
sm/GsmCellLocation.java
0bd36175fbdf4f1506c5dcf93b43f3559837e207 04-Mar-2010 John Wang <johnwang@google.com> Add r-w property of emergency number list.

Currently, the emergency calls are put into an readonly property ro.ril.ecclist.

It is possible that ecclist has to be changed before and after SIM pin lock.

And ecclist can also be changed after network broadcasts the local emgergency numbers.

So add r-w property ril.ecclist to make emergency number list changable, while still

check r-o property to make old RIL work.
honeNumberUtils.java
7ae17760462e4c16ef0ea4289612c5950258d5da 17-Feb-2010 Kenny Root <kroot@google.com> Correct use of logical AND

A bitwise AND was use when a logical AND was meant to be used.

Change-Id: I4e5529ff9fce1e6397d7cd9483268766fc92dcf5
honeNumberUtils.java
9384b145e625b3bb6ff8b829ddb1466e16a78f49 11-Feb-2010 Mark Vandevoorde <mtv@google.com> Map base station lat-lng of "0","0" to undefined.

Also introduce a public constant for the invalid lat/lng value.

Change-Id: Ifaa1e563bfa94c06dfbba51157b9160055442682
dma/CdmaCellLocation.java
sm/GsmCellLocation.java
1e5710ce6fb76013a96473564d7a8a06db5e54cb 16-Dec-2009 Scott Main <smain@google.com> am 73536dda: am d92cc9a4: Merge change I33eb64c0 into eclair

Merge commit '73536dda20594e4b5e83396d705127a823bfa362'

* commit '73536dda20594e4b5e83396d705127a823bfa362':
docs: add 2.1 platform notes, win usb driver notes
b149ee883502af8ae71757f9098c8e98c8548d25 15-Dec-2009 Scott Main <smain@google.com> docs: add 2.1 platform notes, win usb driver notes
and fix some javadocs for PhonestateListener
honeStateListener.java
7d2fd6501595137e91ad042cd550decd2f8040fc 02-Dec-2009 Wink Saville <wink@google.com> am cc6ff2bc: Cleanup @hide and @deprecated directives.

Merge commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2

* commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7':
Cleanup @hide and @deprecated directives.
cc6ff2bc6011294367d9a8c644f811449e952eb7 02-Dec-2009 Wink Saville <wink@google.com> Cleanup @hide and @deprecated directives.

Bug: 2294396
Change-Id: Icb34706a203fb34e52c67b904328e91a7803d4fc
eighboringCellInfo.java
honeStateListener.java
ignalStrength.java
d95a02c2a652ffe35dcc0336a3e35d91b1027d54 27-Oct-2009 Daisuke Miyakawa <dmiyakawa@google.com> Fix test breakage in Zaku. Modification to PhoneNumberUtils included.

Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag.

Internal Issue number: 2217362
honeNumberUtils.java
45db67f2e89341412613ea6b162dd0ad36f091c6 23-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I808651dc into eclair-mr2

* changes:
bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
fd7b4f1d12779a0363e98a37e7f5a7ccacba5ee8 23-Oct-2009 Wei Huang <weih@google.com> bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().

- when comparing two numbers whose dialable char length is less than the MIN_MATCH (7), treat them as equal if the dialable portion of the numbers match.
- update unit test.
honeNumberUtils.java
171ad63488fedbf0176b3d8cef5502007399b4dd 23-Oct-2009 Tom Taylor <tomtaylor@google.com> am 6c618c68: Merge change Ie7105dae into eclair

Merge commit '6c618c68f251e42210f7c2f45d69498352da87e0' into eclair-mr2

* commit '6c618c68f251e42210f7c2f45d69498352da87e0':
Handle bad SIM message
72fac6778119e42f39e00f5b7e36b7500893f45c 22-Oct-2009 Tom Taylor <tomtaylor@google.com> Handle bad SIM message

When trying to view the saved sms messages on my SIM, I ran into a null ref.
With this fix, we don't try and wrap a null message, but just skip it.
This is part one of three fixes for BC-triaged bug 2205782.

Change-Id: Ie7105dae7e3134b98681deabcc14f5db555902f3
msManager.java
msMessage.java
6183a3ed5b72902a8e4a441b4d9e99630cb42ee3 22-Oct-2009 Naveen Kalla <nkalla@quicinc.com> am 076cb23a: Merge change I13dd02fc into eclair

Merge commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7' into eclair-mr2

* commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7':
telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
d393184ac595ab5490c77305a27fd049badf9a5d 12-Oct-2009 Naveen Kalla <nkalla@quicinc.com> telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing

When Android Telephony receives response to GET_REGISTRATION_STATE
message from RIL it may contain few fields set to NULL. Due to a parsing
exception encountered while parsing that field, the remaining fields will
not be parsed even if they are valid data. Ignore all fields that are NULL
while letting it parse non-NULL data.

For Latitude and Longitude, the values should not be hexadecimal. They
shall be parsed as decimal values as specified in the 3GPP2 C.S0005-A
specification. Invalid value is changed from -1 to Integer.MAX_VALUE.

Bug: 2201613
Change-Id: I13dd02fcfa2ae7fcb6f21c4b94b830786bd7270c
dma/CdmaCellLocation.java
9e534153264138cfee383c626db92b934fafc1af 19-Oct-2009 Tammo Spalink <tammo@google.com> Let PLUS occur once anywhere in dial-str network portion.

Create a new extractNetworkPortion() function, since the old one is
public, that does effectively the same thing but is more flexible as
just mentioned.

Addresses issue:
http://buganizer/issue?id=2013998

Change-Id: Ie5df08ef9c871881e8728a44abf0385908000823
honeNumberUtils.java
98e0b146b80670b52805b4b210ef5582dad6bb68 09-Oct-2009 Robert Greenwalt <robdroid@android.com> Make PhoneStateListeners not call TelephonyManager

Since the StatusBarPolicy is run in the System Process and shouldn't therefore call into
the Telephony process we decided to make sure all the needed info was passed along with the
original notifications.

bug: 2173053
honeStateListener.java
erviceState.java
99510681e9f1c76f82719e724990f744cfdbcefd 01-Oct-2009 John Wang <johnwang@google.com> Unhide constant DATA_ACTIVITY_DORMANT.
elephonyManager.java
29e4a3c566f435c32f0b95e4ac8e8b33cac6faba 01-Oct-2009 Dianne Hackborn <hackbod@google.com> Update from API review.

Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
eighboringCellInfo.java
db1f4993989bb03cae2f3e008d4db3e49577aa73 29-Sep-2009 Evan Millar <emillar@google.com> Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.

Change-Id: I49fbfc683f7089f052671b567ad3e19203a568f0
honeNumberUtils.java
fb2b04b7bc505f5e600e360a9de6f63e16c21bf9 25-Sep-2009 John Wang <johnwang@google.com> Unhide NETWORK_TYPE_XXX.

Make NETWORK_TYPE_HSDPA etc. unhide in TelephonyManager.
elephonyManager.java
9c118c80fd0a5416051f2a49f515301f2cf3fd6f 12-Sep-2009 johnwang <johnwang@google.com> Update CID in NeighboringCellInfo

NeighboringCellInfo works in GSM and UMTS network.

In GSM network, the locaiton value is the combination of LAC and CID.

In UMTS network, the locaiton value is PSC code.

NeighboringCellInfo should access and store those two values seperately.

It involves the change of Public API.

1. Add new API getRadioType(), getLac(), and getPsc() to get location info in GSM and UMTS.

2. Deprecate setCid() and NeighboringCellInfo(int cid) because cid is set by interpreting network type.
eighboringCellInfo.java
elephonyManager.java
694bd8bf733aee372705e00d13964a20e5b16209 24-Sep-2009 Peng Zhu <w46254@motorola.com> Add null check at isEmergencyNumber().

Change-Id: I7eca1ba1ce42e02c7506a7d969e4865778bb49cc
honeNumberUtils.java
3cc97f8dbc22eff56f17f30e1633084af507eff4 21-Sep-2009 Tammo Spalink <tammo@google.com> Add Phone.getPhoneType() operation.

This routine returns integer values defined in the Phone interface,
derived from RILConstants values. Direct references to the
RILConstants are replaced by references to these new ones for
consistency.

API CHANGE:
unhide TelephonyManager.PHONE_TYPE_CDMA

Addresses issue:
http://buganizer/issue?id=1905415

Change-Id: Icfec6d457231b098c031677a66770b5e57be4a44
ellLocation.java
elephonyManager.java
02b5948a4375dba5d287a59ba023eaf1e02b45dc 21-Sep-2009 Wei Huang <weih@google.com> make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.

Change-Id: Id4a08c3834b727e253ab189293d5715ffbbe8f35
honeNumberUtils.java
9a24bc563f28d8489c7178b93ff05f02e8b8a893 19-Sep-2009 Daisuke Miyakawa <dmiyakawa@google.com> Implement compareStrictly() using phone_number_compare() written in C.

As per several discussions, we stick to the default behavior now.
In stead, we provide compareStrictly() as a hidden method, so that some
internal components are able to use the method if needed.

Since these are static methods, they cannot refer to the configuration files,
whose values can be obtained only via Resources object.

Please make callers' side if you want to use strict version of compare().

Internal issue number: 1892808
honeNumberUtils.java
1b90def3c683afaea528a0ee705b14df6ce2e2c7 17-Sep-2009 Mike Lockwood <lockwood@android.com> telephony: Add CdmaCellLocation class to the public API.

Its twin sister GsmCellLocation is public, so this really should be in the SDK too.

Change-Id: If6f5899047546a7398f1e4191c67acf15555c21b
Signed-off-by: Mike Lockwood <lockwood@android.com>
dma/CdmaCellLocation.java
60d45f0f0320801a16db2ad038453c098e98966c 16-Sep-2009 Nicolas Catania <niko@google.com> Added a field to track if the call is to a voicemail instance.

Refactored common code between CallerInfo and CallerInfoAsyncQuery that deal
with voicemail number comparison.

In CallerInfo.java added a new field mIsVoiceMail to indicate this is a
voicemail call.
Added a new method to convert the CallerInfo into a VM instance.
Added a new method to generate a debug string from an instance.

PhoneNumberUtils has a new method "isVoiceMailNumber" to check if a number
is a VM one. I left the method as hidden. Previously any security exception
failure was cached in a static variable. I removed that and
privilege the optmistic scenario. I am not sure if the security exception
is only for the 'regular' telephony layer and if it applies if a 3rd party
VM app is installed (e.g googlevoice), hence i removed the cashing to make
sure we can pick up new voicemail providers when installed/enabled/disabled.

Bug:2112640
honeNumberUtils.java
5f1f26a7ffb3e1130108bc670960cb5368038a1b 11-Sep-2009 johnwang <johnwang@google.com> Fix NPE in TelephonyManager.

It is for bug 1971628 but affects almost every API function in TelephonyManager. When phone is not ready (for example, after crash and restart) the getSubscriberInfo and getITelephony returns null and causes NPE.
elephonyManager.java
e40f66ffc11cfc7e1bbe3e4c2ae1cf6dbc24cc17 03-Sep-2009 Wink Saville <wink@google.com> Allow hasIccCard to be useable by any processes.

This is accomplished by adding hasIccCard to ITelephony and do
the implemenation in PhoneInterfaceManager.java. Then change
TelephonyManager to use getITelephony().hasIccCard().

Change-Id: I26970fdf92a058502b8156a4f52c14e213217fc6
elephonyManager.java
65d62c774e42d8bf9a55ef50e153ffc9e277ef37 02-Sep-2009 Wink Saville <wink@google.com> Add hasIccCard to IccCard and TelephonyManager.

Expose the presence/absence of IccCards in the system.
This is needed to fix bug 2033811 which needs to show
some SIM menus in the Mms app and Contact apps only if
there is a SIM and on CDMA there is no sims yet.

The current implementation assumes CDMA never has an
IccCard this is true at the moment but needs to change.

Change-Id: I4167368e364623ea68e9b2778556e6d730b1e715
elephonyManager.java
1f952a178db86559ff4bab79c4a9b5fae18096bf 25-Aug-2009 Tammo Spalink <tammo@google.com> Move SMS pdu creation fully into the central Phone process.

Previously pdu creation was haphazardly done sometimes by the app and
sometimes centrally by the phone process -- specifically the phone
process did creation for multipart texts. This change gets rid of the
previous IPC interface for sending raw pdus to SMSDispatch in the
phone process, and instead makes everything work like multipart
messages worked before, namely the structured data is passed and pdu
encoding done centrally.

The motivation for this was the need to ensure that CDMA message id
numbers were strictly monotonic, including across reboots, which
necessitated central state in the form of a system property, which
could in turn only be modified by the phone process.

Hence, this (in part) addresses issue: http://buganizer/issue?id=2075760

Change-Id: I94ca207b6e657c465e8472534704db8646ee277c
msManager.java
msMessage.java
95434bfaee62161ce02012c6424f0c0c8fffccb5 28-Aug-2009 Tammo Spalink <tammo@google.com> Allow fragmentText to be called for singleton CDMA messages.

Corrects for previous partner changes, addressing issue:

http://buganizer/issue?id=2063332

Change-Id: I49e564d81c5db3e92a6bad973f21a02a7302875d
msMessage.java
51b2b33219a0e97ed1e5ea75dabe4113a38871b9 21-Aug-2009 Yong Liu <yong.liu@motorola.com> MO SMS fail after sending 100 messages

After sending 100 messages, SMSDispatcher always displays dialog to user to
confirm the sending. If the user sends messages too fast then there will be more
than one dialogs waiting for the response, but SMSDisptcher can only handle one.
msManager.java
4a51c20ce607c74914f90fd897f04080121ac13b 22-Aug-2009 Dianne Hackborn <hackbod@google.com> I am getting tired of the java doc warnings, so fix them.

Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
honeStateListener.java
sm/SmsMessage.java
7b0cdc8890a849283d31a15126e73edce3bdf3a6 22-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22362 into eclair

* changes:
Fix +NANP issue and cleanup plus code conversion.
ebe66345e7099ca6fc95e8aa4d31a5b5cbbd6224 14-Aug-2009 Li Zhe <jqc837@motorola.com> Framework changes to support HSDPA/HSUPA/HSPA
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA: High-Speed Packet Access

Add support for HSDPA/HSUPA/HSPA:
1) extend TelephonyManager.NETWORK_TYPE for HSDPA/HSUPA/HSPA
2) extend ServiceState.RADIO_TECHNOLOGY for HSDPA/HSUPA/HSPA
3) set radioTechnology into ServiceState in GsmServiceStateTracker
4) change the implementation of TelephonyManager.getNetworkType to
solve the competition timing issue between the time of setting
system property and the time of receiving notification through
PhoneStateListener
4.1) add a getNetworkType interface in ITelephony.aidl
5) add icons resources for HSDPA/HSUPA/HSPA
6) make use of HSDPA/HSUPA/HSPA icons in StatusBarPolicy
erviceState.java
elephonyManager.java
7850cdde66705152b859aafda875833acdda9653 18-Aug-2009 Libin Tang <Libin.Tang@motorola.com> Fix +NANP issue and cleanup plus code conversion.

This patch includes the plus code conversion clean up.
1. change the plus code conversion based on the current and default
number systems retrieved from MCC.
2. for format such as +NANP, replace the '+' with the current IDP (011).
3. comments changes.
honeNumberUtils.java
18e7b98c1c7e3cf340e39e93be67b777e7036cc4 04-Aug-2009 Tang@Motorola.com <Tang@Motorola.com> Fix the issue of incorrect conversion of the plus sign in a dial string.

The issue is that the plus sign in a dial string is always converted
to the IDP (International Dial Prefix).

This fix implements a plus sign conversion mechanism based on the default
telephone numbering system that the phone is activated and the current telephone
number system that the phone is camped on. Currently, we only support the cases
where the default and current telephone numbering system are NANP.
honeNumberUtils.java
f28ca902ad07ca3cf9c2f2e5d2d20dd58c0f13e5 09-Aug-2009 Jeff Sharkey <jsharkey@android.com> Update getNumberFromIntent() to read from both providers.

This method is used by the Phone app to decode ACTION_CALL
Intents, resolving to a real phone number. Because the
columns are changing with the new provider, I added logic
to query using the correct columns for the authority of the
requested Uri.
honeNumberUtils.java
d1cb1d22af0775a7c030822e04db1c9ecad9beab 06-Aug-2009 jsh <jsh@google.com> Bubble up SMS send fail error code to the app.

Framework portion of the fix for http://b/1978375:
We'll pass up the error code returned by the RIL on send failure.
msManager.java
ab752276ee9838fe05b3fedb18075120c72cfb54 31-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> am 0da3bdb4: Fix public API caused due to CDMA changes.

Merge commit '0da3bdb476086db02a1076780676b21e239c79d6'

* commit '0da3bdb476086db02a1076780676b21e239c79d6':
Fix public API caused due to CDMA changes.
0da3bdb476086db02a1076780676b21e239c79d6 28-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Fix public API caused due to CDMA changes.
msManager.java
msMessage.java
sm/SmsManager.java
98ad09880b148d69f4202ad40872d1cdfc1e491e 30-Jul-2009 Wink Saville <wink@google.com> am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.

Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'

* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
b307c8945d4bf8d843445f3cc6d727f4e43d90f0 29-Jul-2009 Wink Saville <wink@google.com> Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.

This bug originally reported that PHONE_TYPE_CDMA needed to be 2 because
it was public. But as far as I can tell it has never been public and it
is still marked @hide so is not public now. There is a bug in that
PHONE_TYPE_NONE and PHONE_TYPE_CDMA were both 0. But this doesn't
appear to have been a problem because PHONE_TYPE_NONE doesn't looked to be
used anywhere except in TelephonyManagerTest.
elephonyManager.java
6e4cb2a0017c86cf7fbda2640fa81e10e99a406c 28-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am ecbbecf6: Merge change 8620 into donut

Merge commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464'

* commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464':
Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
5e5b8c45dbb87be5468821ed298747ab065d73a6 27-Jul-2009 Tammo Spalink <tammo@google.com> Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
msMessage.java
35eea54a405cfeb88e48fed4bfa59687351c49a0 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6935 into donut

* changes:
DO NOT MERGE: backporting from master:
45becf90a80833dd4b98ef90b93708c6ea0c325a 13-Jul-2009 jsh <jsh@google.com> am aa459370: Update javadoc for TelephonyManager.getNetwork* for CDMA.

Merge commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f'

* commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f':
Update javadoc for TelephonyManager.getNetwork* for CDMA.
2872e30684cf837e330c8fa3bb8b2a2b73d44ddb 07-Jul-2009 Mike Lockwood <lockwood@android.com> DO NOT MERGE: backporting from master:

CDMA: Add Network ID and System ID to CdmaCellLocation.

Signed-off-by: Mike Lockwood <lockwood@android.com>
dma/CdmaCellLocation.java
aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f 13-Jul-2009 jsh <jsh@google.com> Update javadoc for TelephonyManager.getNetwork* for CDMA.

These are unreliable for CDMA, so note it in the javadoc. Also update
for the corresponding TelephonyProperties.
elephonyManager.java
a4d2fb5ef6bb5dfb6e26ac6a139de389984db5d3 07-Jul-2009 Mike Lockwood <lockwood@android.com> CDMA: Add Network ID and System ID to CdmaCellLocation.

Signed-off-by: Mike Lockwood <lockwood@android.com>
dma/CdmaCellLocation.java
4a79a017a18391116abf66f5f31410d580d2ec94 02-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am daa5a215: Merge change 5810 into donut

Merge commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825'

* commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825':
Fix bug 1930055 of NullPointerException.
4a301cb49527dfe941a8f6ac3c65a14ee42e01d1 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 8aadf7ae: Merge change 5359 into donut

Merge commit '8aadf7ae278961926de5452a46863503303735cf'

* commit '8aadf7ae278961926de5452a46863503303735cf':
fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper
daa5a21562cb4b1fda21400bc638be4d6b7f5825 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5810 into donut

* changes:
Fix bug 1930055 of NullPointerException.
107821369b7af3b739a0b5617fb34ff19f7ca9b5 30-Jun-2009 John Wang <johnwang@google.com> 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
elephonyManager.java
3a08cec99e104f74f28ba2463f00c8d4e6d1967e 25-Jun-2009 Tammo Spalink <tammo@google.com> fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper

addresses http://buganizer/issue?id=1489784
honeNumberUtils.java
e92b1e7633188e9e72a237f84266d390bb4b87ed 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am d48388ab: Merge change 5344 into donut

Merge commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca'

* commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca':
frameworks/base: CDMA voicemail support
ce099c3226b33b43e0dd5d1f24347b14a2223ee1 01-Jun-2009 David Krause <david.krause@motorola.com> frameworks/base: CDMA voicemail support
elephonyManager.java
6ff97edef79fda447143e51cc527fc3fb816f310 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 8696d703: Merge change 3874 into donut

Merge commit '8696d7030af6f0d58859f1027c423143b67f9fb4'

* commit '8696d7030af6f0d58859f1027c423143b67f9fb4':
for cdma concatenated (long) messages, replace ascii7bit with gsm7bit encoding
fc78f358cb1d1cee99758bcd6ef998a122ef27c9 11-Jun-2009 Tammo Spalink <tammo@google.com> for cdma concatenated (long) messages, replace ascii7bit with gsm7bit encoding
msManager.java
msMessage.java
97857f8618fb9ee49345414895bcbe3e1452a155 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 0b774530: Merge change 3015 into donut

Merge commit '0b77453076a22569f24318d194b378b68f11a63e'

* commit '0b77453076a22569f24318d194b378b68f11a63e':
make sms calculateLength radio-independent
a94945d3a1cf23caf33759eb1de84195d3fcb37b 03-Jun-2009 Tammo Spalink <tammo@google.com> make sms calculateLength radio-independent
msMessage.java
dfe482c9b5b16fca375b30c47185fc415c71d4e8 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am ce8436f5: Merge change 3593 into donut

Merge commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b'

* commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b':
Cleanup whitespace.
2563a3ac05dd3cf8a07203ae682c243f2e793137 09-Jun-2009 Wink Saville <wink@google.com> Cleanup whitespace.
apanesePhoneNumberFormatter.java
eighboringCellInfo.aidl
eighboringCellInfo.java
ackage.html
19db02b94504c84c8301f5ae076a4af7ac185a88 02-Jun-2009 Tammo Spalink <tammo@google.com> am 641bb3d8: expose (but still hide) sms user data headers

Merge commit '641bb3d8dfd72f57356d39ef00256d6077c9e235'

* commit '641bb3d8dfd72f57356d39ef00256d6077c9e235':
expose (but still hide) sms user data headers
641bb3d8dfd72f57356d39ef00256d6077c9e235 27-May-2009 Tammo Spalink <tammo@google.com> expose (but still hide) sms user data headers

addresses bug http://b/issue?id=1751571
msMessage.java
8e19b7c0e4c578703a1df0f8346b22b9e7c8a0f7 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> am a3d28bd5: Merge change 520 into donut

Merge commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01'

* commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01':
Enforce permissions for PhoneStateListener events.
45515659438964ec47f4feac247f0e9dce587c86 24-Apr-2009 Jaikumar Ganesh <jaikumar@google.com> Enforce permissions for PhoneStateListener events.

PhoneStateListener events like LISTEN_CALL_STATE_CHANGED,
have privacy information like phone numbers and hence,
need to be protected with a permission. The permission
READ_PHONE_STATE is used for this purpose. Use the permission
trick to ensure backward compatability.
honeStateListener.java
5214376d2b1ce082765f766be1c7d56b50df74a7 27-May-2009 Ficus Kirkpatrick <ficus@android.com> Stop the NANP number formatter from putting dashes in shortcodes.

This changes the result of PhoneNumberUtils.formatNumber("46645") from
"466-45" to "46645".
honeNumberUtils.java
5bc21aa0671d83e406b46e0431816dea8d9ca5cb 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1127 into donut

* changes:
SmsHeader rewrite, in preparation for migration to public API.
64c499113a758cf80cddfd4d0183f944a1a6645a 05-May-2009 Tammo Spalink <tammo@google.com> SmsHeader rewrite, in preparation for migration to public API.

See http://b/issue?id=1751571

Changes the semantics of SmsHeader from containing only opaque data
to exposing occurs-once frequently-used fields together with a list
of opaque fields. Also changes the coding to and from byte array to
be symmetrical, whereas previous encoding had an extra length field.

Cdma SmsMessage -- cleanup of code paths along with adjustments to
match the new header semantics, which should address at least some
of the issues with concatenated messages. See http://b/issue?id=1809759
msMessage.java
sm/SmsMessage.java
9bfbfbd40df381817c0c685b177a2a1d666e101d 15-May-2009 Jaikumar Ganesh <jaikumar@google.com> Add a method to get the PhoneType in CellLocation.

CellLocation uses TelephonyManager to get the PhoneType.
TelephonyManager uses the system property to get the phoneType,
if the ITelephony interface is not up.
ellLocation.java
elephonyManager.java
ac61f6bc2b24f7ab03cdb0089c67c4034ea8549c 19-May-2009 Mike Lockwood <lockwood@android.com> Telephony: Allow getCellLocation() if client has permission ACCESS_FINE_LOCATION

ACCESS_FINE_LOCATION should imply ACCESS_COARSE_LOCATION, so either of these
permissions should be sufficient to allow TelephonyManager.getCellLocation().

Signed-off-by: Mike Lockwood <lockwood@android.com>
elephonyManager.java
e9b06d754af03faf27012fbed1e7559ec1ba7c79 19-May-2009 Wink Saville <wink@google.com> Teleca 2b changes
ellLocation.java
honeStateListener.java
erviceState.java
ignalStrength.aidl
ignalStrength.java
elephonyManager.java
f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 11-Apr-2009 Andy Stadler <> AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
elephonyManager.java
b9db7c9f5a8924361ae2f439509e19993d82b884 05-Apr-2009 Mike Lockwood <> AI 144593: Fix GSM cell location updates.
BUG=1761611

Automated import of CL 144593
ellLocation.java
767a662ecde33c3979bf02b793d392aca0403162 02-Apr-2009 Wink Saville <> AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185
ellLocation.java
honeNumberFormattingTextWatcher.java
honeStateListener.java
erviceState.aidl
erviceState.java
msManager.java
msMessage.java
elephonyManager.java
dma/CdmaCellLocation.java
dma/package.html
sm/GsmCellLocation.java
sm/SmsManager.java
sm/SmsMessage.java
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ellLocation.java
apanesePhoneNumberFormatter.java
eighboringCellInfo.aidl
eighboringCellInfo.java
honeNumberFormattingTextWatcher.java
honeNumberUtils.java
honeStateListener.java
erviceState.aidl
erviceState.java
elephonyManager.java
sm/GsmCellLocation.java
sm/SmsManager.java
sm/SmsMessage.java
sm/package.html
ackage.html
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ellLocation.java
apanesePhoneNumberFormatter.java
eighboringCellInfo.aidl
eighboringCellInfo.java
honeNumberFormattingTextWatcher.java
honeNumberUtils.java
honeStateListener.java
erviceState.aidl
erviceState.java
elephonyManager.java
sm/GsmCellLocation.java
sm/SmsManager.java
sm/SmsMessage.java
sm/package.html
ackage.html
076357b8567458d4b6dfdcf839ef751634cd2bfb 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
sm/SmsMessage.java
3dec7d563a2f3e1eb967ce2054a00b6620e3558c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
sm/SmsMessage.java
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
elephonyManager.java
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
apanesePhoneNumberFormatter.java
eighboringCellInfo.aidl
eighboringCellInfo.java
honeNumberUtils.java
elephonyManager.java
sm/SmsManager.java
sm/SmsMessage.java
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ellLocation.java
honeNumberFormattingTextWatcher.java
honeNumberUtils.java
honeStateListener.java
erviceState.aidl
erviceState.java
elephonyManager.java
sm/GsmCellLocation.java
sm/SmsManager.java
sm/SmsMessage.java
sm/package.html
ackage.html