Commit Graph

3014 Commits

Author SHA1 Message Date
TreeHugger Robot
5ab8ad86f9 Merge "Revert "TelephonyManager System APIs process"" 2018-03-20 19:25:14 +00:00
Amit Mahajan
eadd25ad0e Revert "TelephonyManager System APIs process"
This reverts commit 3b991aee47.

Reason for revert: b/75998747

Bug: 75998747
Change-Id: I4a98388c732249ce2aaf05a57c3a98c15f4bd4b3
2018-03-20 16:15:26 +00:00
Brad Ebinger
6a28430003 Merge "Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" am: 78a7b5d44a am: 4e1563e512" into pi-dev-plus-aosp
am: 48978dd213

Change-Id: Ifc64e5d785a62d61cd8c176a7a3553390956a796
2018-03-20 00:50:24 +00:00
Brad Ebinger
13b82db5c1 Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" am: 78a7b5d44a
am: 4e1563e512

Change-Id: Ic8e24c73cbb9a22236bb153ba290338184504cc3
2018-03-19 22:45:28 +00:00
Treehugger Robot
78a7b5d44a Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing" 2018-03-19 21:04:56 +00:00
sqian
3b991aee47 TelephonyManager System APIs process
- lock down some TelephonyManager APIs with system permission
- deprecate some TelephonyManager APIs due to its equivalents
- introduce an aidl interface that handles the current
getPhoneType() functions

The doc: https://docs.google.com/spreadsheets/d/1OJ6EXJ-Zys21mZ1BHgJeWkcfLq0pPxBR765r46ck80U/edit#gid=0

Bug: 62346128
Test: Compile
Change-Id: I5367372f3304e5ad368d0d4775f6e96168243aa3
2018-03-16 13:45:44 -07:00
Brad Ebinger
22018a8ce7 Add empty CdmaSmsSubaddress to CDMA PDU parsing
We were not providing an empty subaddress when
parsing CDMA PDU, which caused an NPE when receiving
CDMA IMS SMS.

Bug: 73994015
Test: Manual, MT/MO SMS
Change-Id: I07be3ac64341eb9235f6da1b6870ac746188f73a
2018-03-16 11:34:20 -07:00
sqian
503768d07d Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev
am: a97d430aad

Change-Id: I1dac4e925743f016f4fbb11919b4f326082a4db3
2018-03-15 04:55:20 +00:00
sqian
5b65aea4f2 Check AppOps bit for TelephonyManager#getForbiddenPlmns
Bug: 73884967
Test: Telephony Sanity and Compile
Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404
(cherry picked from commit 52102d2868)

Change-Id: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe
2018-03-14 19:32:23 -07:00
Shuo Qian
9e4b300e60 Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" 2018-03-15 01:18:15 +00:00
Pengquan Meng
c6556e7cb6 Merge "Telephony(MSIM): Default NW mode property for each slot" into pi-dev 2018-03-15 01:01:15 +00:00
Sandeep Gutta
2a7c0d377d Telephony(MSIM): Default NW mode property for each slot
For dual SIM devices, add provision to configure different default
Network modes for each slot, using the existing system property to
configure this default network modes.

Bug: 28384694
Test: manual - Checked different default NW mode can be set
for each slot.
Merged-Id: I72b11522cb51a425e28ddc407014387a20cb2cd7
Change-Id: I72b11522cb51a425e28ddc407014387a20cb2cd7
2018-03-14 11:53:04 -07:00
Treehugger Robot
985b17957a Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." 2018-03-14 00:10:12 +00:00
Brad Ebinger
fc1ac6c9a8 Merge "Support Dynamic ImsService Querying" into pi-dev 2018-03-13 20:53:53 +00:00
Brad Ebinger
0fa543f50b Merge "Merge "Remove IMS Emergency Calling availability API" am: 4b10333c26 am: 56b387aaf1" into pi-dev-plus-aosp
am: 4a08f074ed

