Commit Graph

11184 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
aafea7546b Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." 2020-03-13 18:18:48 +00:00
Treehugger Robot
cbfaae4f0c Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis" 2020-03-13 14:04:40 +00:00
Rambo Wang
88d585becf Merge "CellularDataService: mCallbackMap is not thread safe" 2020-03-13 05:06:05 +00:00
SongFerng Wang
8b3f684395 Merge "[Mainline] Add @hide. Revisit and redesign in S" 2020-03-13 04:22:33 +00:00
Malcolm Chen
55d7950641 Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED.
According to API council review.

Bug: 142715546
Test: build
Change-Id: I7c95b175865986901cf50e21b39a35df60ada83e
Merged-In: I7c95b175865986901cf50e21b39a35df60ada83e
2020-03-13 04:16:47 +00:00
Treehugger Robot
247ae0dc5c Merge "5G icon default changed" 2020-03-13 00:55:37 +00:00
Xiangyu/Malcolm Chen
ae4ad59cb6 Merge "Mark NonNull for canManageSubscription parameters." 2020-03-12 23:37:39 +00:00
Daniel Bright
47bc635f5c Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis
Removing api status to several apis created during telephony mainline in R.

Bug: 147465477
Bug: 151335267
Test: make
Merged-In: I6d394fae478ef62769147beaeb944771a67aca70
Change-Id: I6d394fae478ef62769147beaeb944771a67aca70
2020-03-12 15:14:28 -07:00
Malcolm Chen
0afb16480d Print carrier config access rules properly
Test: build and manual - check printed logs
Change-Id: Ic642ef84fdcc7df7887abc7665af4f0b43cd7ff8
Merged-In: Ic642ef84fdcc7df7887abc7665af4f0b43cd7ff8
2020-03-12 21:08:51 +00:00
Brad Ebinger
30537f3d7d Merge "API Fix: Remove 200 from PUBLISH_STATE_OK" 2020-03-12 20:45:49 +00:00
Brad Ebinger
3db71c48d6 API Fix: Remove 200 from PUBLISH_STATE_OK
Test: atest CtsTelephonyTestCases; manual
Fixes: 151172671
Bug: 149316154
Merged-In: I3e2edf69c48f90743903a257033a43d608b4f0d5
Change-Id: I3e2edf69c48f90743903a257033a43d608b4f0d5
2020-03-12 12:30:27 -07:00
SongFerngWang
901bf15a88 5G icon default changed
default value:"connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G
,not_restricted_rrc_con:5G"

Bug: 150826929
Test: build pass
Change-Id: I298b0eb496f5aae8c812ccfa375e2649fc9c2a64
Merged-In: I298b0eb496f5aae8c812ccfa375e2649fc9c2a64
2020-03-12 22:06:16 +08:00
SongFerngWang
e09980c1f5 [Mainline] Add @hide. Revisit and redesign in S
Bug: 144486008
Test: build pass.
Change-Id: I9f301b65a3a476a114821c77916dbdb988e5d983
Merged-In: I9f301b65a3a476a114821c77916dbdb988e5d983
2020-03-12 07:44:39 +00:00
Malcolm Chen
05d1ed18d5 Mark NonNull for canManageSubscription parameters.
Bug: 148106947
Test: build
Change-Id: I56dc7576c9b44337f0b61164a5cd434d17601ccb
Merged-In: I56dc7576c9b44337f0b61164a5cd434d17601ccb
2020-03-11 20:40:37 -07:00
Xiangyu/Malcolm Chen
dc4985f43a Merge "Enable skipping validation by default." 2020-03-12 03:16:45 +00:00
Rambo Wang
ccf29801e2 CellularDataService: mCallbackMap is not thread safe
The HashMap object mCallbackMap in CellularDataService is a shared
resource between DataService's handler thread and CellularDataService's
handler thread. The update operations (put and remove) has
synchronization issue.

This CL fixes the issue by letting CellularDataService shares the
looper/handler thread of DataService (but keeping its own handler). And
thus all the operations of mCallbackMap are handled serializally in
DataService's handler thread.

One alternative solution is to  move all operations of the mCallbackMap
into
CellularDataService's handler thread to make it thread-safe. But it's
difficult for close() method which need to clear mCallbackMap and
shutdown the handler thread.

The other alternative solution is to replace HashMap with
ConcurrentHashMap
for mCallbackMap. This do make mCallbackMap thread-safe but do not
change the fact that it is still a shared resource between two threads.

Bug: 151103522
Test: atest FrameworksTelephonyTests
Change-Id: I7f5a507c2a79c7c77c5c2d7d3be147af80dc9f69
2020-03-11 20:00:24 -07:00
Malcolm Chen
4aae9a99ec Enable skipping validation by default.
Set KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG to 24 hours to enable
validation skipping if network is validated in the last 24 hours.

