Commit Graph

5860 Commits

Author SHA1 Message Date
Brad Ebinger
e9113e9046 Merge "Modify shouldProcessCall API to remove redundancy" am: 59391aa4a0 am: 8f2c2ca09a
am: 27617a9894

Change-Id: Id4638c9126cce687bb4513731be2aeb962b2250d
2018-02-28 04:59:52 +00:00
Cassie
69f99c8e1f Merge "Add documentation for SECRET_CODE_ACTION according to API review process." am: e6691d8e89 am: f29d208045
am: 9f373ee378

Change-Id: I9dcb76126e9cb06a7967f3f003b78fe605b69167
2018-02-28 04:47:16 +00:00
Brad Ebinger
27617a9894 Merge "Modify shouldProcessCall API to remove redundancy" am: 59391aa4a0
am: 8f2c2ca09a

Change-Id: Id4762516cce2f6f902542d0b15195e9531c2eda4
2018-02-28 04:46:13 +00:00
Cassie
9f373ee378 Merge "Add documentation for SECRET_CODE_ACTION according to API review process." am: e6691d8e89
am: f29d208045

Change-Id: Ib04ccee612d521818ac45f29895e604646286705
2018-02-28 04:36:03 +00:00
TreeHugger Robot
6e0f8e2620 Merge "Added indication update mode support" 2018-02-28 04:01:41 +00:00
Treehugger Robot
59391aa4a0 Merge "Modify shouldProcessCall API to remove redundancy" 2018-02-28 03:02:27 +00:00
Treehugger Robot
e6691d8e89 Merge "Add documentation for SECRET_CODE_ACTION according to API review process." 2018-02-28 02:30:44 +00:00
Jordan Liu
d16720459d Merge "Use 4 thresholds instead of 6" am: fdebcf1ae2
am: 00fef4fb3d

Change-Id: If6f8e1f938298506068d87e008ab0de21b8ff6a3
2018-02-28 01:51:40 +00:00
Jack Yu
1a1c35750b Added indication update mode support
Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.

Test: Manual
Bug: 65112388
Change-Id: I4bb4894eaaba401f655e5dc25138275f5e8498e1
2018-02-27 17:40:31 -08:00
Jordan Liu
fdebcf1ae2 Merge "Use 4 thresholds instead of 6" 2018-02-27 23:44:03 +00:00
fionaxu
331965e5d6 Don't throw exception if phone process is dead for carrier ID APIs
Bug: 73772776
Test: Build
Change-Id: I81638f52d5d8ccf1005878ba4f3967e07169284b
2018-02-27 15:30:09 -08:00
Jordan Liu
451ece3c21 Use 4 thresholds instead of 6
Min and max thresholds are fixed.

Bug: 73775507
Bug: 70698348
Test: manual and ServiceStateTrackerTest
Change-Id: Ie7fbda0627615f49b6205142c22ad48e88735f80
Merged-In: Ie7fbda0627615f49b6205142c22ad48e88735f80
2018-02-27 14:19:05 -08:00
TreeHugger Robot
389f6d6ac9 Merge "Use 4 thresholds instead of 6" 2018-02-27 22:03:00 +00:00
Jordan Liu
407b4790a3 Use 4 thresholds instead of 6
Min and max thresholds are fixed, and should not be customizable.

Bug: 73775507
Bug: 70698348
Test: manual test on 311480 and ServiceStateTrackerTest
Change-Id: Ie7fbda0627615f49b6205142c22ad48e88735f80
2018-02-27 09:39:10 -08:00
Mohamed Abdalkader
786c3abe93 Merge "Add more sms error codes" am: c16da498d5 am: 8a9d38fbbc
am: 55295f2d0c

Change-Id: I63e8d4ea85aeda6927418bf42362397fa8e7ffb7
2018-02-27 04:22:47 +00:00
Mohamed Abdalkader
55295f2d0c Merge "Add more sms error codes" am: c16da498d5
am: 8a9d38fbbc

Change-Id: Idaecf961390d15987e9d5c93fb21a796da33d989
2018-02-27 04:11:32 +00:00
Treehugger Robot
c16da498d5 Merge "Add more sms error codes" 2018-02-27 02:48:31 +00:00
Naoyuki Konda
4f66562c8f Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am: d676c5c134 am: 1d2ddbb9ae
am: 5f676ad625

