Commit Graph

4492 Commits

Author SHA1 Message Date
Treehugger Robot
9006230a7e Merge "Fix some style issues" am: 1b87c970c8 am: 9a155b957a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313803

Change-Id: I0269a40f6984fa61522b0fb48aa1a66f1906683b
2020-07-14 11:16:21 +00:00
Treehugger Robot
a7a04f6c5c Merge "Suppress showing "Invalid Validity Period-1" for sending messages" am: 8daa4a1389 am: ee59d3306a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313804

Change-Id: Ic7c6ffe1943ccbe7d79633fc6d2f29ef6f4e75a1
2020-07-14 10:50:04 +00:00
Treehugger Robot
1b87c970c8 Merge "Fix some style issues" 2020-07-14 10:45:39 +00:00
Taesu Lee
1ec60185f8 Suppress showing "Invalid Validity Period-1" for sending messages
Show the error log when only wrong value is set actually for sending
instead.
And it includes some cleanup.

Bug: 161156510
Test: MO SMS and check log

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I2b58b431c59c52dd05cfa54ac34551550cd614d2
2020-07-14 16:05:44 +09:00
Taesu Lee
2238af8e30 Fix some style issues
Test: build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I119d6351057d91a11c9bb58ea6b469807f469c38
2020-07-14 12:13:24 +09:00
Treehugger Robot
2d017866f1 Merge "Ignore invalid time stamp in SMS PDUs" am: a19cd20f01 am: 43887910a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354342

Change-Id: I74bcc259c8764f969a7328ff97bec20aeeabf036
2020-07-13 08:39:07 +00:00
Treehugger Robot
a19cd20f01 Merge "Ignore invalid time stamp in SMS PDUs" 2020-07-13 08:10:24 +00:00
Shuo Qian
47351ebc1b Merge "Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads." am: 02b664649a am: 1609733fae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360883

Change-Id: Ia8d0608b3ef8291030a8131b732dee2eff2c8745
2020-07-13 02:33:38 +00:00
Jeff Sharkey
d8d6992c07 Fix a Sms7BitEncodingTranslator threading issue, since translate() method can easily race when called by multiple threads.
Bug: 160733170
Test: Sanity; Telephony unit tests; hard to reproduce
Change-Id: If8347a27a79351e84060c9a35e1cc9efd468f7a0
Merged-In: If8347a27a79351e84060c9a35e1cc9efd468f7a0
(cherry picked from commit 131781145d)
2020-07-10 20:16:02 +00:00
Treehugger Robot
5850cbdfad Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: I05e4806aca68c0b42912834a6da1976443846c56
2020-07-10 07:16:52 +00:00
Treehugger Robot
b599edc541 Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" 2020-07-10 06:48:53 +00:00
Sooraj Sasindran
dc52bd51d8 Merge "Add hidden API to support allowed networks reason" 2020-07-09 22:40:37 +00:00
Nathan Harold
dbe2b4c8a9 Merge changes from topic "servicelocation" am: 63ced6b508 am: 0b41b930a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355808

Change-Id: I1992b4e1c9d7c2cf442515b4c397a9975478df85
2020-07-09 17:34:30 +00:00
Nathan Harold
b169887af7 Add Location Checks on CellLocation#requestLocationUpdate am: 32deda2df3 am: 3b7647b8d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355807

Change-Id: I44159f46bb114dcc181e4974fabcc22c881b5395
2020-07-09 17:34:25 +00:00
Taesu Lee
c483107ac7 Delete newFromCMT() and newFromCDS() from SmsMessage
Bug: 160847655
Test: build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Ie451a24ef6b6c03ee8668fb055d83c7cc4175cdb
2020-07-09 19:23:27 +09:00
Sooraj Sasindran
23eda90058 Add hidden API to support allowed networks reason
Add hidden API to support allowed networks type for
specific reason like power.

Bug: 156709797
Test: system test
Merged-In: If4424d7d94ac26ad31725a1658dad5751d0d2629
Change-Id: If4424d7d94ac26ad31725a1658dad5751d0d2629
2020-07-08 23:23:05 -07:00
Nathan Harold
0459eb7cdc Remove Support for Deprecated Location Updating
Remove support for location update control that impacts
the services state tracker. This functionality hasn't been
needed in many years, and it has the ability to:
-consume additional battery
-cause ServiceState to be reported incorrectly
-cause the phone to not know about changes to
 the service state (current cell, technology, etc).

Bug: 152648516
Test: compilation - code removal only
Change-Id: I1bf880c037b5c005bdd61a0ff6f5c4000ec2f9be
2020-07-06 13:54:20 -07:00
Nathan Harold
32deda2df3 Add Location Checks on CellLocation#requestLocationUpdate
Update CellLocation#requestLocationUpdate to pass the necessary
information to do soft location permission checks and bill
modem battery usage against the caller of the API.

Bug: 152648516
Test: atest CellLocationTest
Change-Id: Id9e354538953ef93193a937a834e5890e62ecebd
2020-07-06 13:54:15 -07:00
Taesu Lee
3e3baa0b9d Ignore invalid time stamp in SMS PDUs
Catch a DateTimeException so that we don't lose SMS PDUs even if they
have invalid time stamp caused by SMSC problems.