Bug: 140070796
Test: unittest
Change-Id: I07b087d731ed1661e5b0c51407ea3003769a3fd9
Merged-In: I07b087d731ed1661e5b0c51407ea3003769a3fd9
2020-03-11 18:11:58 -07:00
Daniel Bright
774efe07e9 Merge "Undo commit "Expose constants in Telephony.Carriers"" 2020-03-12 01:07:30 +00:00
Daniel Bright
9fe427c9d2 Undo commit "Expose constants in Telephony.Carriers"
Undid carrier constants as @SystemApis.  Also had to move
constants out of annotation.java because any references in
that specific file need to be to public APIs.

Bug: 148170690
Test: make, flash
Merged-In: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
Change-Id: Ie4b827563dbc373c58ec805bc5400e0950b5b81e
2020-03-11 16:54:08 -07:00
Shuo Qian
c3e4dd3799 Merge "API Council Feedback - Override EmergencyNumberDB File API" 2020-03-11 19:24:51 +00:00
Shuo Qian
e03edaba0e Merge "API Council Feedbacks" 2020-03-11 19:24:35 +00:00
sqian
a1c74497cd API Council Feedback - Override EmergencyNumberDB File API
Use ParcelFileDescriptor; Introduce Reset API

Test: atest TelephonyHostTest#testEmergencyNumberDb
Bug: 147805285
Change-Id: I7a7733c02874c0f17fef8c91b9e543c8e803f504
Merged-In: I7a7733c02874c0f17fef8c91b9e543c8e803f504
(cherry picked from commit 75c49ab334)
2020-03-10 22:13:46 +00:00
Shuo Qian
9ae1afee27 API Council Feedbacks
1) Update doc of ACTION_UPDATE_EMERGENCY_NUMBER_DB
2) Add new APIs EXTRA_VERSION and EXTRA_REQUIRED_HASH
3) Rename isDataConnectionEnabled to IsDataConnectionAllowed
4) Format the API documentations with html format
5) Throw errors for shutdownAllRadios, isAnyRadioPoweredOn
6) Modify the doc of TelephonyManager.getEmergencyNumberDbVersion
7) Add UPDATE_CONFIG permission for ACTION_UPDATE_EMERGENCY_NUMBER_DB

Test: Treehugger; Manual made a call; make -j offline-sdk-docs
Bug: 147696692
Bug: 147805285
Bug: 148217670
Bug: 148218347
Change-Id: Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754
Merged-In: Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754
(cherry picked from commit dc86120fca)
2020-03-10 21:53:36 +00:00
Shuo Qian
7618c552e6 Remove hidden setRadioIndicationUpdateMode in TelephonyManager
We need to remove the previous hacky hidden API
 setRadioIndicationUpdateMode and its implementation in Telephony.
 This is an hidden API that affects power cost. We should remove it
 to prevent potential users to use it unexpectedly (e.g. in reflection)

Test: Manual by making a call
Bug: 148544396
Change-Id: I0bce99b5363392bbaf9cf76dad8c1b47a138fd19
Merged-In: I0bce99b5363392bbaf9cf76dad8c1b47a138fd19
(cherry picked from commit 4b779449d7)
2020-03-10 21:43:00 +00:00
Daniel Bright
71d3dacaa7 Switched out PhoneConstants.PhoneKey
Test: FrameworksTelephonyTests TeleServiceTests TelephonyProviderTests
Bug: 147465477
Merged-In: I2e147c9dc4383f7979740f2fd3ded44cd7d060e4
Change-Id: I2e147c9dc4383f7979740f2fd3ded44cd7d060e4
2020-03-09 18:03:23 -07:00
Hall Liu
57948adee3 Merge changes from topic "sys-selection-chan"
* changes:
  Split setSystemSelectionChannels
  Add setSystemSelectionChannels API
2020-03-09 20:00:40 +00:00
zhouwenjie
085e772609 Make sure mTransmitPowerInfo is always populated
Currently mTransmitPowerInfo could be empty, which ends up with a
IndexOutOfBoundsException.

Bug: 141382585
Change-Id: I97417f539b2bfba98499cbf4b609ea7c088b808f
Merged-In: I97417f539b2bfba98499cbf4b609ea7c088b808f
Test: atest CtsIncidentHostTestCases:com.android.server.cts.BatteryStatsValidationTest
2020-03-08 23:51:18 +00:00
Hall Liu
6c219c886b 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
Merged-In: Ic5a130e5806b4516caa1a8510214eaf9b2b43b03
2020-03-06 14:19:11 -08:00
Hall Liu
1276af44e9 Add setSystemSelectionChannels API
Add setSystemSelectionChannels as a SystemApi, connecting to the
identically-named HAL method.

