Commit Graph

6382 Commits

Author SHA1 Message Date
Brad Ebinger
c0c2e83c01 Merge "Clean up old Context references in ImsConfig" into pi-dev am: 65ac70515f
am: 617296457f

Change-Id: I15f1f1eeb17107e058eb75aec6d8f238113c5ab1
2018-05-01 16:33:28 -07:00
Brad Ebinger
617296457f Merge "Clean up old Context references in ImsConfig" into pi-dev
am: 65ac70515f

Change-Id: I9d9b5ac97c710b1d742fc25730e3e28172ff75e3
2018-05-01 16:25:34 -07:00
Brad Ebinger
65ac70515f Merge "Clean up old Context references in ImsConfig" into pi-dev 2018-05-01 23:10:40 +00:00
Tyler Gunn
b02996cb14 Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev am: 7f556daa41
am: d6aef2176f

Change-Id: Id4b1f204061f6c7f6c12c2faa392015ade4c4b7f
2018-05-01 13:52:35 -07:00
Tyler Gunn
d6aef2176f Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev
am: 7f556daa41

Change-Id: Icd641707eef832fd5f3d393c64ce9b3483770e9d
2018-05-01 13:41:49 -07:00
Tyler Gunn
7f556daa41 Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev 2018-05-01 20:27:15 +00:00
Jordan Liu
d6a4236f05 Merge "Add Carriers.APN_SET_ID and NO_SET_SET" into pi-dev am: 47c3c87c0c
am: dd91ec68d4

Change-Id: I2a084eb89c5857fdcaa2a8b89912934e9d4bcfe2
2018-04-30 15:33:50 -07:00
Jordan Liu
dd91ec68d4 Merge "Add Carriers.APN_SET_ID and NO_SET_SET" into pi-dev
am: 47c3c87c0c

Change-Id: I429680f2d9becaa1d4804517e40ec03925663476
2018-04-30 15:24:48 -07:00
Jordan Liu
47c3c87c0c Merge "Add Carriers.APN_SET_ID and NO_SET_SET" into pi-dev 2018-04-30 22:11:39 +00:00
Pavel Grafov
3e3d693b6f DO NOT MERGE Fix duplicate merge artifact.
Change-Id: Ifd096650efdaafe45cb1758496ab5f86a47a07a0
Test: in treehugger we trust
2018-04-30 14:02:27 +01:00
sqian
7e8830ba55 Fix master build due to bad merge
Test: make

Change-Id: I41958f5420f0069288f946ed7367c140be7cbd9e
2018-04-27 13:46:13 -07:00
Shuo Qian
f65e3470f8 Merge "Restore the OEM hook implementation and usage" am: 093ade312d am: caee2573f9
am: e0c8f4ab7e

Change-Id: Ie0e88826b647c1982e0475575c7a6dd1a40eb2b0
2018-04-27 13:16:33 -07:00
Shuo Qian
e0c8f4ab7e Merge "Restore the OEM hook implementation and usage" am: 093ade312d
am: caee2573f9

Change-Id: I8a29091c8726a4e5160ec00c205ec1782c6842fb
2018-04-27 13:00:17 -07:00
Shuo Qian
093ade312d Merge "Restore the OEM hook implementation and usage" 2018-04-27 18:39:20 +00:00
Jordan Liu
4061715168 Add Carriers.APN_SET_ID and NO_SET_SET
Add them as hidden for now.

Bug: 70172263
Test: TelephonyProviderTest#testApnSetId
Change-Id: Id16dd5631d327f403a7347b72ecfb27a5e298541
2018-04-27 10:40:36 -07:00
Tyler Gunn
f955e56d51 Require READ_CALL_LOG permission to see phone numbers in phone state.
Incoming and outgoing call phone numbers are visible in the phone state
broadcast and via the PhoneStateListener.  To enhance user privacy, change
to require the READ_CALL_LOG permission in order to receive the call
phone numbers.

This means to see phone numbers:
1. android.intent.action.PHONE_STATE - requires READ_PHONE_STATE and
READ_CALL_LOG permission.
2. PhoneStateListener#onCallStateChanged - now required READ_CALL_LOG
permission.

To support this new behavior, added sendBroadcastAsUserMultiplePermissions
method to context to allow sending the broadcast to all users while
requiring the two permissions.

Bug: 78650469
Test: Created PHONE_STATE broadcast receiver in test app and verified that
when no permissions are granted, the phone number is empty for incoming
and outgoing calls.
Test: Granted Phone state permission to test app and verified that phone
number is not populated.
Test: Granted test app read call log permission and verified that phone
number is populated.
Test: Created PhoneStateListener in test app and verified that when no
permissions are granted, phone number is empty for incoming and outgoing.
calls.
Test: Granted read call log permission to test app and verified that both
the incoming and outgoing numbers are populated.

