2 years agoresolve merge conflicts of 3ed74f4b6 to stage-aosp-master
Amit Mahajan [Fri, 24 Mar 2017 22:55:21 +0000]
resolve merge conflicts of 3ed74f4b6 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id6c90fa0f3b8821ac3e786ebc22e7aa5ac22cfad

2 years agoMerge "Unit test fixes. Most failures were due to new mockito."
Amit Mahajan [Fri, 24 Mar 2017 20:43:18 +0000]
Merge "Unit test fixes. Most failures were due to new mockito."

2 years agoMerge "Deprecated getDeviceId and added getMeid and getImei"
Jack Yu [Fri, 24 Mar 2017 17:11:03 +0000]
Merge "Deprecated getDeviceId and added getMeid and getImei"
am: 1cb7194eb1

Change-Id: I60ee1e9ab067f237ad86cb8ca054c273f3396c1a

2 years agoMerge "Deprecated getDeviceId and added getMeid and getImei"
Jack Yu [Fri, 24 Mar 2017 17:02:58 +0000]
Merge "Deprecated getDeviceId and added getMeid and getImei"

2 years agoMerge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
Jayachandran Chinnakkannu [Thu, 23 Mar 2017 23:25:48 +0000]
Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
am: 35f4675016

Change-Id: Ia9574b39e40c23163936f9021d3464a504292a04

2 years agoMerge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
Jayachandran Chinnakkannu [Thu, 23 Mar 2017 23:21:50 +0000]
Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"

2 years agoDeprecated getDeviceId and added getMeid and getImei
Jack Yu [Thu, 16 Mar 2017 00:10:18 +0000]
Deprecated getDeviceId and added getMeid and getImei

Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Merged-In: If3b87f071e1e38d19008bdea3d7401802d72f5ad
Change-Id: If3b87f071e1e38d19008bdea3d7401802d72f5ad

2 years agoClear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready
Jayachandran C [Wed, 22 Mar 2017 00:23:20 +0000]
Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready

mAutoAttachOnCreation allows data call for nwTypeChanged after
airplane mode toggle or radio reset but before modem actaully
registers on service. This causes data leak on roaming networks
for shorter time even though data roaming is disabled.

Bug: 31266202
Change-Id: Ia83146a0dafd9e2967d3e99829eea0ec08218b8a

2 years agoMerge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
Brad Ebinger [Thu, 23 Mar 2017 21:18:53 +0000]
Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
am: 0a72d2beed

Change-Id: I954b95b8eb08e9696300020ab551940a87c384b1

2 years agoMerge "Notification for MM reject cause code"
Brad Ebinger [Thu, 23 Mar 2017 21:16:21 +0000]
Merge "Notification for MM reject cause code"
am: e3d52a2907  -s ours

Change-Id: I03dbc5d87e907f9846b546894f4f733bdd03ee45

2 years agoMerge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
Brad Ebinger [Thu, 23 Mar 2017 21:05:52 +0000]
Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""

2 years agoMerge "Notification for MM reject cause code"
Brad Ebinger [Thu, 23 Mar 2017 21:04:40 +0000]
Merge "Notification for MM reject cause code"

2 years agoNotification for MM reject cause code
manabu.x.fujiwara [Wed, 8 Mar 2017 06:10:54 +0000]
Notification for MM reject cause code

Display notification when UE fails to register network with specific
reject cause code. The notification includes specific strings and icon.
Since some carriers require, this feature is needed.

Test: manual with simulated RIL
Bug: 28923693
Merged-In: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8

2 years agoRevert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"
Brad Ebinger [Thu, 23 Mar 2017 00:11:31 +0000]
Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"

This reverts commit 9f13848d600c0782a5bcb3b1d2d7dca5dca35005.

Looks to be causing issues where ImsPhoneCallTracker
state is out of sync with ImsService

Bug: 36273870
Change-Id: Id3cfbdc007c561f886adffd16def76dac553ac27

2 years agoNotification for MM reject cause code
manabu.x.fujiwara [Wed, 8 Mar 2017 06:10:54 +0000]
Notification for MM reject cause code

Display notification when UE fails to register network with specific
reject cause code. The notification includes specific strings and icon.
Since some carriers require, this feature is needed.

Test: manual with simulated RIL
Bug: 28923693
Merged-In: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8