Bug: 160200121
Test: Received SMS having invalid time stamp

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I80ef1c134f49d6a23e87a77125f54f4f66d62023
2020-07-02 16:50:08 +09:00
Jack Yu
e9c44278c5 Reset cell broadcast config before enabling all channels
Before cell broadcast config service enabling all channels, it
reset all channels that were previously enabled. This will make
sure the full channel config can be pushed down to modem. This
also solved the issue that channel config not sending to modem
when SIM is swapped. Note that a hidden API is added and will
be unhide in the next Android release.

Fix: 155027085
Test: Manual
Merged-In: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
Change-Id: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
2020-06-19 19:46:31 +00:00
Brad Ebinger
3afcd20f6a Fix MmTelFeatureConnection Memory Leak
In FeatureConnection, we never cleaned up the ImsFeatureStatusCallback
after it was destroyed, leaving zombie FeatureConnections around.

Bug: 156893040
Fixes: 157948894
Test: atest FrameworksTelephonyTests
Merged-In: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
Change-Id: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
2020-06-19 10:57:04 -07:00
Sooraj Sasindran
1dfff63b39 Merge "Add hidden API to support allowed networks reason" into rvc-dev am: 06e61f7cd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712805

Change-Id: Ia5e38013db7a64afc03b3564c1f336622e834e7c
2020-06-13 03:23:35 +00:00
Sooraj Sasindran
7e4cd920e7 Add hidden API to support allowed networks reason
Add hidden API to support allowed networks type for
specific reason like power.

Bug: 156709797
Test: system test
Change-Id: If4424d7d94ac26ad31725a1658dad5751d0d2629
2020-06-12 18:31:37 -07:00
Brad Ebinger
9ced939313 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev am: 0b35eb55a8
Change-Id: Id06fda9d0a3f3995c9497410e79ccb72c4862a43
2020-05-20 19:28:00 +00:00
Brad Ebinger
0b35eb55a8 Merge "Fix MmTelFeatureConnection Memory Leak" into rvc-dev 2020-05-20 19:07:49 +00:00
Brad Ebinger
64e101323b Fix MmTelFeatureConnection Memory Leak
In FeatureConnection, we never cleaned up the ImsFeatureStatusCallback
after it was destroyed, leaving zombie FeatureConnections around.

Bug: 156893040
Test: atest FrameworksTelephonyTests
Change-Id: Idcf8b558c3807a3f9f5094afee532e76ea6f02cb
2020-05-18 17:46:06 -07:00
Amit Mahajan
963957ed4d Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc8c am: 67bec2d79b
Change-Id: I2395255c3da76bb1da99fe243a280c65ba9baf95
2020-05-19 00:16:28 +00:00
Amit Mahajan
62120dcc8c Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." 2020-05-18 23:38:22 +00:00
Xiangyu/Malcolm Chen
99b0cf2dc8 Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8
Change-Id: Ib34c296ab404bdabc69823448c16320e80deacd1
2020-05-09 02:03:51 +00:00
Malcolm Chen
412a6b5f6e Rename max.active.modems to active_modems.max_count
Bug: 154072245
Test: build
Change-Id: Ie1ce63782994db8092128f81d10040e1a2d684ea
Merged-In: Ie1ce63782994db8092128f81d10040e1a2d684ea
2020-05-09 01:45:01 +00:00
Xiangyu/Malcolm Chen
414a71126e Merge "Rename max.active.modems to active_modems.max_count" 2020-05-09 01:30:12 +00:00
Malcolm Chen
b3c815b0e0 Rename max.active.modems to active_modems.max_count
Bug: 154072245
Test: build
Change-Id: Ie1ce63782994db8092128f81d10040e1a2d684ea
2020-05-06 17:50:28 -07:00
Sarah Chin
22b7b5e3d7 Remove constants for DisplayInfo logic from DcTracker
Deprecate carrier configs for connected->not connected timer
Replaced DCT events with displayinfo changed listener

Test: atest NetworkTypeControllerTest, DcTrackerTest
Test: manual verify timer and meteredness works as expected
Bug: 154186364
Change-Id: I22a459e79f509f20c6b38386655c4b49315e3be7
Merged-In: I22a459e79f509f20c6b38386655c4b49315e3be7
2020-04-28 13:53:15 -07:00
Sarah Chin
d6d2e5c1a8 Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e8441d
Change-Id: I727196619e88bdcebc4dfee128ed9677bed9b44a
2020-04-28 16:50:34 +00:00
Malcolm Chen
edaa0b780f Add a @hide API to indicate 5G and DSDS conflict.
Bug: 152786064
Test: build and manual
Change-Id: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
Merged-In: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
2020-04-27 18:27:16 -07:00
Jack Yu
4584d589bd Only setup data when config and sim is ready
SIM needs to be fully loaded before we can setup
data connection because APN slection requires
MCC/MNC on the SIM. Also lots of data related configs
are stored in carrier config. Both needs to be ready
before we can setup a data connection (except for
emergency APN).

