Commit Graph

8981 Commits

Author SHA1 Message Date
Sarah Chin
42d2031cc9 Merge "Update AccessNetworkConstants to uses values from HAL" into rvc-dev 2020-03-06 18:39:05 +00:00
Jack Yu
9dd2585d3f Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" into rvc-dev 2020-03-06 07:51:22 +00:00
Betty Chang
e78a4b2695 Merge "[Telephony Mainline] Rename the method from isCurrentSimOperator to matchesCurrentSimOperator" into rvc-dev 2020-03-06 06:01:38 +00:00
Brad Ebinger
0542580955 Merge "API Review: Define the extras as containing CharSequences, not Strings" into rvc-dev 2020-03-06 05:10:44 +00:00
Brad Ebinger
2fa6a99ee9 API Review: Define the extras as containing CharSequences, not Strings
Test: atest FrameworksTelephonyTests:ImsPhoneTest
Fixes: 150331517
Change-Id: I7c6f4c13e6267a3e643ebae77697ea18ee8cd242
2020-03-06 01:51:48 +00:00
Xiangyu/Malcolm Chen
2f2742cc80 Merge "Remove @ModemCount enum definitions." into rvc-dev 2020-03-06 01:51:03 +00:00
Sarah Chin
07e5274fd0 Update AccessNetworkConstants to uses values from HAL
Test: build
Bug: 150479290
Change-Id: I46034fce8f8f13b555a0cfb05cc5a9f076c7251a
2020-03-05 17:28:45 -08:00
TreeHugger Robot
931e7099e1 Merge "Change javadoc of getSubmitPduEncodedMessage and add IntRange to its parameters" into rvc-dev 2020-03-05 11:33:39 +00:00
TreeHugger Robot
899b5ea52a Merge "Added the high usage hidden APIs back" into rvc-dev 2020-03-05 02:40:34 +00:00
Qiong Liu
c43aef766d 4G+ RAT icon can not be displayed when back to 4G from 4G+
ServiceState#setIsUsingCarrierAggregation() does not work because
it sets current CA status to the copied instance but it does not set
to the original data. As a result, System UI cannot be determined
correctly whether to display the RAT icon as carrier aggregation
or not, the problem occurs.

To resolve the problem, apply the copied instance to the original data
by using addNetworkRegistrationInfo().

Test: manual - Checked that correct RAT icon is displayed according to
rat ratchet behavior.
Bug: 141276200

Merged-In: Ic9a26ff932647b09d8770304c3057b572afaf2a4
Change-Id: Ic9a26ff932647b09d8770304c3057b572afaf2a4
(cherry picked from commit aa5e03121f)
2020-03-04 17:04:41 -08:00
Zongheng Wang
38bb7285a9 Change javadoc of getSubmitPduEncodedMessage and add IntRange to its
parameters

To resolve merge conflict for aosp/1242353. Cherrypick it to rvc-dev since this should be in R.

Bug: 149697039
Test: compile
Change-Id: I5e131f71c376db56d3b7aa835058f0d2f4e8566a
Merged-In: I5e131f71c376db56d3b7aa835058f0d2f4e8566a
(cherry picked from commit 1d2378bd0d)
2020-03-04 23:49:03 +00:00
Jack Yu
ff8275e6b9 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
Change-Id: I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c
2020-03-04 15:31:52 -08:00
Brad Ebinger
cd31f739da Merge "Add new capability polling opt-in intent" into rvc-dev 2020-03-04 18:05:24 +00:00
changbetty
e298d392bc [Telephony Mainline] Rename the method from isCurrentSimOperator to matchesCurrentSimOperator
Bug: 148379435
Test: make
Change-Id: I020aa9c6aca78070f423b946c5b9294d4c2df9c9
2020-03-04 11:56:53 +08:00
Nathan Harold
f7ed9bc589 Merge "Convert getBands() to int[] from List<Integer>" into rvc-dev 2020-03-04 02:03:54 +00:00
Brad Ebinger
0a5a8fe7f4 Add new capability polling opt-in intent
Adds a new capability discovery opt-in intent,
which an application can use to prompt the user
to enable contact discovery.

Bug: 111305845
Test: atest CtsTelephonyTestCases; telecom test app
Change-Id: I42b9d7226a1296bc7e4e86a5ff6448bc8f23d3c0
2020-03-03 17:18:32 -08:00
Radhika Agrawal
4431668e6b Merge "configure the new key KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT to 4000ms for the UE to defer Wifi OFF until IMS is deregistered (b/142750916)" into rvc-dev 2020-03-03 22:50:36 +00:00
radhika
1599ce07f9 configure the new key KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT to 4000ms for the
UE to defer Wifi OFF until IMS is deregistered (b/142750916)

