Commit Graph

9383 Commits

Author SHA1 Message Date
Michael Groover
8750e08f48 Merge "Update SubInfo#getNumber docs to reflect permission requirement" into rvc-dev am: c55df5a4df
Change-Id: Ie759288ec8ae6975d10ad8ea0af344cf475ddb30
2020-03-24 16:32:18 +00:00
Michael Groover
c55df5a4df Merge "Update SubInfo#getNumber docs to reflect permission requirement" into rvc-dev 2020-03-24 16:26:34 +00:00
TreeHugger Robot
f8d6165956 Merge "Add unit test for ClosedSubscriberGroupInfo" into rvc-dev am: 4f53d72e52
Change-Id: I684d2a8078eb7467003998a663a6f497e4b1b8bf
2020-03-23 22:03:30 +00:00
TreeHugger Robot
4f53d72e52 Merge "Add unit test for ClosedSubscriberGroupInfo" into rvc-dev 2020-03-23 21:50:07 +00:00
Michael Groover
52625d0adc Merge "Add method to clear out SubscriptionInfo#getCardString" into rvc-dev am: 6d4c98513b
Change-Id: Ifc9b808cbc57ac1c1ac7dbf93d748747abd0b9ed
2020-03-23 21:41:24 +00:00
Michael Groover
6d4c98513b Merge "Add method to clear out SubscriptionInfo#getCardString" into rvc-dev 2020-03-23 21:31:42 +00:00
TreeHugger Robot
53a6f8ee27 Merge "Un-expose APIs added for telephony mainline." into rvc-dev am: 9a58d5747a
Change-Id: Ifcbd5d770d9eb53208c65e10d12a18edf3c20009
2020-03-21 21:26:40 +00:00
TreeHugger Robot
9a58d5747a Merge "Un-expose APIs added for telephony mainline." into rvc-dev 2020-03-21 21:17:33 +00:00
TreeHugger Robot
e83559865d Merge "[Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer" into rvc-dev am: 4e4fa985c1
Change-Id: Ie84f2a81916e9e9d889ecce8e18216d28158ed6f
2020-03-21 05:09:15 +00:00
TreeHugger Robot
4e4fa985c1 Merge "[Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer" into rvc-dev 2020-03-21 05:05:27 +00:00
Michael Groover
77d7d6f76d Update SubInfo#getNumber docs to reflect permission requirement
getLine1Number has been moved out of the READ_PHONE_STATE permission,
but callers with READ_PHONE_STATE can still query SubscriptionInfo
which contains the number for the subscription. The number will be
sanitized from the resulting SubscriptionInfo object(s); this change
updates the docs to reflect the new READ_PHONE_NUMBERS permission
requirement.

Bug: 152063877
Test: atest SubscriptionControllerTest
Change-Id: If4834ad0f648556207ad9b848fc4db332993a6d6
2020-03-20 21:16:12 -07:00
TreeHugger Robot
e61748aa59 Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev am: 7840df3d27
Change-Id: Ia5e0d3fb7720d5cae34d95873366a466b01a06d7
2020-03-21 02:48:26 +00:00
TreeHugger Robot
7840df3d27 Merge "Exposing TelephonyManager.isIccLockEnabled as a system API." into rvc-dev 2020-03-21 02:47:36 +00:00
Philip P. Moltmann
98ddf9d4df Merge "Pipe through attributeTag for one SMS permission check" into rvc-dev am: 18122752c0
Change-Id: I956e2ab4782560ef054072a7da29de28e35b5615
2020-03-21 01:50:30 +00:00
Philip P. Moltmann
18122752c0 Merge "Pipe through attributeTag for one SMS permission check" into rvc-dev 2020-03-21 01:48:48 +00:00
Peter Wang
23cf98eaa8 [Telephony Mainline] Hide TelephonyServiceManager and TelephonyFrameworkInitializer
Bug: 151455139
Fix: 151455139
Test: Build
Change-Id: I067c821239585d3d4e8dcf39798b1d0014ba077b
2020-03-20 17:34:49 -07:00
Amit Mahajan
4009110b3b Un-expose APIs added for telephony mainline.
Will be reworked on in R.