2 years agoMerge "Change 'idx' to 'index' for SubscriptionManager api."
Sanket Padawe [Thu, 23 Mar 2017 00:45:46 +0000]
Merge "Change 'idx' to 'index' for SubscriptionManager api."
am: 5b18fad29a

Change-Id: Icad67550539e3f8210ce669489c3a4c476e2c06e

2 years agoMerge "Change 'idx' to 'index' for SubscriptionManager api."
Sanket Padawe [Wed, 22 Mar 2017 21:27:21 +0000]
Merge "Change 'idx' to 'index' for SubscriptionManager api."

2 years agoMerge "Invalid call forwarding indicator status check"
Jack Yu [Wed, 22 Mar 2017 20:59:03 +0000]
Merge "Invalid call forwarding indicator status check"
am: fa3049fdfa

Change-Id: Ibd45fa7b81db530deac2782833f2172f87df5b4b

2 years agoMerge "reset carrier actions on sim loaded"
Chen Xu [Wed, 22 Mar 2017 20:58:51 +0000]
Merge "reset carrier actions on sim loaded"
am: 2328077d0b

Change-Id: If962acdc29aa07e7164bca9ce71c6149ca33412e

2 years agoMerge "Invalid call forwarding indicator status check"
Jack Yu [Wed, 22 Mar 2017 20:52:36 +0000]
Merge "Invalid call forwarding indicator status check"

2 years agoMerge "reset carrier actions on sim loaded"
Chen Xu [Wed, 22 Mar 2017 20:50:17 +0000]
Merge "reset carrier actions on sim loaded"

2 years agoMerge "Add missing handling for RIL_UNSOL_ON_SS."
Amit Mahajan [Wed, 22 Mar 2017 19:12:18 +0000]
Merge "Add missing handling for RIL_UNSOL_ON_SS."
am: d110bd5bfa

Change-Id: Id4dfd44ca4a36454f8a1352742c31760f7d88716

2 years agoMerge "Add missing handling for RIL_UNSOL_ON_SS."
Amit Mahajan [Wed, 22 Mar 2017 19:03:48 +0000]
Merge "Add missing handling for RIL_UNSOL_ON_SS."

2 years agoAdd missing handling for RIL_UNSOL_ON_SS.
Amit Mahajan [Wed, 22 Mar 2017 16:58:41 +0000]
Add missing handling for RIL_UNSOL_ON_SS.

Test: none
Bug: 32020264
Change-Id: I5d3429765ca90dda9dac656599ae9d0296ea5401

2 years agoMerge "Remove rild sockets."
Amit Mahajan [Wed, 22 Mar 2017 16:58:36 +0000]
Merge "Remove rild sockets."
am: 4f6584f665

Change-Id: Ice9ddee78663683b25f7adffd75ea90f0275020f

2 years agoMerge "Remove rild sockets."
Amit Mahajan [Wed, 22 Mar 2017 16:54:40 +0000]
Merge "Remove rild sockets."

2 years agoreset carrier actions on sim loaded
fionaxu [Tue, 21 Mar 2017 18:27:52 +0000]
reset carrier actions on sim loaded

There are some use cases where carriers activate SIM's data service by
updating EF files with an ICC refresh event. Slightly different from hot
sim swap, this might not go through the complete SIM loading procedure
and won't recreate any new Icc Record as well.
- Move carrier action reset to recordsLoaded event handler which handles
both ICC refresh and hot sim swap.
- refactor carrier action reset from individual modules to carrier
action agent

Bug: 36154348
Test: Manual
Change-Id: I7af8b1d956ba7dfa1efdc8858b49903f24382dbe

2 years agoUnit test fixes. Most failures were due to new mockito.
Amit Mahajan [Tue, 21 Mar 2017 22:57:06 +0000]
Unit test fixes. Most failures were due to new mockito.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
Bug: 29579544
Merged-in: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98
Change-Id: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98

2 years agoRemove rild sockets.
Amit Mahajan [Tue, 14 Mar 2017 23:40:33 +0000]
Remove rild sockets.

Test: Basic telephony sanity
Bug: 32020264
Merged-in: I80407542719bfdba91f5a74329c76491d41fbe04
Change-Id: I80407542719bfdba91f5a74329c76491d41fbe04

