Commit Graph

9755 Commits

Author SHA1 Message Date
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
Sarah Chin
3986bb5040 Merge "Update AccessNetworkConstants to uses values from HAL" 2020-03-20 04:04:12 +00:00
Sarah Chin
7b53d011cb Unexpose unnecessary SysUI APIs
These APIs were exposed for mainline since they were used in SysUI code,
but the logic that was using them was moved to Telephony. Unexposing the
APIs since they no longer need to be exposed.

Test: atest FrameworksTelephonyTests
Bug: 147447171
Bug: 111498835
Bug: 149874525
Change-Id: I1930977c5345c075773d18db4eb05913038d7e7f
Merged-In: I1930977c5345c075773d18db4eb05913038d7e7f
2020-03-19 20:40:30 -07:00
Sarah Chin
872d287af1 Unexpose getDataRoamingFromRegistration API
Test: build
Bug: 148604865
Change-Id: I695645418d2babc1eb524a29b2054c1cd8f74da3
Merged-In: I695645418d2babc1eb524a29b2054c1cd8f74da3
2020-03-19 20:29:04 -07: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
2b99e5fcfa API Review: rename isGlobalModeEnabled
Test: atest FrameworksTelephonyTest
Bug: 148603998
Change-Id: Ia23e47047bb8e79e528ba2e37b8ab67e17af1ec7
Merged-In: Ia23e47047bb8e79e528ba2e37b8ab67e17af1ec7
2020-03-19 19:02:31 -07:00
Sarah Chin
35554486b7 Update AccessNetworkConstants to uses values from HAL
Test: build
Bug: 150479290
Change-Id: I46034fce8f8f13b555a0cfb05cc5a9f076c7251a
Merged-In: I46034fce8f8f13b555a0cfb05cc5a9f076c7251a
2020-03-19 18:47:44 -07:00
Sarah Chin
c0a1448ac8 Add response and indication for CellInfo
cellInfoList_1_5
getCellInfoListResponse_1_5
networkScanResult_1_5

Test: atest RILTest
Bug: 151774189
Change-Id: I1ba01eb97f13f843fd27b65d4a2b1049e97ead71
Merged-In: I1ba01eb97f13f843fd27b65d4a2b1049e97ead71
2020-03-19 18:38:14 -07: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
b36bcc882a Pipe through attributeTag for one SMS permission check
Bug: 136595429
Test: TH
Change-Id: I99635efd0da5e72c3df9c6383779a059bbe3c1d1
Merged-In: I346ac2d3acad0e0d18b298f89f0b96324fc52333
2020-03-20 00:28:09 +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
Peter Wang
0ddf44070b [API Review] APIs in SubscriptionManager
Bug: 146362772
Bug: 148180034
Test: atest SubscriptionControllerTest, TelephonyDatabaseHelperTest, TelephonyProviderTest
Change-Id: I77cad8f828ac38976355b7a5f3e8d757b73694ca
Merged-In: I77cad8f828ac38976355b7a5f3e8d757b73694ca
2020-03-19 16:06:52 -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
Radhika Agrawal
66a3e59965 Merge "API review comments Test: make Bug: b/150126235" into rvc-dev 2020-03-19 22:09:23 +00:00
Sarah Chin
41b0dcc47c Add response and indication for CellInfo
cellInfoList_1_5
getCellInfoListResponse_1_5
networkScanResult_1_5

Test: atest RILTest
Bug: 151774189
Change-Id: I1ba01eb97f13f843fd27b65d4a2b1049e97ead71
2020-03-19 13:49:02 -07:00
Automerger Merge Worker
5d33fc5199 Merge "Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" into rvc-dev am: d9773f2ca6" into rvc-dev-plus-aosp 2020-03-19 20:29:55 +00:00
Peter Wang
c69bb089ef Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" into rvc-dev am: d9773f2ca6
Change-Id: I6e74ab1f1e5793fb277229694e115496203bfcef
2020-03-19 20:29:37 +00:00
Philip P. Moltmann
6094f4258e Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4
Change-Id: Ia7e265f35b45702b87a6776beb970a19b5d6665d
2020-03-19 20:29:30 +00:00
Peter Wang
74d9a49dc2 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 77bdf2a0c0
Change-Id: Ie16e6e7dad69373cdeed109e64d275e8e89fb88d
2020-03-19 20:16:15 +00:00
Peter Wang
d9773f2ca6 Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" into rvc-dev 2020-03-19 20:12:38 +00:00
Peter Wang
77bdf2a0c0 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev 2020-03-19 20:07:38 +00:00
Philip P. Moltmann
9ed7e7f1b1 Merge "Pipe through attributeTag for one self-permission check" 2020-03-19 19:41:17 +00:00
Jack Yu
f371c5792c Fixed the doc
Bug: 36956666
Test: Build
Change-Id: Ie5c3f527a0cb6045c353442db7fd66fa98088383
2020-03-19 12:40:12 -07:00
Peter Wang
2f0fdaf477 Merge "[Telephony Mainline] Hide notifyUserActivity API in R" into rvc-dev am: bcb1f3dbb0
Change-Id: I4b5f3d727a6524c206ceb4d6f1db6303391f62f1
2020-03-19 19:26:53 +00:00
Peter Wang
bcb1f3dbb0 Merge "[Telephony Mainline] Hide notifyUserActivity API in R" into rvc-dev 2020-03-19 19:21:29 +00:00
Nathan Harold
4005f21d68 Remove FIXME that getApnSetting should be NonNull
API Council has asked that I remove a comment suggesting that
this API be NonNull. While in theory, we should be able to
make this NonNull in the future, the tooling doesn't work in a
way that makes such a change beneficial.