Change-Id: I33817c1902c72aac417865287d137f8e1e919480
2018-02-27 02:16:40 +00:00
Naoyuki Konda
5f676ad625 Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" am: d676c5c134
am: 1d2ddbb9ae

Change-Id: Ib137d185149dca4ae5117f6c32f610281960123a
2018-02-27 02:03:54 +00:00
Jayachandran Chinnakkannu
85ef115e72 Merge "Add support for sending message with priority, link control and validity period options" am: b103f9309b am: bb29858d7f
am: 0000a9b623

Change-Id: I5da271b0f113844b7ad393a051078af602fa518d
2018-02-27 00:53:32 +00:00
Jayachandran Chinnakkannu
0000a9b623 Merge "Add support for sending message with priority, link control and validity period options" am: b103f9309b
am: bb29858d7f

Change-Id: I0c7c425c6a8b0ee9ee7ae4695bb7f62b1e75da79
2018-02-27 00:43:26 +00:00
Treehugger Robot
d676c5c134 Merge "Hide APN, USER and Password from log in SETUP_DATA_CALL" 2018-02-27 00:02:34 +00:00
Jayachandran Chinnakkannu
b103f9309b Merge "Add support for sending message with priority, link control and validity period options" 2018-02-26 22:53:22 +00:00
Holly Jiuyu Sun
e45fda114b Merge "Add hashCode() in UiccAccessRule." am: 0da1f09f9b
am: ab8e1a47f1

Change-Id: I90525e35faf2d3bb6c142bce33e054ac76cbcba9
2018-02-26 22:27:13 +00:00
Holly Jiuyu Sun
7c259deb07 Add hashCode() in UiccAccessRule.
hashCode() and equals() should appear together.

Bug: 73785903
Test: test on phone
Merged-In: I7f9d8943f6a0e1039815e21ff6dfe035bd674639
Change-Id: I7f9d8943f6a0e1039815e21ff6dfe035bd674639
2018-02-26 10:45:17 -08:00
TreeHugger Robot
c73f954cc7 Merge "Revert "Add the assisted dialing carrier config."" 2018-02-26 16:02:34 +00:00
Jiuyu Sun
be06b5fc0e Merge "Add hashCode() in UiccAccessRule." 2018-02-26 05:48:14 +00:00
Mengjun Leng
b379ce981b Add support for sending message with priority, link control and validity period options
1. Added support for message priority(indicates the priority of a
   SMS to the network in the PDU) in 3gpp2
2. Added support for link control(indicates whether network can
   expect more messages or not so it can decide whether to retain
   the radio link or not) while sending multiple messages
3. Added support for validity period(indicates how much time the
   SMS is valid at the SMSC) support in 3gpp
4. Amended UT test cases for API changes and add UT validity period
   test case

Test: Verfied sending short SMS, long SMS, MMS, SMS with emoji on
      live network

Bug: 34962629
2018-02-24 01:14:03 +00:00
TreeHugger Robot
3a3bb15763 Merge "Added CTS test cases for getNetworkId() and getSystemId()" 2018-02-24 00:37:08 +00:00
Cassie
5b97cf1395 Add documentation for SECRET_CODE_ACTION according to API review
process.

 * Document who can send and who can receive the broadcast. What are the security restrictions?
   The implication here is that there should be some. What are the wake-up semantics?
 * Document who can receive SECRET_CODE action and under what circumstances,
   and what permissions are needed to receive and send it.

Bug: 73751267, 73392896
Test: Basic telephony sanity
Change-Id: I1b6138c9ddf4cb3d84d8b652e18d4e57f410ee4d
2018-02-23 13:52:10 -08:00
Jeff Davidson
644c763b0d Merge "Factor out telephony permission checks into a helper class." am: fc5d8c8f31
am: 5275c0b123

Change-Id: Ieedbcc2f40f70beb43cfb4d0e677d72f6b3ff8f5
2018-02-23 21:33:07 +00:00
Gil O'Neil
183a553273 Merge "Allow certificates to be stored in the carrier app whitelist" 2018-02-23 21:18:40 +00:00
Jeff Davidson
fc5d8c8f31 Merge "Factor out telephony permission checks into a helper class." 2018-02-23 20:00:15 +00:00
Jack Yu
44612f4aa9 Merge "Fixed service state CTS test failing" am: ab5bc3be50 am: f535f8108d
am: 09da9870d0