Fixes: 144595103
Test: manual through the testapp, atest TelephonyManagerTest
Change-Id: I52ff09258af772e272937dd137813d0d63c50cb5
Merged-In: I52ff09258af772e272937dd137813d0d63c50cb5
2020-03-06 14:19:07 -08:00
Treehugger Robot
9838205a67 Merge "Change javadoc of getSubmitPduEncodedMessage and add IntRange to its parameters" 2020-03-06 01:14:05 +00:00
Jack Yu
e225e5dc70 Merge "4G+ RAT icon can not be displayed when back to 4G from 4G+" 2020-03-05 20:08:27 +00:00
Automerger Merge Worker
0b0e2a7aad Merge "Add javadoc and deprecate addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener)" am: 35c5908f80
Change-Id: I36334eeb66da30545e2c6d9739e828475b62b872
2020-03-04 23:22:51 +00:00
Treehugger Robot
35c5908f80 Merge "Add javadoc and deprecate addOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener)" 2020-03-04 23:06:57 +00:00
Automerger Merge Worker
f6cdbeb470 Merge "Make MmsManager public and @SystemService" am: 01574a30ea
Change-Id: I6978fb1377f76308732fb241f04adcef82087b7f
2020-03-03 21:22:33 +00:00
Automerger Merge Worker
a397dcf462 Added telephony display info support am: 987b8df24d
Change-Id: I28a8a4445b9daf4f9f34abf003bc2d4245692875
2020-03-03 21:20:57 +00:00
Automerger Merge Worker
6e2895c5bc Merge changes from topics "ccm_bw", "ccm_unmetered" am: 5dc0d90aad
Change-Id: Ice31e2b3fd6b5c8d718836a95c889f1ed8b1a60b
2020-03-03 21:20:49 +00:00
Automerger Merge Worker
ba8d32936b Add carrier config for sub6/mmwave/all unmetered am: 8350cfa302
Change-Id: Ibb110418ab1464b58f376c763427453fddb2e0b5
2020-03-03 21:20:43 +00:00
Sarah Chin
01574a30ea Merge "Make MmsManager public and @SystemService" 2020-03-03 21:17:11 +00:00
Sarah Chin
5dc0d90aad Merge changes from topics "ccm_bw", "ccm_unmetered"
* changes:
  Carrier config for 5G up/down bandwidth and LTE for NSA
  Add carrier config for sub6/mmwave/all unmetered
2020-03-03 21:01:06 +00:00
Sarah Chin
cf66c06c32 Merge changes from topic "displayinfo"
* changes:
  Move override logic from SysUI to Telephony
  Added telephony display info support
2020-03-03 21:01:06 +00:00
Automerger Merge Worker
f289048875 Merge "Created typed class pin result in keyguard" am: d2b38018cc
Change-Id: If233274d303b66b4e6b6b5068ed92403d35247d0
2020-03-03 20:22:52 +00:00
Daniel Bright
d2b38018cc Merge "Created typed class pin result in keyguard" 2020-03-03 20:07:57 +00:00
Sarah Chin
f5d9be9323 Carrier config for 5G up/down bandwidth and LTE for NSA
Add default values for 5g upstream/downstream bandwidth
Update default values on NR frequency changed
Config to use LTE values for upstream and 5G for downstream on NSA
Resource overlay for modem predictive/instantaneous bandwidth estimates

Test: atest FrameworksTelephonyTests
Bug: 149032132
Bug: 149032474
Bug: 149032786
Change-Id: I70e95e98c871ba3fdc2e94de9504eafe247619c9
Merged-In: I70e95e98c871ba3fdc2e94de9504eafe247619c9
2020-03-03 11:53:11 -08:00
Sarah Chin
8350cfa302 Add carrier config for sub6/mmwave/all unmetered
Test: atest DcTrackerTest
Bug: 147312358
Change-Id: Ibd0d1546e3577653eef1fdb4466f43e0c3c781fe
Merged-In: Ibd0d1546e3577653eef1fdb4466f43e0c3c781fe
2020-03-03 11:45:42 -08:00
Automerger Merge Worker
79f4549b08 Merge "Fix permission check for get/setSmscAddress." am: 980e0e1286
Change-Id: Icf72bce213f4c66cbc09b54c8dc8ea39e9f51f95
2020-03-03 19:21:40 +00:00
Jack Yu
987b8df24d Added telephony display info support
Added the new APIs allowing clients like System UI to display
network icons correctly based on the provided telephony display
info.

Test: Telephony sanity tests
Bug: 148540139
Change-Id: I4dfb6eb7a313539e0565a4239d555426f12e503e
Merged-In: I4dfb6eb7a313539e0565a4239d555426f12e503e
2020-03-03 11:21:05 -08:00
Amit Mahajan
980e0e1286 Merge "Fix permission check for get/setSmscAddress." 2020-03-03 19:02:42 +00:00
Automerger Merge Worker
eb7eca6f46 Merge "Change createFromNativeSmsSubmitPdu for API review" am: 967a468a78
Change-Id: I03e4563726d7d397cc7e1753a9e0188c0056ea2d
2020-03-03 18:18:18 +00:00
Treehugger Robot
967a468a78 Merge "Change createFromNativeSmsSubmitPdu for API review" 2020-03-03 18:06:12 +00:00
Automerger Merge Worker
6ab26e6bf5 Merge "Add carrier config to show wifi calling icon in status bar" am: d5579959e4
Change-Id: I593a40536a0f0cb290f197e1dbcadbc7ffde6b8b
2020-03-02 23:32:48 +00:00