Test: basic sanity
Bug: 140908357
Change-Id: Ib18b66c9351b0434d7c46e004cd162928d7133f7
2020-03-21 00:21:48 +00:00
TreeHugger Robot
ef4fc7bcdc Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev am: 98f6a63baa
Change-Id: Ib68ea1fde39cfb8922c1dc43837a5fa55bd7a2b5
2020-03-20 23:23:31 +00:00
TreeHugger Robot
98f6a63baa Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev 2020-03-20 23:19:53 +00:00
Amit Mahajan
1c6679a3ad Exposing TelephonyManager.isIccLockEnabled as a system API.
This was recently removed as part of un-exposing telephony
mainline related APIs (b/146983487), but being added back in R as GMSCore
already uses it (b/151742706).

Test: TH
Bug: 151742706
Bug: 146983487
Change-Id: If4e8e87c7dfbb261ee3abfec2a4774980c24d0c2
2020-03-20 14:39:06 -07:00
Sarah Chin
5da5d0e3a4 Merge "Fix NPE in updateNrState" into rvc-dev am: 7bc7f92228
Change-Id: I76a35a26a66867d8b3b4debb95281508cec3fa6c
2020-03-20 20:56:34 +00:00
Sarah Chin
7bc7f92228 Merge "Fix NPE in updateNrState" into rvc-dev 2020-03-20 20:50:36 +00:00
Michael Groover
a953322575 Add method to clear out SubscriptionInfo#getCardString
In Androird 10 access to device identifiers was limited to apps with
the READ_PRIVILEGED_PHONE_STATE permission, carrier privileges, the
READ_DEVICE_IDENTIFIERS appop set to allow, or those that pass a
device / profile owner check. TelephonyManager#getSimSerialNumber
was guarded behind these new access requirements, but the same value
is still accessible as the cardString from the SubscriptionInfo.
While getCardString is a hidden API SubscriptionInfo#toString can
be used to obtain this value.

Bug: 152057778
Test: atest SubscriptionControllerTest
Change-Id: I9b8786a321b1ba79d81b74c3041589f30df8e9c8
2020-03-20 13:13:36 -07:00
Sarah Chin
ddda610634 Merge "Update watchdog value" into rvc-dev am: 19dc0a5d62
Change-Id: I50eeb9e190291369d2e8eb185647953fa59457fc
2020-03-20 19:54:37 +00:00
Sarah Chin
19dc0a5d62 Merge "Update watchdog value" into rvc-dev 2020-03-20 19:40:21 +00:00
Sarah Chin
491ad0510f Fix NPE in updateNrState
Test: build
Bug: 151837748
Change-Id: Ia05cb6b43a79524501821467c510f595f7a64ebe
2020-03-20 11:16:55 -07:00
Philip P. Moltmann
830833053d Pipe through attributeTag for one SMS permission check
Bug: 136595429
Test: TH
Change-Id: I346ac2d3acad0e0d18b298f89f0b96324fc52333
2020-03-20 10:46:07 -07:00
Betty Chang
e9a7b4dae3 Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev am: 52a836d49c
Change-Id: Ieef9f041cef5cdd1bb7b7513ed821ab2e933e2e9
2020-03-20 15:51:56 +00:00
Betty Chang
52a836d49c Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev 2020-03-20 15:46:42 +00:00
Rambo Wang
e0c4e40512 Add unit test for ClosedSubscriberGroupInfo
Compare homeNodebName based on values instead of references.

Bug: 151976726
Test: atest ClosedSubscriberGroupInfoTest
Change-Id: I15557e673c8b6842a6fc28b6ea814323652a00b8
2020-03-20 06:40:04 -07:00
Xiangyu/Malcolm Chen
084cc76721 Merge "Fix bug that getBaseBandVersion() may write the value incorrectly." into rvc-dev am: b7efa56055
Change-Id: If68d22e99a2d5c759e086d29668768e65dd0e0ca
2020-03-20 06:14:55 +00:00
Xiangyu/Malcolm Chen
b7efa56055 Merge "Fix bug that getBaseBandVersion() may write the value incorrectly." into rvc-dev 2020-03-20 06:12:43 +00:00
Sarah Chin
e2642adac5 Update watchdog value
Test: build
Bug: 149759312
Change-Id: I9e4bdb3a5dd9c6b476540f3c90304657986e17c3
2020-03-19 21:13:31 -07:00
Betty Chang
98c0acf832 Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev am: 4ce79c63de
Change-Id: I4e85c63c89bcf9d757b66888b27463f007adfc3d
2020-03-20 04:09:08 +00:00
Philip P. Moltmann
4c3645cc8d resolve merge conflicts of 0b6c81800f to rvc-dev-plus-aosp
Change-Id: Ie13012e51d5846335169fdad979b9e92bc0ba920
Exempt-From-Owner-Approval: merge
2020-03-20 03:01:12 +00:00
Betty Chang
4ce79c63de Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev 2020-03-20 02:30:50 +00:00
Betty Chang
e40c8c3b29 Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."
Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."