Change-Id: Iac059a0df9bf6c3920327101d4423ef9acc60ebb
2018-02-23 17:46:03 +00:00
Jack Yu
09da9870d0 Merge "Fixed service state CTS test failing" am: ab5bc3be50
am: f535f8108d

Change-Id: Ia3e1e58acda7aa3099c93f1f6c2bef9f53828e4d
2018-02-23 17:27:20 +00:00
Treehugger Robot
ab5bc3be50 Merge "Fixed service state CTS test failing" 2018-02-23 15:41:32 +00:00
Cassie
b5d3d67077 Merge "Add comments according to the API review process." am: e9a215b238 am: b3b458b9ad
am: b1b06cbaf5

Change-Id: Ic90fe7f73ae2442e5bd3c8e7f69e70c1b5332ff6
2018-02-23 07:07:18 +00:00
Cassie
b1b06cbaf5 Merge "Add comments according to the API review process." am: e9a215b238
am: b3b458b9ad

Change-Id: Ie9c3ce9bc67c08d99ea1c1ebfce5fbc78575baea
2018-02-23 06:56:56 +00:00
Treehugger Robot
e9a215b238 Merge "Add comments according to the API review process." 2018-02-23 05:32:35 +00:00
Jack Yu
1b8b38928b Added CTS test cases for getNetworkId() and getSystemId()
Bug: 32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
2018-02-22 17:37:38 -08:00
goneil
6db18a9bad Allow certificates to be stored in the carrier app whitelist
Use CARRIER_APP_WHITELIST to store app certificate mapped to package
name (instead of just package name as we had before).

Bug: 70042722
Test: SettingsBackupTest
Test: UiccProfileTest#testParseWhitelistMapFromString() for parsing map
Change-Id: Ia0c7c364cd8154272ef62cbbf412036b4eae1b21
2018-02-22 16:39:01 -08:00
Holly Jiuyu Sun
eafc952dbe Add hashCode() in UiccAccessRule.
hashCode() and equals() should appear together.

Bug: 73785903
Test: test on phone
Change-Id: I7f9d8943f6a0e1039815e21ff6dfe035bd674639
2018-02-22 15:47:27 -08:00
Jack Yu
7d20eae135 Fixed service state CTS test failing
Added missing member variables in copyFrom().

Bug: 73298491
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState CtsTelephonyTestCases:TelephonyManagerTest#testGetServiceState
Change-Id: I750816a13801a911d68e0a774fd59602c81c5687
2018-02-22 14:35:43 -08:00
Cassie
e1c880242b Add comments according to the API review process.
* Explain what developers should use instead in the @deprecated note for Telephony#BEARER
 * Please add more documentation for network type bitmask - reference to just TelephonyManager is not sufficient because it has so much stuff in it.
 * Also remove the @hide tag for private constants in ServiceState.

Bug: 73751228
Test: Basic telephony sanity
Change-Id: Ie7405a961db4494104750bf406f20b1b4fb8191a
2018-02-22 09:08:48 -08:00
Jeff Davidson
3c94405a6a Merge "Factor out telephony permission checks into a helper class." 2018-02-22 16:48:53 +00:00
Pengquan Meng
62747fee15 Merge "Cleanup TelephonyManager's log" am: 033de4676b am: 22f61111bd
am: bfb00f97af

Change-Id: Iccc3d497bf28906f4da54eef3acbd72dc04bfd3c
2018-02-22 15:53:27 +00:00
Hall Liu
a433bdc9e8 Merge "EMBMS API tweaks" am: 47e1d11b47 am: 3b40c709a3
am: 2a08ccdd8b

Change-Id: I617e2bca44d52b55f2d032db0fe59aa0a9f88e24
2018-02-22 15:38:26 +00:00
Pengquan Meng
bfb00f97af Merge "Cleanup TelephonyManager's log" am: 033de4676b
am: 22f61111bd

Change-Id: Icaff0e2cc4ebeb1f36b8597ee11457779aeca06f
2018-02-22 07:14:43 +00:00
Pengquan Meng
033de4676b Merge "Cleanup TelephonyManager's log" 2018-02-22 05:19:11 +00:00
Hall Liu
2a08ccdd8b Merge "EMBMS API tweaks" am: 47e1d11b47
am: 3b40c709a3

Change-Id: I8b281f717d3862a9f7a5de3d834dcded4ac436dc
2018-02-22 03:54:18 +00:00