Bug: 151928851
Test: compilation (comment-only change)
Change-Id: Ifd80f2859e4a090225aab1b3a483325d654a2412
2020-03-19 11:59:56 -07:00
radhika
96eff34a0a API review comments
Test: make
Bug: b/150126235

Change-Id: I2f474bb978dccb939bb17a190447253dcd61cff9
2020-03-19 11:22:12 -07:00
Jack Yu
63fcb9b978 Hide API
Hide API that is only used by telephony registry.

Test: Telephony sanity tests
Bug: 149850449
Merged-In: Ie4c46de336097fb7231291f15048329aea0b639c
Change-Id: Ie4c46de336097fb7231291f15048329aea0b639c
(cherry picked from commit f0df0ba2ba)
2020-03-19 10:27:36 -07:00
Xin Li
3f0bfe4608 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I62d3293f617f630d3d2a3d5f67b764bf272769bf
2020-03-19 10:10:35 -07:00
TreeHugger Robot
9b522632ac Merge "Renamed DisplayInfo to TelephonyDisplayInfo" into rvc-dev am: 0e56c85768
Change-Id: I07f7f0c4aae67577faa5070275ac6ebb162724d7
2020-03-19 14:44:50 +00:00
TreeHugger Robot
0e56c85768 Merge "Renamed DisplayInfo to TelephonyDisplayInfo" into rvc-dev 2020-03-19 14:29:24 +00:00
changbetty
f68a8b0e26 [Telephony Mainline] To mark @hide for mainline module reverting
SubscriptionManager
      - setIconTint
      - setDisplayName
    TelephonyManager
      - setAlwaysAllowMmsData

Bug: 146309719
Test: make
Change-Id: I1f457c0df1682b99d75958c5b71a51d1a419bf8a
2020-03-19 20:33:14 +08:00
Peter Wang
5bc1744d57 [Telephony Mainline] Hide notifyUserActivity API in R
Bug: 151076594
Fix: 151076594
Test: Build
Change-Id: I93fef90456c724d17559f8a2188ba85e26f7835c
2020-03-18 22:18:20 -07:00
Jack Yu
49a35718f8 Added bands from HAL 1.5
Test: Manual
Merged-In: Ib155ee5c2f660c8866a7be91e7f62a8c90e78d8e
Change-Id: Ib155ee5c2f660c8866a7be91e7f62a8c90e78d8e
Fix: 149475773
(cherry picked from commit 16e5d2a0f3)
2020-03-18 22:17:04 -07:00
Nathan Harold
a4e79e3d41 Convert getAdditionalPlmns to return a Set
Set support is a little weird in Java and Android.
Java doesn't support ArraySet, but Android does; Parcel
has both read/write for ArraySet, but they are @hide. Thus,
my options were limited to:
-use the hidden parcel methods
-convert between list and set in the constructor and parcel code
-convert between list and set in the getter
-maintain parallel data structures.

Using the hidden methods seemed cleanest. Since they are
@UnsupportedAppUsage they can't be credibly removed.

In addition, the HAL code doesn't understand Set<> only List<> so
I was faced with the choice of having 2 constructors or using
Collection<>, which actually works just fine and avoids changing
a hundred or so unit tests with no ill effect.

Bug: 149476549
Test: atest FrameworksTelephonyTests
Test: (cts) atest CellInfoTest
Merged-In: I9dfa5f59512f3d1305187cc383c4069ceaaf27fd
Change-Id: I9dfa5f59512f3d1305187cc383c4069ceaaf27fd
(cherry picked from commit 5522de1af3)
2020-03-18 22:05:36 -07:00
Jack Yu
7a5e98e131 Added the high usage hidden APIs back
Added the high usage hidden APIs back for Q or older
apps. Apps built on R SDK should use the new API
getNetworkCountryIso(int).

Test: Build
Bug: 150368215
Merged-In: I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c
Change-Id: I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c
(cherry picked from commit ff8275e6b9)
2020-03-18 21:51:21 -07:00