Bug: 152816633
Test: Manual + unit tests

Merged-In: I69c7838bdd9751bef4c15e9504519b55afb9fefb
Change-Id: I69c7838bdd9751bef4c15e9504519b55afb9fefb
(cherry picked from commit 38de77534a)
2020-04-24 20:48:41 -07:00
Sarah Chin
86b8a847c7 Remove constants for DisplayInfo logic from DcTracker
Deprecate carrier configs for connected->not connected timer
Replaced DCT events with displayinfo changed listener

Test: atest NetworkTypeControllerTest, DcTrackerTest
Test: manual verify timer and meteredness works as expected
Bug: 154186364
Change-Id: I22a459e79f509f20c6b38386655c4b49315e3be7
2020-04-24 20:21:33 -07:00
Jordan Liu
6f76a035be Merge "Implement equals and hashCode" 2020-04-24 19:31:51 +00:00
Jordan Liu
aaff63781a Implement equals and hashCode
This keeps SmsHeader in sync with cellbroadcastservice.SmsHeader.

Bug: 148482334
Test: builds
Change-Id: I2a3188a603595e4c97acf6413036dcddf35c0b87
Merged-In: : I2a3188a603595e4c97acf6413036dcddf35c0b87
2020-04-23 15:26:31 -07:00
Jordan Liu
2a274fa1c7 Merge "Implement equals and hashCode" into rvc-dev am: 74918ad98b
Change-Id: Id6e4a9d2652693eb9fedf0a8251792405ada3111
2020-04-20 18:57:02 +00:00
Jordan Liu
74918ad98b Merge "Implement equals and hashCode" into rvc-dev 2020-04-20 18:50:02 +00:00
Jack Yu
7d7adf75e0 Get rid of SIM record access in DcTracker
DcTracker uses several SIM related signals for different purposes.
Those signals include SIM record loaded/not-loaded, subscription
changed event, and carrier config changed event. Those signals
are slightly different but not that really important to DcTracker.
What DcTracker cares is
1. Whether SIM is inserted or not.
2. Whether configuration changes or not.

By listening to a single carrier config change event can handle
the cases above.

Removed all SIM record related places in DcTracker. SIM record should
not be accessed by anyone outside of UICC controller.

Test: Manual test + unit tests
Bug: 146168348
Merged-In: Iad45933ea77eb460625a891071535cbeaf8ac3b0
Change-Id: Iad45933ea77eb460625a891071535cbeaf8ac3b0
(cherry picked from commit df3001b935)
2020-04-19 00:25:09 -07:00
Jordan Liu
00fd9fd017 Implement equals and hashCode
This keeps SmsHeader in sync with cellbroadcastservice.SmsHeader.

Bug: 148482334
Test: builds
Change-Id: I2a3188a603595e4c97acf6413036dcddf35c0b87
2020-04-17 19:10:59 +00:00
Xiangyu/Malcolm Chen
2565a56708 Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev am: e9dc36d551
Change-Id: Ib19013fbbcbc3a499739ec56d5b6c2461befc3d8
2020-04-14 22:23:51 +00:00
Xiangyu/Malcolm Chen
e9dc36d551 Merge "Add a @hide API to indicate 5G and DSDS conflict." into rvc-dev 2020-04-14 22:17:28 +00:00
Malcolm Chen
e92ce14eb7 Add a @hide API to indicate 5G and DSDS conflict.
Bug: 152786064
Test: build and manual
Change-Id: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
2020-04-14 11:19:48 -07:00
Jack Yu
e88497eb8c Merge "Only setup data when config and sim is ready" into rvc-dev am: 8f19a55f50
Change-Id: I36329d71b79c7c2e46f76589a33af0b8017e84f6
2020-04-08 08:34:23 +00:00
Jack Yu
38de77534a Only setup data when config and sim is ready
SIM needs to be fully loaded before we can setup
data connection because APN slection requires
MCC/MNC on the SIM. Also lots of data related configs
are stored in carrier config. Both needs to be ready
before we can setup a data connection (except for
emergency APN).

Bug: 152816633
Test: Manual + unit tests

Change-Id: I69c7838bdd9751bef4c15e9504519b55afb9fefb
2020-04-07 16:57:59 -07:00
vivi.li
cabb1d4761 DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh,
and the UiccCardApp was disposed.

But the unlock process was canceled. Therefore,
the previous unlocking process was interrupted without returning,
and the keyguard PIN lock View was always displayed.
If UiccCardApp was disposed,send the CommandException.Error.ABORTED as result for the previous Message.

Test: manual
Bug:140907125

Change-Id: I61f63136cb8638566f612a0a459adb398294527f
2020-04-07 11:47:12 +08:00
Treehugger Robot
d65e5d7f8b Merge "Use an original text for next force 7bit encoding" am: d72172d5de am: f61540d482
Change-Id: Ifcfeae5477074c163224b242ab93a894efee3baa
2020-04-07 03:16:11 +00:00