Revert submission 10702401-revert-10665971-TML_revertSystemApi-ZNISIHWMFP

Reason for revert: Fixing build by make framework-telephony-stubs-srcs-update-current-api (new txt file has been added for telephony)
Reverted Changes:
I5a320c062:Revert "[Telephony Mainline] To mark @hide for mai...
I0e762e0dd:Revert "[Telephony Mainline] To mark @hide for mai...

Test: make
Bug:151896160

Change-Id: I6f22488aca8f2059d9fb4be48116edc52856a393
2020-03-20 10:13:35 +08:00
TreeHugger Robot
0b6c81800f Merge changes from topic "sms-attributeTag-rvc-dev" into rvc-dev
* changes:
  Set attribution tag in TelephonyManager#sendVisualVoicemailSmsForSubscriber
  Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4 am: 6094f4258e am: 7fd121e139 am: b54512bca9
2020-03-20 02:09:28 +00:00
Sarah Chin
a726d3b1e7 Merge "Add response and indication for CellInfo" into rvc-dev am: 11001c05ce
Change-Id: I77510e7b4b9b20131d4316866ddb976e57ed8eb4
2020-03-20 01:29:21 +00:00
Sarah Chin
11001c05ce Merge "Add response and indication for CellInfo" into rvc-dev 2020-03-20 01:27:45 +00:00
Malcolm Chen
629f9111f7 Hide APIs exposed for Telephony mainline which is no longer needed in R.
The APIs were added in b/144351078, b/148097978 and b/148116922.
b/151665796 is used to revert them.

Bug: 151665796
Bug: 144351078
Bug: 148097978
Bug: 148116922
Test: build
Change-Id: I08db8c5c0161747a7e775a8de0daa7077b513f10
2020-03-20 01:25:45 +00:00
Philip P. Moltmann
d04383e033 Set attribution tag in TelephonyManager#sendVisualVoicemailSmsForSubscriber
Bug: 136595429
Test: TH
Change-Id: Ifceab355a24d67daa17d3d97a6abd9bb71569a0f
2020-03-19 16:21:26 -07:00
Philip P. Moltmann
f35af1fc36 Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4 am: 6094f4258e am: 7fd121e139 am: b54512bca9
Bug: 136595429
Change-Id: I60bc87fac0070e6d3a749ae5fc8346d9f4f55da8
(cherry picked from commit 24b15eef74)
2020-03-19 16:19:49 -07:00
Malcolm Chen
2bdc9c1fc9 Fix bug that getBaseBandVersion() may write the value incorrectly.
getBaseBandVersion tries to get value from a legacy API and rewrites it
back. However the read value is the full list but the write is to a
specific phone, causing the list to grow unexpectedly.

Bug: 149342541
Test: manual - using test app, call API and check result.
Change-Id: I78b0443c5e38a30010796fcb69f01a8c7ebaf160
2020-03-19 15:50:44 -07:00
TreeHugger Robot
5825be9711 Merge "Fixed the doc" into rvc-dev am: 65b857a25c
Change-Id: Icf1e76eff018c39ebd3b904b325c31564d1c28ed
2020-03-19 22:50:08 +00:00
TreeHugger Robot
65b857a25c Merge "Fixed the doc" into rvc-dev 2020-03-19 22:48:12 +00:00
Nathan Harold
232ed93352 Merge "Remove FIXME that getApnSetting should be NonNull" into rvc-dev am: 055ebf2d33
Change-Id: Idc581fd0c4507fdf4c61cd77fb1577ee25e3412b
2020-03-19 22:20:48 +00:00
Radhika Agrawal
947f13819c Merge "API review comments Test: make Bug: b/150126235" into rvc-dev am: 66a3e59965
Change-Id: Ief935d1b600da731b0a97d4bec42fd46b835a71c
2020-03-19 22:20:01 +00:00
Nathan Harold
055ebf2d33 Merge "Remove FIXME that getApnSetting should be NonNull" into rvc-dev 2020-03-19 22:19:45 +00:00
Hall Liu
41d248b927 Merge "Ims: Add <RETRY_CALL_FAIL_REASON> and <RETRY_CALL_FAIL_NETWORK> extras" into rvc-dev 2020-03-19 22:18:11 +00:00