2 years agoChange 'idx' to 'index' for SubscriptionManager api.
Sanket Padawe [Fri, 17 Mar 2017 22:34:39 +0000]
Change 'idx' to 'index' for SubscriptionManager api.

Bug: 35767068
Test: No build failure on update.
Change-Id: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b
Merged-in: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b

2 years agoMerge "Added ETWS primary message default message support"
Jack Yu [Tue, 21 Mar 2017 09:19:11 +0000]
Merge "Added ETWS primary message default message support"
am: 44000fe846

Change-Id: I2e3dc247b0a5f59f91cdbf67190d9c1872a3be02

2 years agoMerge "Added ETWS primary message default message support"
Treehugger Robot [Tue, 21 Mar 2017 09:11:44 +0000]
Merge "Added ETWS primary message default message support"

2 years agoAdded ETWS primary message default message support
Jack Yu [Sat, 18 Mar 2017 06:17:50 +0000]
Added ETWS primary message default message support

ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.

Test: manual
bug: 33595007
Merged-In: I0bd0a6655bc4a327124b2a145fa3892c177c4fdb
Change-Id: I0bd0a6655bc4a327124b2a145fa3892c177c4fdb

2 years agoMerge "Fixed device crash on automation setup"
Jack Yu [Tue, 21 Mar 2017 03:48:40 +0000]
Merge "Fixed device crash on automation setup"
am: 152f41bd17

Change-Id: Icbb557d155f9e51c0bf77f2cfe2037d83b47a750

2 years agoMerge "Fixed device crash on automation setup"
Jack Yu [Tue, 21 Mar 2017 03:41:02 +0000]
Merge "Fixed device crash on automation setup"

2 years agoFixed device crash on automation setup
Jack Yu [Mon, 20 Mar 2017 21:43:34 +0000]
Fixed device crash on automation setup

This is a regression introduced by
https://android-review.googlesource.com/#/c/342381/
Sending the broadcast intent twice (extra one is for sl4a) causes
EVENT_BROADCAST_COMPLETE got sent twice, which brought the wake lock
state machine into the bad state.

Fixed by changing the first result receiver to null so only one
EVENT_BROADCAST_COMPLETE will be broadcasted.

Test: Telephony sanity tests
bug: 36107224
Change-Id: I02b4b4b9fa7a3106ad83e0200cf1e6dc5924c771

2 years agoMerge "Pass cause and precise call fail causes for IMS calls"
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:27:16 +0000]
Merge "Pass cause and precise call fail causes for IMS calls"
am: 93fc20f26f

Change-Id: I7441017dda3232db9f6633ce7a21bba5ded9a53e

2 years agoMerge "Pass cause and precise call fail causes for IMS calls"
Jayachandran Chinnakkannu [Fri, 17 Mar 2017 22:18:22 +0000]
Merge "Pass cause and precise call fail causes for IMS calls"

2 years agoPass cause and precise call fail causes for IMS calls
Jayachandran C [Sun, 12 Mar 2017 02:18:36 +0000]
Pass cause and precise call fail causes for IMS calls

Bug: 35609963
Change-Id: I7955a246b89e8dfd8a4b21ab9c8c4203b569c0a4

2 years agoresolve merge conflicts of 6b0d9a09f to stage-aosp-master
Brad Ebinger [Thu, 16 Mar 2017 20:10:40 +0000]
resolve merge conflicts of 6b0d9a09f to stage-aosp-master

Change-Id: Ic406e5468690f8a6e771a77c921dd49718f76b21

2 years agoMerge "Added configuration for VT downgrade/tear down when data disabled"
Brad Ebinger [Thu, 16 Mar 2017 19:52:08 +0000]
Merge "Added configuration for VT downgrade/tear down when data disabled"

2 years agoAdded configuration for VT downgrade/tear down when data disabled
Jack Yu [Tue, 15 Nov 2016 20:41:12 +0000]
Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: I977f1aa511c59f32446b4a76de3c6da54500adc1
Change-Id: I977f1aa511c59f32446b4a76de3c6da54500adc1

2 years agoMerge "Support Signal Strength Offset"
Sooraj Sasindran [Thu, 16 Mar 2017 03:18:18 +0000]
Merge "Support Signal Strength Offset"
am: 9b85480ed9

Change-Id: Ia3f727f2af17d6530358ce9d80a1ef0632dfaac1