Change-Id: I76da62c1293d5f06f07fad75c9c5a08fb33316c1
2018-03-13 18:40:00 +00:00
Treehugger Robot
57479b64b7 Merge "Carrier id api rename" 2018-03-13 18:28:50 +00:00
Brad Ebinger
70d93053dc Merge "Remove IMS Emergency Calling availability API" am: 4b10333c26
am: 56b387aaf1

Change-Id: I6b8ba0608c540113ce7303907ec632989c6422bc
2018-03-13 18:10:13 +00:00
Brad Ebinger
9c750fe77f Support Dynamic ImsService Querying
1) Provide a "default" impl for MmTelFeature
instead of returning null.

2) Introduce a FeatureSlotPair, which maps a SIM
slot ID to a ImsFeature. This allows the ImsService
to provide which features it supports for multi-SIM
phones.

3) Pipe through ImsResolver state to help prevent IMS
operation when the ImsResolver is in the process of
figuring out feature capabilities.

Test: Telephony ImsService test app, telephony unit tests
Bug: 72642524

Merged-In: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
Change-Id: Idb95f7651af200026d62e8b29eaed30bc0ebc9d3
2018-03-13 11:06:38 -07:00
TreeHugger Robot
1774a14d88 Merge "Migrate from config.xml to SystemConfig for disabled carrier apps" 2018-03-13 17:19:35 +00:00
Brad Ebinger
4b10333c26 Merge "Remove IMS Emergency Calling availability API" 2018-03-13 16:30:45 +00:00
fionaxu
2a09217315 Carrier id api rename
Rename getAndroidCarrierIdForSubscription to getSimCarrierId.
Drop prefix "Android" as Android is implicit everywhere.

Rename carrierName to CarrierIdName to imply correlation between
these two APIs. This also helps to differentiate from another API
getSimOperatorName.

Bug: 71584605
Test: build
Change-Id: Iba4b1c21522741b8c11836a4c39004064736b4c6
(cherry picked from commit c8d483e488)
Merged-in: Iba4b1c21522741b8c11836a4c39004064736b4c6
2018-03-13 04:43:15 +00:00
Brad Ebinger
c8f825e47d Merge "Merge "Support Dynamic ImsService Querying" am: 6fc1a2f0d4 am: 5984254b27" into pi-dev-plus-aosp
am: d0a12f3cff

Change-Id: Ia78917a294b38e7ec21f1f5a986ebd12383fb79e
2018-03-13 03:58:37 +00:00
Chen Xu
9726591d6b Merge "Carrier id api rename" into pi-dev am: f78767d2f9
am: d877fdb2b1

Change-Id: I8e2b41d623f7b213cff5e4f7d57977630294fc9d
2018-03-13 02:25:20 +00:00
Jeff Davidson
da308b62ca Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." into pi-dev
am: bccb356c70

Change-Id: I08f434646119a02ec4a37f71a9484fa561c327bd
2018-03-13 02:03:22 +00:00
Jeff Davidson
e652cb1736 Allow carrier privileged apps to access Telephony/Subscription APIs.
-All public APIs in TelephonyManager which require READ_PHONE_STATE
will now also be documented to accept carrier privileged callers as
well. (One exception is the change callbacks in each, which will be
addressed in a separate CL).

-For SubscriptionManager, callers without READ_PHONE_STATE will now be
able to access the subscription list; however, the resulting list will
be filtered to only include subscriptions for which the caller has
carrier privileges.

-All @see references to hasCarrierPrivileges have been removed in
favor of an inline {@link}. The @see section is set apart from the
rest of the Javadoc and thus appears out of context of where it's
actually relevant; moreover, it is often placed in the middle of a
line which makes it invalid. Using {@link} inlines the reference where
it's actually relevant.

-@SuppressAutodoc is added to any public method which has a
@RequiresPermission declaration that isn't a sufficient description of
the allowed callers, i.e. for APIs which accept carrier-privileged
callers, or the default dialer app or other exceptional cases. This
ensures redundant (but incorrect) requires permission declarations
aren't autogenerated.