Change-Id: I857ea00cc58a0abbb77960643f361dd6dd9c8b56
2018-04-27 08:44:07 -07:00
Shuo Qian
deb94e2ac1 Merge "Restore the OEM hook implementation and usage" into pi-dev am: 8fa0feaa48
am: 8eaefa71ba

Change-Id: Ifc1d4a7b86ad80c3226b99116b1a8e1284bcf863
2018-04-26 18:52:29 -07:00
Shuo Qian
8eaefa71ba Merge "Restore the OEM hook implementation and usage" into pi-dev
am: 8fa0feaa48

Change-Id: Ic6ed074a555c7d1d96a9e304d18fb9ebfab94a3e
2018-04-26 18:40:12 -07:00
Shuo Qian
1c11e207af Restore the OEM hook implementation and usage
The current plan is to keep the OEM hook implementation in the framework
, this is for legacy device and old device upgrading (per b/78098059).

For P launching device, the OEM hook service is removed in hal, so the 
OEM hook api in framework should return something dummy, and prevent 
infinite loop to get service, but these parts should be done in seperate
CLs after this restore CL is merged.

This reverts commit f09bde2809.

Bug: 34344851
Change-Id: I2aea9be9aa7cecd4f7a1f1783391f0af173bfc59
Test: pass Treehugger tests; pass cuttlefish test RilE2eTests

Merged-In: I1f2117331a7f846b192c5f956f3841d58cb8154b
2018-04-27 01:27:54 +00:00
Shuo Qian
8fa0feaa48 Merge "Restore the OEM hook implementation and usage" into pi-dev 2018-04-27 01:24:18 +00:00
Gil O'Neil
220b47a10d Merge "Added test API to refresh the UICC Profile" into pi-dev am: 3e6ceafbaa
am: f0c09d6e0c

Change-Id: I66696ad33de00595f10e02f7e29aa33bc4442281
2018-04-26 16:55:08 -07:00
Nathan Harold
05897ae6e1 Merge "Use Empty List for Default PhysicalChannelConfig" into pi-dev am: 6e2ed97e80
am: d4a61663d2

Change-Id: I188e15f42f0a36c668bd607a7d506bbb595c123e
2018-04-26 16:43:06 -07:00
Gil O'Neil
f0c09d6e0c Merge "Added test API to refresh the UICC Profile" into pi-dev
am: 3e6ceafbaa

Change-Id: Icde39b92a744653f1fb71165df4dda8362deee8b
2018-04-26 16:36:18 -07:00
Nathan Harold
d4a61663d2 Merge "Use Empty List for Default PhysicalChannelConfig" into pi-dev
am: 6e2ed97e80

Change-Id: I1cb14020b2bd87db143aab9b3401379b560df18b
2018-04-26 16:24:57 -07:00
Gil O'Neil
3e6ceafbaa Merge "Added test API to refresh the UICC Profile" into pi-dev 2018-04-26 23:20:41 +00:00
Brad Ebinger
515021eb2e Clean up old Context references in ImsConfig
Bug: 77941698
Test: Manual
Change-Id: Ieb24830ef60d1bc383639777f8e22d0dc994782a
2018-04-26 14:27:10 -07:00
Nathan Harold
c9bad6ef7a Use Empty List for Default PhysicalChannelConfig
If a caller registers to listen() for a physical
channel config message, the beavior is to immediately
trigger an unsol. In the case that a list hasn't been
sent from the modem, we should send a default empty
list rather than a null. This is the preferred
approach for Android APIs because it reduces the
reliance on null checks by callers.

Bug: 78536847
Test: ¯\_(ツ)_/¯
Change-Id: I9e59195f5d64264ab473b2fd7e4f7eb6446c4829
2018-04-25 18:58:32 -07:00
goneil
f6c6e8efa7 Added test API to refresh the UICC Profile
Bug: 74016670
Test: GTS tests - vendor/xts/gts-tests/hostsidetests/simappdialog
Change-Id: I8f8ffdad8666d523172b035d24b96278d4d1a1ee
2018-04-25 18:19:42 -07:00
Shuo Qian
066e865298 Restore the OEM hook implementation and usage
The current plan is to keep the OEM hook implementation in the 
framework, this is for legacy device and old device upgrading 
(per b/78098059).

For P launching device, the OEM hook service is removed in hal, 
so the OEM hook api in framework should return something dummy, and 
prevent infinite loop to get service, but these parts should be done
in seperate CLs after this restore CL is merged.

This reverts commit cbfa614f60.