2 years agoMerge "Support Signal Strength Offset"
Sooraj Sasindran [Thu, 16 Mar 2017 03:13:29 +0000]
Merge "Support Signal Strength Offset"

2 years agoSupport Signal Strength Offset
Sooraj Sasindran [Thu, 9 Mar 2017 07:40:55 +0000]
Support Signal Strength Offset

Feature to offset the lte rsrp for
higher frequency lte bands.

Test: Verified on device that signal bars increased
bug=30628343

Merged-In: Ia056cca2ca1ef3c63f033e4d0dad7f0603a3bb1c
Change-Id: Ia056cca2ca1ef3c63f033e4d0dad7f0603a3bb1c

2 years agoMerge "Track the calling user id in SmsTracker"
Tony Mak [Wed, 15 Mar 2017 17:09:38 +0000]
Merge "Track the calling user id in SmsTracker"
am: 9fb0d53bab

Change-Id: Ib74b7f0cebc21841c6bf2ab08a0a9a3a0eec0c9d

2 years agoMerge "Track the calling user id in SmsTracker"
Tony Mak [Wed, 15 Mar 2017 17:04:12 +0000]
Merge "Track the calling user id in SmsTracker"

2 years agoTrack the calling user id in SmsTracker
Tony Mak [Fri, 10 Mar 2017 16:37:37 +0000]
Track the calling user id in SmsTracker

Store the calling user id in SmsTracker, and consume it throughout
SmsDispatcher.

Test: SmsManager.sendTextMessage in user 0 is working
Test: SmsManager.sendTextMessage in work profile is working
   (Make sure the app is not installed in user 0).

Fix: 35590739

Change-Id: I396880fe33bd0db05f7952dec6234def98f6b916

2 years agoMerge "Allow fallback translated languages in MccTable"
Maurice Lam [Tue, 14 Mar 2017 20:39:15 +0000]
Merge "Allow fallback translated languages in MccTable"
am: 20312ddd96

Change-Id: Iaf53e730f478c01982d2741c40d3ceb020c94db0

2 years agoMerge "Allow fallback translated languages in MccTable"
Maurice Lam [Tue, 14 Mar 2017 20:34:25 +0000]
Merge "Allow fallback translated languages in MccTable"

2 years agoAllow fallback translated languages in MccTable
Maurice Lam [Wed, 16 Nov 2016 03:03:15 +0000]
Allow fallback translated languages in MccTable

When choosing a fallback locale, if that locale is marked as
"translated" by LocaleStore, return that locale. This is true if a
locale itself has translations, or another locale with the same
language and script that is translated.

For example if the user inserts a Canadian SIM, previously it will
fallback to en-US since the system doesn't have translations for
en-CA. But since Android N users are allowed to select locale
English (Canada), which the framework will find suitable fallback
translation when resolving resources. So with this change, if the
user inserts a Canadian SIM, getLocaleFromMcc will now return en-CA.

Test: Run MccTableTest (via adb shell am instrument)
Bug: 31395257
Change-Id: I7f74bc2ed14efb9ce5594dbf563c76e2d5b353da

2 years agoMerge "Removed the deprecated screen state API"
Jack Yu [Tue, 14 Mar 2017 00:41:05 +0000]
Merge "Removed the deprecated screen state API"
am: ff8c0eb673

Change-Id: I33bbd6334e468ab49d605a3143112516fff443e9

2 years agoMerge "Removed the deprecated screen state API"
Jack Yu [Tue, 14 Mar 2017 00:34:02 +0000]
Merge "Removed the deprecated screen state API"

2 years agoMerge "Remove old @Postsubmit annotation"
Jordan Liu [Mon, 13 Mar 2017 23:59:33 +0000]
Merge "Remove old @Postsubmit annotation"
am: 4e9fbe1ab3

Change-Id: I6ffe4c05cabf94df974c35e117fa275d40d854a2

2 years agoMerge "Remove old @Postsubmit annotation"
Jordan Liu [Mon, 13 Mar 2017 23:52:54 +0000]
Merge "Remove old @Postsubmit annotation"

2 years agoMerge "[DO NOT MERGE] Update injectSmsPdu documentation."
ashastry [Mon, 13 Mar 2017 23:27:56 +0000]
Merge "[DO NOT MERGE] Update injectSmsPdu documentation."
am: 1ccbc720bf  -s ours