Bug: 148386002
Test: make
Change-Id: I751ffa41fc3b4a1ddfc8b2c79035dc689ff485d0
2020-03-03 21:17:42 +00:00
TreeHugger Robot
42e3933e54 Merge "Revert "Fix permission check for get/setSmscAddress."" into rvc-dev 2020-03-03 20:44:27 +00:00
Amit Mahajan
dec964ceb6 Revert "Fix permission check for get/setSmscAddress."
This reverts commit 05e9720552.

Reason for revert: b/150666039
Bug: 150666039
Change-Id: I67a4ffe94e3caabd04a5b9305de3e476867bfbd1
2020-03-03 19:19:08 +00:00
Jayachandran Chinnakkannu
4a758b479b Merge "Add carrier config to show wifi calling icon in status bar" into rvc-dev 2020-03-03 17:36:57 +00:00
TreeHugger Robot
ca8c810a9d Merge "Split setSystemSelectionChannels" into rvc-dev 2020-03-03 03:18:55 +00:00
TreeHugger Robot
580f82768c Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev 2020-03-03 03:01:27 +00:00
Nishizawa Nobuhiro
7feb6321e9 Add carrier config to show wifi calling icon in status bar
Add a new carrier config to control whether to show wifi calling icon
in status bar.

Test: manual
Bug: 37493651

Change-Id: Ib83bc042f6d95535a09769e5cdea648cc1d501a4
Merged-In: Ib83bc042f6d95535a09769e5cdea648cc1d501a4
2020-03-03 02:57:00 +00:00
Automerger Merge Worker
cc9a1fabf0 Merge "Fix carrier config string typo." into qt-qpr1-dev am: 0b5967db15
Change-Id: Id0ea9a7742628e6128257d2ff0d57a0af4aefcef
2020-03-02 23:32:16 +00:00
Xiangyu/Malcolm Chen
36909b1424 Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." into rvc-dev 2020-03-02 23:13:40 +00:00
Hall Liu
ce7c6850fe Merge "Change default value of ignore RTT setting config" into rvc-dev 2020-03-02 22:21:37 +00:00
Nathan Harold
9d722a0c7f Convert getBands() to int[] from List<Integer>
To conform with API council guidelines, convert the
getBands() function to store and return an array of
int[] rather than a List<Integer> to avoid autoboxing.

Also:
-Add bands to hashCode() and equals() for CellIdentityLte
-Add EARFCN to hashCode() for CellIdentityLte

Bug: 150399894
Test: atest FrameworksTelephonyTests
Change-Id: I7edd5896b48794cd9c291788c28420ce40898f77
2020-03-02 13:56:53 -08:00
Amit Mahajan
fcfd7cf944 Merge "Fix permission check for get/setSmscAddress." into rvc-dev 2020-03-02 21:52:25 +00:00
Jayachandran Chinnakkannu
27f08dad66 Merge "Make getOperatorAlphaLongRaw/getOperatorAlphaShortRaw as public APIs" into rvc-dev 2020-03-02 20:01:34 +00:00
Amit Mahajan
05e9720552 Fix permission check for get/setSmscAddress.
Based on api-council feedback. Incorporated other suggestions too.

Test: basic SMS sanity
Bug: 149236716
Merged-in: I60b300d1b2d4e8b67cfc121e10a7957a8f0aaac8
Change-Id: I60b300d1b2d4e8b67cfc121e10a7957a8f0aaac8
(cherry picked from commit 15a3b86e89)
2020-03-02 19:29:55 +00:00
Sarah Chin
ba6bee9e94 Merge "API Review: rename isGlobalModeEnabled" into rvc-dev 2020-03-02 18:11:27 +00:00
SongFerngWang
53515a0ea6 CellularBatteryStats: Address API council feedback
Bug: 144925883
Test: Build pass, device boots up
atest TelephonyMetricsTest

Change-Id: Iac5904a3397a42aa5f015cb53bb63318f5c377a4
Merged-In: Iac5904a3397a42aa5f015cb53bb63318f5c377a4
(cherry picked from commit 84dc30fede)
2020-03-02 05:15:08 +00:00
Sarah Chin
be776fed5e Merge "API review: setNetworkSelectionModeManual" into rvc-dev 2020-02-29 04:49:13 +00:00
Sarah Chin
1f39ebd9e6 API review: setNetworkSelectionModeManual
Move optional ran parameter to end
Make system -> public API

