Commit Graph

3440 Commits

Author SHA1 Message Date
Brad Ebinger
500e9fe015 Merge "Added Locking for MmTelFeature" am: d273dea10b am: 3a92430622
am: a77af22570

Change-Id: Iae64fa9a18fecd98e97030abdfd08eabd7b29ac8
2018-03-16 21:10:51 +00:00
Brad Ebinger
a77af22570 Merge "Added Locking for MmTelFeature" am: d273dea10b
am: 3a92430622

Change-Id: I347c5afb39326e3177667b94db593e76a1c766f9
2018-03-16 20:54:10 +00:00
yinxu
36f3781315 Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" am: cdbf930883 am: a93e4124b5
am: 5195c1bb4e

Change-Id: I160a9aaf97354e00d711f9e9dd295bb418b0b151
2018-03-16 20:24:08 +00:00
yinxu
5195c1bb4e Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan" am: cdbf930883
am: a93e4124b5

Change-Id: I0f67a737f418d105658763e21974dc60216aee1a
2018-03-16 19:52:11 +00:00
Jack Yu
3f5e5aef5c Merge "Renamed getNetworkId and getSystemId" into pi-dev am: 6b4e6a17e9
am: a4bc10ab2c

Change-Id: I3464d53c8cd9cf3c90cb9bf49489d9cb93e7dc96
2018-03-16 18:33:43 +00:00
Brad Ebinger
d273dea10b Merge "Added Locking for MmTelFeature" 2018-03-16 18:21:07 +00:00
Jack Yu
a4bc10ab2c Merge "Renamed getNetworkId and getSystemId" into pi-dev
am: 6b4e6a17e9

Change-Id: I6abe048410da981bd0adfe9919ad4e7ea734b0c6
2018-03-16 18:17:39 +00:00
Jack Yu
6b4e6a17e9 Merge "Renamed getNetworkId and getSystemId" into pi-dev 2018-03-16 17:39:54 +00:00
Treehugger Robot
a9c0419010 Merge "Added CTS test cases for getNetworkId() and getSystemId()" 2018-03-16 17:39:38 +00:00
Jack Yu
260f2fa1fe Added CTS test cases for getNetworkId() and getSystemId()
Bug: 32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Merged-In: I5826a59d85028f0350ee39c69553f4e488d6456b
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
(cherry picked from commit 1b8b38928b)
2018-03-16 00:26:33 -07:00
Hall Liu
226c905c08 Merge "Modify LocationAccessPolicy to use LocationManager" 2018-03-16 01:20:54 +00:00
Jack Yu
2661fac133 Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
2018-03-15 16:39:19 -07:00
Hall Liu
d7a1c9dd76 Modify LocationAccessPolicy to use LocationManager
Remove the direct settings lookup since it's been deprecated.

Bug: 72886046
Test: run CTS
Change-Id: I00f11f46f20f86e91147b1232263b6c9a5d8c6b4
2018-03-15 13:49:46 -07:00
yinxu
2e8d5ed776 Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan
Because there will be multiple callbacks for each scan and they must be
invoked with the same order as they are received by the platform, we
should use AsyncTask.SERIAL_EXECUTOR instead of
AsyncTask.THREAD_POOL_EXECUTOR as the default executor.

Bug:74840070
Test: Unit Test, CTS Test
Change-Id: I7333940dad38f7e400a4124486bdb21cea0d5220
2018-03-15 13:28:05 -07:00
sqian
503768d07d Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" into pi-dev
am: a97d430aad

Change-Id: I1dac4e925743f016f4fbb11919b4f326082a4db3
2018-03-15 04:55:20 +00:00
TreeHugger Robot
5baeeefe93 Merge "Allow carrier-privileged apps to register telephony listeners." 2018-03-15 02:35:45 +00:00
sqian
5b65aea4f2 Check AppOps bit for TelephonyManager#getForbiddenPlmns
Bug: 73884967
Test: Telephony Sanity and Compile
Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404
(cherry picked from commit 52102d2868)

Change-Id: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe
2018-03-14 19:32:23 -07:00
Shuo Qian
9e4b300e60 Merge "Check AppOps bit for TelephonyManager#getForbiddenPlmns" 2018-03-15 01:18:15 +00:00
Treehugger Robot
fd4385e633 Merge "Add API to check extended APDU Supported" 2018-03-14 21:59:58 +00:00
Jeff Davidson
62b994b3cf Allow carrier-privileged apps to register telephony listeners.
For TelephonyManager#listen, we check carrier privileges if
READ_PHONE_STATE is missing for any calls which enforce the
permission. For calls which check it and behave differently (by
redacting sensitive info), we defer the permission check until the
actual event occurs, at which point it is checked based on the current
state of the device.