Bug: 34344851
Test: pass Treehugger tests; pass cuttlefish test RilE2eTests
Change-Id: I1f2117331a7f846b192c5f956f3841d58cb8154b
2018-04-25 23:34:50 +00:00
Shuo Qian
b686b9cf6d Merge "Revert "Revert "Remove the OEM hook implementation and usage""" 2018-04-25 19:31:54 +00:00
Shuo Qian
f09bde2809 Revert "Revert "Remove the OEM hook implementation and usage""
This reverts commit 00b89515a5.

Change-Id: I61c5d47fabf760bfefe843fb7a31f0a481c94c50

Merged-In: Icb06aea5eb42fd156a967c4d4e39aefc51d91cf4
2018-04-25 01:59:53 +00:00
Jack Yu
e4ba0c554f Merge "Fixed the document of getNetworkCountryIso" am: 8252157aca am: 7f97be01f5
am: 630be57f44

Change-Id: I5060c3bac5e28e02d08e7abce6e0552ee4a02b2e
2018-04-24 17:54:51 -07:00
Jack Yu
630be57f44 Merge "Fixed the document of getNetworkCountryIso" am: 8252157aca
am: 7f97be01f5

Change-Id: I5c8cf44658007f6366d497c09f1cfba10a49da48
2018-04-24 17:43:18 -07:00
Shuo Qian
9766770550 Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev am: c4c7c19b67
am: 2413d7e6f8

Change-Id: I73c49b5497c7144e292deee2dbb766edf5eed46d
2018-04-24 17:22:15 -07:00
Shuo Qian
2413d7e6f8 Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
am: c4c7c19b67

Change-Id: I453a20d444aeaff500b6272fb352494420699557
2018-04-24 17:12:10 -07:00
Shuo Qian
c4c7c19b67 Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev 2018-04-24 23:54:10 +00:00
Robert Greenwalt
cbfa614f60 Revert "Revert "Remove the OEM hook implementation and usage""
This reverts commit 7cfc5cda2f.

Reason for revert: Causes a critical error on Cuttlefish.

Bug: 78299964

Change-Id: Icb06aea5eb42fd156a967c4d4e39aefc51d91cf4
2018-04-24 23:48:26 +00:00
Treehugger Robot
8252157aca Merge "Fixed the document of getNetworkCountryIso" 2018-04-24 23:02:38 +00:00
Treehugger Robot
238eaf5183 Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" 2018-04-24 03:56:40 +00:00
Jayachandran Chinnakkannu
46c98ac737 Merge "Data stall intent definition" into pi-dev am: 88dcad1aa4
am: 4e36322240

Change-Id: I9ff65ea6f7cc6552d3792575cb8c5638d344ea50
2018-04-23 17:24:39 -07:00
Jayachandran Chinnakkannu
4e36322240 Merge "Data stall intent definition" into pi-dev
am: 88dcad1aa4

Change-Id: Id1b549f662e574695c06d58dc533eafaa257eb3c
2018-04-23 17:13:38 -07:00
Jack Yu
78e352f1e2 Fixed the document of getNetworkCountryIso
Test: Build
Bug: 64335394
Change-Id: Ic8fc41380e15a40f9498c990b0074571cdffd018
2018-04-23 13:41:25 -07:00
Jayachandran C
acc1ee9115 Data stall intent definition
Define a protected intent to notify the data stall recovery attempts.

Test: Manual
Bug: 77293796
Change-Id: Ic8dfb12662d53e896f9d0b60329e762ce9460ba6
2018-04-23 13:13:01 -07:00
Jack Yu
79f5b2e78b Merge "Set country code even when device is not registered on network" am: fc9bc10d69
am: ba7001c930

Change-Id: Id8b309a081996af590da42cbc73ded3c2c09b153
2018-04-23 11:28:31 -07:00
Jack Yu
d33f8a1e91 Set country code even when device is not registered on network
Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).

Test: Manual
Bug: 64335394
Merged-In: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
Change-Id: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
(cherry picked from commit ac36896f1a)
2018-04-22 14:19:59 -07:00
Jack Yu
3ebda73095 Merge "Set country code even when device is not registered on network" 2018-04-22 19:21:02 +00:00
Jack Yu
ac36896f1a Set country code even when device is not registered on network
Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).

Test: Manual
Bug: 64335394
Change-Id: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
2018-04-22 01:05:44 -07:00
Jack Yu
dc7701634d Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev am: 8f6568f908
am: 30a65dfb4a

Change-Id: I1b182574b5897e92b43819fb55ff9de0a2bc2f13
2018-04-21 10:42:00 -07:00
Jack Yu
30a65dfb4a Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev
am: 8f6568f908

Change-Id: I1ab715aa93609d653b689ef3570135d03c669cdf
2018-04-21 10:30:58 -07:00
Jack Yu
8f6568f908 Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev 2018-04-21 17:18:52 +00:00