Test: atest FrameworksTelephonyTests
Bug: 150127236
Change-Id: I140477b2778158646dbbcb0d2a32033c61bb97e4
2020-02-28 15:13:16 -08:00
Xiangyu/Malcolm Chen
8972b83893 Merge "Re-order parameters of setUiccApplicationsEnabled." into rvc-dev 2020-02-28 22:22:26 +00:00
TreeHugger Robot
5f3331df90 Merge "Mark NonNull for canManageSubscription parameters." into rvc-dev 2020-02-28 22:17:28 +00:00
TreeHugger Robot
01f0e8f0c3 Merge "Make createLocationInfoSanitizedCopy as @hide." into rvc-dev 2020-02-28 22:16:45 +00:00
Xiangyu/Malcolm Chen
7d1b787c8a Merge "Print carrier config access rules properly" into rvc-dev 2020-02-28 19:32:31 +00:00
Hall Liu
0eea62595e Split setSystemSelectionChannels
Split method into two parts, one that takes a callback/executor and one
that doesn't.

Fixes: 148866746
Test: atest TelephonyManagerTest#testSetSystemSelectionChannels
Change-Id: Ic5a130e5806b4516caa1a8510214eaf9b2b43b03
2020-02-27 19:15:00 -08:00
Malcolm Chen
9859e1724b Fix carrier config string typo.
Bug: 148611362
Test: build
Change-Id: Idf0c82a9920c62ecdc595973565656ed9ceedff6
2020-02-27 17:11:43 -08:00
Jayachandran C
86c4ed7c78 Make getOperatorAlphaLongRaw/getOperatorAlphaShortRaw as public APIs
This is as per API council feedback

Bug: 147676513
Test: Verified system UI with AT&T SIM
      atest SystemUITests
      atest frameworks/opt/telephony/tests/telephonytests/

Change-Id: Ie000a736831c8cd806a7e53d9fd56e3e3b707a88
2020-02-27 16:56:04 -08:00
Malcolm Chen
f8cda42a52 Print carrier config access rules properly
Bug: 150414859
Test: build and manual - check printed logs
Change-Id: Ic642ef84fdcc7df7887abc7665af4f0b43cd7ff8
Merged-In: Ic642ef84fdcc7df7887abc7665af4f0b43cd7ff8
2020-02-28 00:52:57 +00:00
Nathan Harold
c058cac051 Remove NetworkClass from TelephonyManager
NetworkClass isn't especially useful because the APIs for
getting and setting preferred networks have been converted
to bitmasks of individual RATs.

Removing this because it's causing confusion about the proper
structure of the API surface. There are < 100k total usages with
the vast majority (60% or more) coming from two apps.

Because NetworkClass is used in RadioAccessFamily for a sort of
comparison function, rewrite that function, porting and updating
logic from TelephonyConnectionService to that compare() method.

Bug: 128572818
Test: atest RadioAccessFamilyTest
Merged-In: I1f279fadd8c543b845fce0f13dc62c1480757692
Change-Id: I1f279fadd8c543b845fce0f13dc62c1480757692
(cherry picked from commit d44b4efa33)
2020-02-27 16:08:44 -08:00
Nathan Harold
f4a9445a52 Add Network Preference Bitmaps
To support conversion of the preferred network types
back to the network "class" types (really the RANs),
this change adds bitmaps for 2G, 3G, and 4G bitmaps
as well as for differentiating between 3gpp and 3gpp2
RATs.

Bug: 128572818
Test: manual
Merged-In: I25f41ad48eb4dc74c2cace80ccec4e1e954443f9
Change-Id: I25f41ad48eb4dc74c2cace80ccec4e1e954443f9
(cherry picked from commit febfb82bc8)
2020-02-27 16:07:42 -08:00
Sarah Chin
927caf9ff8 API Review: rename isGlobalModeEnabled
Test: atest FrameworksTelephonyTest
Bug: 148603998
Change-Id: Ia23e47047bb8e79e528ba2e37b8ab67e17af1ec7
2020-02-27 16:01:11 -08:00
Malcolm Chen
f0af4a6995 Re-order parameters of setUiccApplicationsEnabled.
To be consistent with other APIs, based on API council's feedback.

Bug: 148179539
Test: build
Change-Id: I1d4a2bf7dfc01842f583e02517986a8bf043bfde
Merged-In: I1d4a2bf7dfc01842f583e02517986a8bf043bfde
2020-02-27 20:09:32 +00:00
TreeHugger Robot
710401a657 Merge "Hide setPolicyDataEnabled" into rvc-dev 2020-02-26 23:26:17 +00:00
Jack Yu
58979d9557 Merge "Hide API" into rvc-dev 2020-02-26 21:04:56 +00:00
Malcolm Chen
e6befe2efa Remove @ModemCount enum definitions.
Per API council's feedback, they are not needed. Replacing enums
with integers 0, 1, 2, 3.

Bug: 143652732
Test: build
Change-Id: Id9e87ea28a2f31e1aa842424770096e16f1cb208
2020-02-26 20:01:59 +00:00