For SubscriptionManager#addOnSubscriptionsChangedListener, we remove
the existing permission check for READ_PHONE_STATE altogether. The
event itself contains no information, and reading subscriptions still
requires either READ_PHONE_STATE or carrier privileges on the
subscription in question.

Also updates incorrect Javadoc on
PhoneStateListener#LISTEN_SIGNAL_STRENGTH, which does not actually
check any permissions by design.

Bug: 70041899
Fixes: 74034127
Test: TreeHugger + E2E test w/ a carrier-privileged app
Change-Id: I84a56ad3972b9edcfdefcbb43ef174c54cdcac00
2018-03-14 14:15:35 -07:00
Eric Schwarzenbach
8062b76f21 Merge "Add Duplex mode to ServiceState." into pi-dev 2018-03-14 21:05:43 +00:00
Vasu Nori
84db0f558a Add constants for the new table: sms-changes.
This table is used by Auto code to keep track of changes to locally
stored SMS messages. These changes are propagated to the phone.

Bug: 71633682

Test: tested manually with messaging app.
Change-Id: I8bd8f5f375a9229de2b9de5ef09e5e1e9a97a4ca
2018-03-14 21:02:48 +00:00
Treehugger Robot
0715570648 Merge "Catch the RuntimeException for stopScan()" 2018-03-14 19:47:44 +00:00
Treehugger Robot
d116852e69 Merge "Fix a bug when calling onError(int)" 2018-03-14 19:46:51 +00:00
yinxu
17dbd5b1f5 Fix a bug when calling onError(int)
The lambda expression is executed on executor, so it is possible that
the message has been updated. The correct way is to fetch the
message.arg1 and use that value in the lamda expression.

This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/3725360

Bug:73750871
Test: Unit Test
Change-Id: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
Merged-in: Id13f5fabf7eaad6970ab66a83a17aba7f1eebfce
(cherry picked from commit db18cdae66)
2018-03-14 11:35:24 -07:00
yinxu
97922be2ac Catch the RuntimeException for stopScan()
Some RuntimeExceptions will be thrown across the binder so we need to
catch RuntimeException even we already catch the RemoteException.

This is a clean cherry-pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/3725821

Bug:73750871
Test: Unit Test
Change-Id: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
Merged-in: Ib72e5ce0f20fbbe913b054314ed3942862c0ab95
(cherry picked from commit 7ea1a49c0a)
2018-03-14 11:32:09 -07:00
Tyler Gunn
ac55e9dd01 Merge "Update API docs for Telephony call state reporting." am: c2493ee1ee
am: 1ba28fec3f

Change-Id: I60014a59db60610746841840278adead80963db8
2018-03-14 17:22:06 +00:00
Tyler Gunn
c2493ee1ee Merge "Update API docs for Telephony call state reporting." 2018-03-14 14:59:52 +00:00
Qingxi Li
9ec2c8c50a Add API to check extended APDU Supported
Add API UiccSlotInfo#getIsExtendedApduSupported

Bug: 68999147
Test: TreeHugger & E2E
Change-Id: Ia400a23c35332356deaa214861f6f5ffe47c8092
Merged-In: Ia400a23c35332356deaa214861f6f5ffe47c8092
2018-03-14 01:41:45 +00:00
Hall Liu
acecfc5858 Merge "Add IntDef for MBMS download result" into pi-dev 2018-03-14 00:37:37 +00:00
Qingxi Li
94b00b6b16 Merge "Add API to check extended APDU Supported" into pi-dev
am: d78e0451ea

Change-Id: I57edccff74fd6ab03ccc25566938f7e782a6f3f2
2018-03-14 00:10:29 +00:00
Treehugger Robot
985b17957a Merge "Allow carrier privileged apps to access Telephony/Subscription APIs." 2018-03-14 00:10:12 +00:00
Qingxi Li
d78e0451ea Merge "Add API to check extended APDU Supported" into pi-dev 2018-03-13 23:00:10 +00:00
Tyler Gunn
5f7265ec9c Update API docs for Telephony call state reporting.
Update TelephonyManager#getCallState,
PhoneStateListener#onCallStateChanged to make it clear which calls each
method considers in determining call state.
Added intdef for call state (allows auto doc generation of valid
values for parameters).