Change-Id: I4ab30e0ba684fd47846e2424fe7e6c0309502a87

2 years agoMerge "[DO NOT MERGE] Update injectSmsPdu documentation."
ashastry [Mon, 13 Mar 2017 23:22:24 +0000]
Merge "[DO NOT MERGE] Update injectSmsPdu documentation."

2 years agoRemoved the deprecated screen state API
Jack Yu [Mon, 13 Mar 2017 22:22:01 +0000]
Removed the deprecated screen state API

The screen state API was deprecated on O and should
not be added into the radio interace.

Test: Telephony sanity tests
bug: 32223897
Change-Id: I6651224779399d7c33a3675ac8cc3ca004bcd549

2 years agoMerge "Change to not send error response twice."
Amit Mahajan [Mon, 13 Mar 2017 22:04:11 +0000]
Merge "Change to not send error response twice."
am: 10a430b59c

Change-Id: Ie365b5d6a75443d496e2ee302bceb0edc5af7da4

2 years agoMerge "Change to not send error response twice."
Treehugger Robot [Mon, 13 Mar 2017 21:58:28 +0000]
Merge "Change to not send error response twice."

2 years ago[DO NOT MERGE] Update injectSmsPdu documentation.
Abhijith Shastry [Fri, 3 Mar 2017 18:28:17 +0000]
[DO NOT MERGE] Update injectSmsPdu documentation.

BUG: 35325136
Test: Comment only update.
Change-Id: Id60409f66fd9166a2ad9c46d9be0e8f2c52fdb33

2 years agoMerge "Fix phone process crash due to stale data processing."
Sandeep Gutta [Fri, 10 Mar 2017 19:48:17 +0000]
Merge "Fix phone process crash due to stale data processing."
am: 6e2e2c1d6a

Change-Id: I8b991e22de0b5c29b9d978c6e3f1331a74359873

2 years agoMerge "Fix phone process crash due to stale data processing."
Treehugger Robot [Fri, 10 Mar 2017 19:43:39 +0000]
Merge "Fix phone process crash due to stale data processing."

2 years agoFix phone process crash due to stale data processing.
Sandeep Gutta [Mon, 4 Jul 2016 14:03:22 +0000]
Fix phone process crash due to stale data processing.

Due to successive power down and power up happening in
quick successions, CommandParamsFactory is processing
the older data even after CatService is disposed, resulting
in the phone process crash.

Fix: Add a null check for icon loader in CommandParamsFactory
to avoid the crash.
Test: verified no crash.

Bug: 30928365
Change-Id: Ia011cec83f53e764d2c201dd0bd588eb5a4c7e89

2 years agoMerge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt...
Shuo Qian [Fri, 10 Mar 2017 18:01:10 +0000]
Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt/telephony"
am: d6ca792e51

Change-Id: Id6b4acbd3bf06e8ef07fe7af6e80065b61c5ec2e

2 years agoMerge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt...
Shuo Qian [Fri, 10 Mar 2017 17:56:26 +0000]
Merge "Remove @FlakyTest annotation for TelephonyMetricsTest.java in framework/opt/telephony"

2 years agoMerge "Refactor code incompatible with Mockito 2.7.13"
Paul Duffin [Fri, 10 Mar 2017 07:39:33 +0000]
Merge "Refactor code incompatible with Mockito 2.7.13"
am: 92851f849f

Change-Id: I1c60aa1fb298acb1c46d40686a8f30c018216ebd

2 years agoMerge "Refactor code incompatible with Mockito 2.7.13"
Paul Duffin [Fri, 10 Mar 2017 07:33:55 +0000]
Merge "Refactor code incompatible with Mockito 2.7.13"

2 years agoMerge "Use tac and ci as lac and cid for LTE"
Sooraj Sasindran [Fri, 10 Mar 2017 03:10:17 +0000]
Merge "Use tac and ci as lac and cid for LTE"
am: 995e90e58b

Change-Id: I3ce8719f7f0105ddee1f6b4c9821eac86df1c3d1

2 years agoMerge "Use tac and ci as lac and cid for LTE"
Sooraj Sasindran [Fri, 10 Mar 2017 03:05:18 +0000]
Merge "Use tac and ci as lac and cid for LTE"

2 years agoChange to not send error response twice.
Amit Mahajan [Fri, 10 Mar 2017 01:42:28 +0000]
Change to not send error response twice.