Bug: 70041899
Test: TreeHugger, unit tests in topic
Change-Id: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
Merged-In: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
(cherry picked from commit bc10ce1efe)
2018-03-12 18:48:03 -07:00
TreeHugger Robot
bccb356c70 Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." into pi-dev 2018-03-13 01:41:35 +00:00
Brad Ebinger
b4c270331a Merge "Support Dynamic ImsService Querying" am: 6fc1a2f0d4
am: 5984254b27

Change-Id: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
2018-03-13 01:08:18 +00:00
Jordan Liu
b878152bc8 Merge "Merge "Remove getDefaultSim hidden api" am: fdf4dd7928 am: 083986303a" into pi-dev-plus-aosp
am: 45731c52d9

Change-Id: Id9d413a15cdf9d6160ebc0316f9bca1630de5473
2018-03-13 01:03:13 +00:00
Chen Xu
d877fdb2b1 Merge "Carrier id api rename" into pi-dev
am: f78767d2f9

Change-Id: If619579e7c3bba865754b07909bc8864efd6c78b
2018-03-13 00:20:17 +00:00
Jordan Liu
18216a95b3 Merge "Remove getDefaultSim hidden api" am: fdf4dd7928
am: 083986303a

Change-Id: Ib638d1a7002e24f53150c505aee359cf062ddfdd
2018-03-12 23:07:23 +00:00
Brad Ebinger
6fc1a2f0d4 Merge "Support Dynamic ImsService Querying" 2018-03-12 22:53:47 +00:00
Chen Xu
f78767d2f9 Merge "Carrier id api rename" into pi-dev 2018-03-12 22:49:21 +00:00
Pengquan Meng
7bf5484c21 Merge "Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675 am: 5eb85f01d2 am: 037206683b" into pi-dev am: b710e91bac
am: ce50f4a986

Change-Id: I1720767ef98714749c08afcc8991e90e873bb4ed
2018-03-10 09:05:52 +00:00
Pengquan Meng
ce50f4a986 Merge "Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675 am: 5eb85f01d2 am: 037206683b" into pi-dev
am: b710e91bac

Change-Id: I5510d16aea61e69bd3ca9b8e0920bddb30e62742
2018-03-10 04:40:28 +00:00
Pengquan Meng
847734cc67 Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675 am: 5eb85f01d2
am: 037206683b

Change-Id: If981740986af74936a82d496eab591d8009e3613
2018-03-10 01:14:11 +00:00
Pengquan Meng
037206683b Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c4675
am: 5eb85f01d2

Change-Id: Iaf8ea26f3739a5c62ce6bb402ae8161ef99b5f80
2018-03-10 00:44:41 +00:00
Pengquan Meng
5eb85f01d2 Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev
am: fe6a5c4675

Change-Id: I4440e9b50e975ea3a20ecd216b83deb83afe2780
2018-03-10 00:20:21 +00:00
Jordan Liu
a65ddc98b0 Remove getDefaultSim hidden api
It just returns 0 and is misleading, as sim id is not really a thing.

Bug: 74450373
Test: manual
Change-Id: I90bd1bf06e5318c31798bf3d216c558db3922441
2018-03-09 16:08:21 -08:00
Jeff Davidson
3c0415aeb8 Allow carrier privileged apps to access Telephony/Subscription APIs.
-All public APIs in TelephonyManager which require READ_PHONE_STATE
will now also be documented to accept carrier privileged callers as
well. (One exception is the change callbacks in each, which will be
addressed in a separate CL).

-For SubscriptionManager, callers without READ_PHONE_STATE will now be
able to access the subscription list; however, the resulting list will
be filtered to only include subscriptions for which the caller has
carrier privileges.

-All @see references to hasCarrierPrivileges have been removed in
favor of an inline {@link}. The @see section is set apart from the
rest of the Javadoc and thus appears out of context of where it's
actually relevant; moreover, it is often placed in the middle of a
line which makes it invalid. Using {@link} inlines the reference where
it's actually relevant.

-@SuppressAutodoc is added to any public method which has a
@RequiresPermission declaration that isn't a sufficient description of
the allowed callers, i.e. for APIs which accept carrier-privileged
callers, or the default dialer app or other exceptional cases. This
ensures redundant (but incorrect) requires permission declarations
aren't autogenerated.