Test: make docs
Bug: 73245376
Change-Id: I70ebd0f00ae3f0e1370ae275be8f8ef6f008523d
2018-03-13 15:56:37 -07:00
Hall Liu
884f46e154 Merge "Add IntDef for MBMS download result" am: 54b8ab7333
am: 711c5c7415

Change-Id: I92bc2b40b4f08c9123a1b97f1532d8b5e4ecedb0
2018-03-13 21:54:35 +00:00
Brad Ebinger
feb9daffff Merge "Remove unneeded notify AIDL API" into pi-dev 2018-03-13 21:26:36 +00:00
Brad Ebinger
fc1ac6c9a8 Merge "Support Dynamic ImsService Querying" into pi-dev 2018-03-13 20:53:53 +00:00
Qingxi Li
346bddee19 Add API to check extended APDU Supported
Add API UiccSlotInfo#getIsExtendedApduSupported

Bug: 68999147
Test: TreeHugger & E2E
Change-Id: Ia400a23c35332356deaa214861f6f5ffe47c8092
2018-03-13 13:41:50 -07:00
Hall Liu
54b8ab7333 Merge "Add IntDef for MBMS download result" 2018-03-13 20:10:38 +00:00
yinxu
e6be615ca4 Merge "Catch the RuntimeException for stopScan()" into pi-dev
am: ed9ee780a4

Change-Id: I6815cbc5e896d6e24ea3abc5a258e8e6ecac0135
2018-03-13 19:47:30 +00:00
yinxu
40273bc5b2 Merge "Fix a bug when calling onError(int)" into pi-dev
am: f7e6b29718

Change-Id: I51b497c085a7e3ef16b77d1039459b04c28d8f7d
2018-03-13 19:38:10 +00:00
TreeHugger Robot
ed9ee780a4 Merge "Catch the RuntimeException for stopScan()" into pi-dev 2018-03-13 19:18:42 +00:00
TreeHugger Robot
f7e6b29718 Merge "Fix a bug when calling onError(int)" into pi-dev 2018-03-13 18:47:28 +00:00
Brad Ebinger
6dbe7997c2 Remove unneeded notify AIDL API
Removes the notifyImsFeatureReady
API AIDL, it is called when the callback
is set on the specific ImsFeature
interface.

Bug: 74391574
Test: Manual
Merged-In: I4762bdef59a8adec8ce41972489c65f2d180a3d4
Change-Id: I8c9cc39fa73861d7a9792709e1517d391230abfa
2018-03-13 11:33:52 -07:00
Hall Liu
86636fc1d8 Add IntDef for MBMS download result
Change-Id: Idd8434e65691fc5d08f5427add6aec1870b76619
Fixes: 74409057
Test: compiles, no functionality change
2018-03-13 11:31:37 -07:00
Hall Liu
26440f7fa6 Add IntDef for MBMS download result
Change-Id: Idd8434e65691fc5d08f5427add6aec1870b76619
Fixes: 74409057
Test: compiles, no functionality change
2018-03-13 11:29:33 -07:00
Treehugger Robot
57479b64b7 Merge "Carrier id api rename" 2018-03-13 18:28:50 +00:00
Brad Ebinger
8ad000953e Merge "Remove unneeded notify AIDL API" am: 991f8b0c34
am: b54c058bb6

Change-Id: I4762bdef59a8adec8ce41972489c65f2d180a3d4
2018-03-13 18:26:17 +00:00
Brad Ebinger
70d93053dc Merge "Remove IMS Emergency Calling availability API" am: 4b10333c26
am: 56b387aaf1

Change-Id: I6b8ba0608c540113ce7303907ec632989c6422bc
2018-03-13 18:10:13 +00:00
Brad Ebinger
9c750fe77f Support Dynamic ImsService Querying
1) Provide a "default" impl for MmTelFeature
instead of returning null.

2) Introduce a FeatureSlotPair, which maps a SIM
slot ID to a ImsFeature. This allows the ImsService
to provide which features it supports for multi-SIM
phones.

3) Pipe through ImsResolver state to help prevent IMS
operation when the ImsResolver is in the process of
figuring out feature capabilities.

Test: Telephony ImsService test app, telephony unit tests
Bug: 72642524

Merged-In: I4d7e9ba630739ade83e3242488f330ea6e73bbd7
Change-Id: Idb95f7651af200026d62e8b29eaed30bc0ebc9d3
2018-03-13 11:06:38 -07:00