resetProxyAndRequestList() sends the error response.
Also includes fixes for OemHookProxy handling when service dies.

Test: Basic telephony sanity
Bug: 35910123
Change-Id: I23d4b3495523ba0a5bc5fe619b525a2d1fbba5f4

2 years agoRemove old @Postsubmit annotation
Jordan Liu [Wed, 1 Mar 2017 18:03:01 +0000]
Remove old @Postsubmit annotation

The annotation is no longer needed because it has been replaced with
@FlakyTest. This commit also removes the import.

Change-Id: I5e7c1a7b6a856f84f294f98acb4ba627fc7880cd
Merged-In: I5e7c1a7b6a856f84f294f98acb4ba627fc7880cd
Fixes: 35710737
Test: No change to behavior

2 years agoRemove @FlakyTest annotation for TelephonyMetricsTest.java
Shuoq [Thu, 9 Mar 2017 22:13:11 +0000]
Remove @FlakyTest annotation for TelephonyMetricsTest.java
in framework/opt/telephony

Bug: 35710737
Test: Sanity
Change-Id: I2e80f8658ae981835d46f0e449faa4713f74cf12

2 years agoMerge "Disable a phone number log for user build"
Brad Ebinger [Thu, 9 Mar 2017 21:45:44 +0000]
Merge "Disable a phone number log for user build"
am: 58046e21d7

Change-Id: I86a10997b063328b9b5e92cc07f031abb0a291a4

2 years agoMerge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"
Shuo Qian [Thu, 9 Mar 2017 21:41:36 +0000]
Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"
am: e47a6f23e0

Change-Id: I4a643fe842c72995cbb05cf5c08e9d79f5814ed4

2 years agoMerge "Disable a phone number log for user build"
Brad Ebinger [Thu, 9 Mar 2017 21:38:59 +0000]
Merge "Disable a phone number log for user build"

2 years agoMerge "Initialize CallForwardInfo correctly."
Amit Mahajan [Thu, 9 Mar 2017 21:38:52 +0000]
Merge "Initialize CallForwardInfo correctly."
am: 579e3ca02d

Change-Id: I9c0c3efd2cf6a3473ba50de2bb1dc9d60c8d8826

2 years agoMerge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"
Shuo Qian [Thu, 9 Mar 2017 21:38:39 +0000]
Merge "Add @FlakyTest annotation to flaky tests in framework/opt/telephony"

2 years agoMerge "Initialize CallForwardInfo correctly."
Treehugger Robot [Thu, 9 Mar 2017 21:33:23 +0000]
Merge "Initialize CallForwardInfo correctly."

2 years agoRefactor code incompatible with Mockito 2.7.13
Paul Duffin [Thu, 9 Mar 2017 18:49:41 +0000]
Refactor code incompatible with Mockito 2.7.13

Bug: 32912773
Test: make checkbuild
Change-Id: Ie5ac742d4376e96286cc527a2331e91a17c85fd8

2 years agoInitialize CallForwardInfo correctly.
Amit Mahajan [Thu, 9 Mar 2017 20:10:17 +0000]
Initialize CallForwardInfo correctly.

Test: *#21# on AT&T shows response
Bug: 35330178
Change-Id: I624f7799d1289dca41dfd56870bbbd7b0cbee48a

2 years agoMerge "Revert "Get rid of RIL version.""
Adrian Salido [Thu, 9 Mar 2017 20:05:14 +0000]
Merge "Revert "Get rid of RIL version.""
am: 6514905475

Change-Id: I14f1c448e55cedfb09f7af2e73daffd8d5ca1e5d

2 years agoAdd @FlakyTest annotation to flaky tests in framework/opt/telephony
Shuoq [Tue, 7 Mar 2017 23:37:02 +0000]
Add @FlakyTest annotation to flaky tests in framework/opt/telephony

Bug: 35710737
Test: No change to behavior
Change-Id: I923486c5fb69b241cea59a330ed80077c10adb89

2 years agoMerge "Revert "Get rid of RIL version.""
Treehugger Robot [Thu, 9 Mar 2017 19:56:55 +0000]
Merge "Revert "Get rid of RIL version.""

2 years agoUse tac and ci as lac and cid for LTE
Sooraj Sasindran [Tue, 7 Mar 2017 07:01:31 +0000]
Use tac and ci as lac and cid for LTE