Bug: 70041899
Test: TreeHugger, unit tests in topic
Change-Id: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
Merged-In: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
(cherry picked from commit bc10ce1efe)
2018-03-09 20:27:43 +00:00
Jeff Davidson
bc10ce1efe Allow carrier privileged apps to access Telephony/Subscription APIs.
-All public APIs in TelephonyManager which require READ_PHONE_STATE
will now also be documented to accept carrier privileged callers as
well. (One exception is the change callbacks in each, which will be
addressed in a separate CL).

-For SubscriptionManager, callers without READ_PHONE_STATE will now be
able to access the subscription list; however, the resulting list will
be filtered to only include subscriptions for which the caller has
carrier privileges.

-All @see references to hasCarrierPrivileges have been removed in
favor of an inline {@link}. The @see section is set apart from the
rest of the Javadoc and thus appears out of context of where it's
actually relevant; moreover, it is often placed in the middle of a
line which makes it invalid. Using {@link} inlines the reference where
it's actually relevant.

-@SuppressAutodoc is added to any public method which has a
@RequiresPermission declaration that isn't a sufficient description of
the allowed callers, i.e. for APIs which accept carrier-privileged
callers, or the default dialer app or other exceptional cases. This
ensures redundant (but incorrect) requires permission declarations
aren't autogenerated.

Bug: 70041899
Test: TreeHugger, unit tests in topic
Change-Id: Ia5cc145c19d99fe2b87e3425bb95281980edef6f
2018-03-09 09:48:58 -08:00
Android Build Merger (Role)
90000baf89 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb am: f64ab1e93d
Change-Id: I8fc1082b7c6c64cf105246fe374260f72e83a7a8
2018-03-09 04:19:32 +00:00
Android Build Merger (Role)
f64ab1e93d [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea am: bd60a681bf am: 5d5e5ca7cb
Change-Id: I3bd9d6f3d290ae125d57a4650b41b8ff6cbb5591
2018-03-09 04:19:26 +00:00
Android Build Merger (Role)
bd60a681bf [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0 am: 3276de21ea
Change-Id: Ic702e9da64dc5aa8e66db22d72f070140c40bdf6
2018-03-09 04:19:16 +00:00
Android Build Merger (Role)
3276de21ea [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
Change-Id: I9206a21355732e408430ceae77d3095793a04072
2018-03-09 04:19:11 +00:00
Android Build Merger (Role)
a61fe8f6c0 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2
2018-03-09 04:19:00 +00:00
Android Build Merger (Role)
3b356d5111 [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
Change-Id: I03d75f7b837fdeafabcf64a8d56e1b1f7af89050
2018-03-09 04:18:55 +00:00
Android Build Merger (Role)
61f84448eb [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
Change-Id: Ic9cf5392057bfb47945e9a1b06abb19697468610
2018-03-09 04:18:45 +00:00
Pengquan Meng
8c55a70728 Fixed Security Vulnerability of DcParamObject
The writeToParcel and readFromParcel is not symmetry, fixed it.

Test: no test
Bug: 70721937
Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395
2018-03-09 04:18:36 +00:00
Brad Ebinger
2e665a98b3 Remove IMS Emergency Calling availability API
Moving to an async update model for updating
IMS emergency calling availability, so this
API is unneeded.

Bug: 74389647
Test: Telephony ImsService testapp
Change-Id: Ib7b7dc5b1438f038b370ae9faf152fb15ed4acd5
2018-03-08 16:21:42 -08:00
fionaxu
c8d483e488 Carrier id api rename
Rename getAndroidCarrierIdForSubscription to getSimCarrierId.
Drop prefix "Android" as Android is implicit everywhere.

Rename carrierName to CarrierIdName to imply correlation between
these two APIs. This also helps to differentiate from another API
getSimOperatorName.

Bug: 71584605
Test: build
Change-Id: Iba4b1c21522741b8c11836a4c39004064736b4c6
2018-03-08 15:43:28 -08:00