In case of LTE, use ci and tac as cid and lac.
Convert ril registration state to ServiceState
registration state.

Test: verified unit tests.
      verified on device that device reports
      registration correctly
Bug=32223344
Change-Id: I556914dc17dae3842048fc574e5554ef26264720

2 years agoRevert "Get rid of RIL version."
Adrian Salido [Thu, 9 Mar 2017 01:17:28 +0000]
Revert "Get rid of RIL version."

This reverts commit 81ea341d2deb767cbd1de2f356296ad92e951c52.

Bug: 36018228
Change-Id: Iee0410f197c2869e2bdefcaaae51e7ef215cdff1

2 years agoMerge "Change Czech Republic to Czechia"
Joachim Sauer [Wed, 8 Mar 2017 20:07:43 +0000]
Merge "Change Czech Republic to Czechia"
am: d6d57139c6

Change-Id: Ibed6118f29f1f26c9d41d7084c4e6b8ca088ca1e

2 years agoMerge "Change Czech Republic to Czechia"
Treehugger Robot [Wed, 8 Mar 2017 20:02:36 +0000]
Merge "Change Czech Republic to Czechia"

2 years agoMerge "Makes some updates to the ImsService Rebind process"
Brad Ebinger [Wed, 8 Mar 2017 20:02:09 +0000]
Merge "Makes some updates to the ImsService Rebind process"
am: ff78a98356

Change-Id: If7c3ea006d99a488188cffc63c490eab09bac577

2 years agoMerge "Makes some updates to the ImsService Rebind process"
Brad Ebinger [Wed, 8 Mar 2017 19:53:25 +0000]
Merge "Makes some updates to the ImsService Rebind process"

2 years agoChange Czech Republic to Czechia
Joachim Sauer [Wed, 8 Mar 2017 18:06:37 +0000]
Change Czech Republic to Czechia

This commit only contains changes to comments.

Bug: 34964100
Test: m buildcheck
Change-Id: I0e8ab86c613ba647545da288da0078f785fdc1f1

2 years agoMerge "Fixed database not closed after use"
Jack Yu [Tue, 7 Mar 2017 17:11:59 +0000]
Merge "Fixed database not closed after use"
am: a8b56a378b

Change-Id: Ibdc403e9a504dc6a3cc2627bb8e064138a8ab2a8

2 years agoMerge "Fixed database not closed after use"
Treehugger Robot [Tue, 7 Mar 2017 17:07:39 +0000]
Merge "Fixed database not closed after use"

2 years agoMerge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"
Erik Kline [Tue, 7 Mar 2017 13:32:33 +0000]
Merge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"
am: 079277986d

Change-Id: Ic25bf55b79899dc26180f62ab51910d415d5d82b

2 years agoMerge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"
Treehugger Robot [Tue, 7 Mar 2017 13:27:09 +0000]
Merge "Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest"

2 years agoRemove request{LinkProperties,NetworkCapabilities} by NetworkRequest
Erik Kline [Tue, 7 Mar 2017 08:14:59 +0000]
Remove request{LinkProperties,NetworkCapabilities} by NetworkRequest

Test: treehugger
Bug: 32163131
Change-Id: Idbc6ad949540c62d7db727f52d93fcd8fda694d8

2 years agoMerge "Delete unused code."
Amit Mahajan [Tue, 7 Mar 2017 02:38:53 +0000]
Merge "Delete unused code."
am: 223446daad

Change-Id: I225ff7c59f08c93259816f2595ed58b96cb5b305

2 years agoMerge "Fixed enableLocationUpdates crash"
Jack Yu [Tue, 7 Mar 2017 01:01:05 +0000]
Merge "Fixed enableLocationUpdates crash"
am: 663db0d09b

Change-Id: Ic9e7a4dfdac9d19cee4ca2b3c4a9b5c9783cc092

2 years agoFixed database not closed after use
Jack Yu [Sun, 5 Mar 2017 04:20:52 +0000]
Fixed database not closed after use

Test: Telephony sanity tests
bug:

Change-Id: Ifb8f058bef78810ad21c038a1abc97e3be2f0713

2 years agoMerge "Delete unused code."
Treehugger Robot [Mon, 6 Mar 2017 23:13:13 +0000]
Merge "Delete unused code."