Commit Graph

3236 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
0036d879dc Merge "Revert "Revert "Clean up SubMgr#getOpportunisticSubscriptions.""" 2018-10-26 22:06:37 +00:00
Xiangyu/Malcolm Chen
0c096a01f7 Revert "Revert "Clean up SubMgr#getOpportunisticSubscriptions.""
This reverts commit 8225032624.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id620937aec1e19d541c6d1529e97d91292565c6e
2018-10-26 22:02:21 +00:00
Yuchao Zhou
928579ecb0 Merge "Revert "Clean up SubMgr#getOpportunisticSubscriptions."" 2018-10-26 21:58:32 +00:00
Yuchao Zhou
8225032624 Revert "Clean up SubMgr#getOpportunisticSubscriptions."
This reverts commit 9569bc70f9.

Reason for revert: The cl is breaking git_master.
https://android-build.googleplex.com/builds/submitted/5095196/errorprone/latest/view/logs/build_error.log

Change-Id: I534af936b718b2f132473b5b42ea2faabc9382cd
2018-10-26 21:57:29 +00:00
Xiangyu/Malcolm Chen
60db69cd39 Merge "Clean up SubMgr#getOpportunisticSubscriptions." 2018-10-26 21:00:39 +00:00
Hall Liu
0b9ebf1d44 Merge "Add test API to override carrier config" am: a82f952fe7 am: 657e2a925d
am: 19c6fd5ab1

Change-Id: Ie243b230d3f6d8aca5c292ee497d9e4dc060aec0
2018-10-25 19:39:19 -07:00
Malcolm Chen
9569bc70f9 Clean up SubMgr#getOpportunisticSubscriptions.
Adding more descriptive comments for this API.
Remove param slotIndex.

Bug: 117832560
Bug: 117830188
Test: build
Change-Id: I906cfb8ccb1851bde6be09c273d47092337ed1c1
2018-10-23 18:47:04 -07:00
Hall Liu
a82f952fe7 Merge "Add test API to override carrier config" 2018-10-24 00:00:22 +00:00
Malcolm Chen
05a9565074 Changing setPreferredData so that it takes subId.
Bug: 92796390
Test: build
Change-Id: I189fbe3c47f51f361838a6737fb5bef3aa1f0ee9
2018-10-23 16:56:48 -07:00
Hall Liu
e5b1fda883 Add test API to override carrier config
Add API surface and AIDL to enable override functionality for CTS

Change-Id: I55328a75f16fe91280530dd348d4a034694be6e9
Fixes: 118184943
Test: manually call api through shell cmd
2018-10-23 13:14:36 -07:00
Xiangyu/Malcolm Chen
0875fbab4b Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" 2018-10-23 17:03:22 +00:00
Malcolm Chen
c1873af9c5 Add PhoneStateListener#onPreferredDataSubIdChanged
When SubscriptionManager#SetPreferredData changes preferredDataSub,
SubscriptionController notifies TelephonyRegistry and then notifies
all PhoneStateListeners that listen to the event.

Bug: 115550764
Test: unittest
Change-Id: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3
Merged-In: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3
2018-10-22 13:51:09 -07:00
Brad Ebinger
c5992534ed Adds new Public ImsManager API
Exposes IMS functionality using new ImsManager API.

Bug: 116493310
Bug: 112538960
Bug: 112866475
Test: Telephony Unit Tests
Merged-In: I856fd7edd7a8b6085567ae6de12340f9086a4903
Change-Id: I856fd7edd7a8b6085567ae6de12340f9086a4903
2018-10-22 13:11:02 -07:00
Amit Mahajan
5af89dfbd5 Merge "Initial RCS CL." 2018-10-19 23:40:29 +00:00
Brad Ebinger
d8c16347a9 Merge "Adds new Public ImsManager API" 2018-10-19 20:51:44 +00:00
Xiangyu/Malcolm Chen
0453359d7d Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants" am: 1b59a1673a am: 325b3aea77
am: 57ddfce9ea

Change-Id: I88f3fddb264b512b20466e8f824b3dae93670b66
2018-10-18 15:04:00 -07:00
Xiangyu/Malcolm Chen
325b3aea77 Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants"
am: 1b59a1673a

Change-Id: I15c450d9ca7a71bfbde1ddd602e13473bede06b3
2018-10-18 14:21:29 -07:00
Brad Ebinger
941c0a5cfd Adds new Public ImsManager API
Exposes IMS functionality using new ImsManager API.

Bug: 116493310
Bug: 112538960
Bug: 112866475
Test: Telephony Unit Tests
Change-Id: I856fd7edd7a8b6085567ae6de12340f9086a4903
2018-10-18 10:19:29 -07:00
TreeHugger Robot
a02e61107f Merge "Temporarily revert device identifier access check to previous behavior" 2018-10-18 15:59:18 +00:00
Michael Groover
9db22c7a89 Temporarily revert device identifier access check to previous behavior
If a calling package does not meet the new requirements for device identifier
access the calling package and method will be logged and the previous
READ_PHONE_STATE permission check will be performed to grant access to the
requested identifier. This is to prevent additional breakage for apps that
currently require device identifiers but have not yet been granted the
privileged permission or carrier privileges.

Bug: 117585389
Test: cts-tradefed run cts -m CtsPermissionTestCases \
      -t android.permission.cts.TelephonyManagerPermissionTest
Test: Manually invoked an app targeting pre-Q and verified access
      to device identifiers with the READ_PHONE_STATE permission.

Change-Id: I03339486a2d6971b93472479b79959c888beba1e
2018-10-17 18:05:46 -07:00
Chen Xu
535b74527d Merge "Revert "Revert "refactor radioPowerstate""" 2018-10-17 22:45:38 +00:00
Chen Xu
7395c630b0 Revert "Revert "refactor radioPowerstate""
This reverts commit 05188f3555.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Id170063bfdb1e3325f67e8680231ab4deda7d65d

Bug: 117349311
2018-10-17 22:45:21 +00:00
Malcolm Chen
a68019b55b Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants
Test: unittest
Bug: 112020101
Change-Id: Icdbda89fb103a4312855d14ab3a365b37564f164
2018-10-17 14:40:21 -07:00
Przemyslaw Szczepaniak
7072da44cc Merge "Revert "refactor radioPowerstate"" 2018-10-17 11:04:14 +00:00
Przemyslaw Szczepaniak
05188f3555 Revert "refactor radioPowerstate"
This reverts commit 700c8a0389.

Reason for revert: Broken master build

Change-Id: Ia0171ff9250228cc03685e7f03da8dd9e374826f
2018-10-17 11:00:01 +00:00
Chen Xu
acbcff9e7d Merge "refactor radioPowerstate"
am: 354fc35005

Change-Id: I964beaa764a9c49b462167a9192ac03d3049d0a9
2018-10-16 21:54:53 -07:00
Chen Xu
354fc35005 Merge "refactor radioPowerstate" 2018-10-17 04:10:47 +00:00
Chen Xu
a7274eb9b2 Merge "refactor radioPowerstate" 2018-10-17 00:14:45 +00:00
chen xu
700c8a0389 refactor radioPowerstate
1. new System API for getRadioPowerState with permision check
2. new System API for onRadioPowerStateChanged in PhoneStateListener
3. replace radioState enum in CommandsInterface to telephonyMgr defined
int.

Bug: 117349311
Test: telephony unit test
Change-Id: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
2018-10-16 20:33:28 +00:00
Nathan Harold
3e6be36806 Move SDK Check for getNeighboringCellInfo am: cb1c5ad25d
am: cd3d9a5ba9

Change-Id: I2226bcddceed70ab2b2328a42e7e0f1238017f88
2018-10-16 11:13:44 -07:00
Nathan Harold
cd3d9a5ba9 Move SDK Check for getNeighboringCellInfo
am: cb1c5ad25d

Change-Id: I5f840dfa0f002e3d1b43426840a38221f02a10c2
2018-10-16 10:33:34 -07:00
Nathan Harold
8ae2674d04 Merge "Move SDK Check for getNeighboringCellInfo"
am: 9ec58ff433

Change-Id: Id9975df8d6531103a9c1fa2d77b42699f07b823c
2018-10-16 10:15:13 -07:00
Nathan Harold
cb1c5ad25d Move SDK Check for getNeighboringCellInfo
Move the SDK check for getNeighboringCellInfo() to
inside the phone process for security.

Bug: 117520186
Test: atest CtsPermissionTestCasesSdk28
Change-Id: I9ca059dad0ed5d2107af154e0a63c282133aba3d
2018-10-15 20:15:51 -07:00
chen xu
760729c33e refactor radioPowerstate
1. new System API for getRadioPowerState with permision check
2. new System API for onRadioPowerStateChanged in PhoneStateListener
3. replace radioState enum in CommandsInterface to telephonyMgr defined
int.

Bug: 117349311
Test: telephony unit test
Change-Id: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
Merged-in: I502568280fbf9213ca6bf1f7fb204d0d4ce86580
2018-10-15 16:56:04 -07:00
Michael Groover
2422220258 Merge "Temporarily relax the privileged device identifier access check" 2018-10-13 20:26:57 +00:00
Xiangyu/Malcolm Chen
3e3f9f0f5f Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM." 2018-10-12 20:52:40 +00:00
Michael Groover
3ec197b793 Temporarily relax the privileged device identifier access check
Access to device identifiers was moved from a runtime permission to a
privileged permission; this change broke some first party apps that query for
these identifiers. This change introduces a flag in TelephonyPermissions that
will allow the privileged check to be relaxed so that dummy data is returned
(null for TelephonyManager methods and Build.UNKNOWN for Build#getSerial)
regardless of target SDK instead of throwing a SecurityException to prevent
app breakage. This flag will be changed back to the default false once all of
the first party apps have the privileged permission granted or their own
unique ID.

Bug: 117611604
Test: cts-tradefed run cts-dev -m CtsTelephony3TestCases
Change-Id: I294455e4c7e589def21d0c437ec1ef398bd44731
2018-10-12 20:18:36 +00:00
Sooraj Sasindran
10211c1f68 Merge "Introduce AlternativeNetwork APIs"
am: 98966bcbb6

Change-Id: I743fd447fef38c276b105d005c95033fe0393b7e
2018-10-11 16:15:14 -07:00
Sooraj Sasindran
98966bcbb6 Merge "Introduce AlternativeNetwork APIs" 2018-10-11 22:58:32 +00:00
Amit Mahajan
7d496bc030 Initial RCS CL.
This CL adds RcsManager with a dummy API.

Test: build
Bug: 109759350
Change-Id: Ib10a38fac9182ca010d3895431e419f5c1958d59
2018-10-11 14:43:09 -07:00
Sooraj Sasindran
32e446bf00 Introduce AlternativeNetwork APIs
Introduce AlternativeNetwork APIs

Bug: 113106744
Test: Verified using test app to make api calls
Change-Id: I134d1aef40f014378fd1364e0bfec6926fe2093e
Merged-In: I7f470cd6028a12cc66a660d58720f803271d38eb
2018-10-11 16:45:08 +00:00
Michael Groover
a28ad42768 Merge "Protect Device Identifiers behind priv permission and DO/PO checks" 2018-10-10 18:05:23 +00:00
Michael Groover
6d20d75e9e Protect Device Identifiers behind priv permission and DO/PO checks
Bug: 110099294
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases \
      -t com.android.cts.devicepolicy.DeviceOwnerTest.testDeviceOwnerCanGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases \
      -t com.android.cts.devicepolicy.ManagedProfileTest#testGetDeviceIdentifiers
Test: cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Test: cts-tradefed run cts -m CtsPermissionTestCases -t android.permission.cts.TelephonyManagerPermissionTest

Change-Id: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2018-10-09 13:44:02 -07:00
Pengquan Meng
cc03b9b8f9 Merge "Add isManualNetworkSelectionAllowed api to telephonyManager"
am: 0af8c5c73c

Change-Id: Ib4eeafabe49c785143cbfc48eabd039f535e11a5
2018-10-08 16:08:26 -07:00
Malcolm Chen
5e1dffdfa2 Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM.
Bug: 80268699
Test: unittest
Change-Id: Ifda606784f97c1bfa03fb424fd488bb0b5e6ebec
2018-10-08 14:24:08 -07:00
Pengquan Meng
23a405c016 Add isManualNetworkSelectionAllowed api to telephonyManager
Bug: 111453847
Test: build
Merged-In: Icdd60ab03fee4b2e7a08dda3c5c127a19ecac7ce
Change-Id: Icdd60ab03fee4b2e7a08dda3c5c127a19ecac7ce
2018-10-08 19:08:47 +00:00
TreeHugger Robot
10efed0b49 Merge "Remove SMS access for apps other than current SMS handler" 2018-10-06 20:14:06 +00:00
Sooraj Sasindran
e9bcb328bd Merge "Rename ANAS to ANS" 2018-10-06 03:41:26 +00:00
Eugene Susla
9351985f7a Remove SMS access for apps other than current SMS handler
Bug: 110098858
Test: atest android.telephony.cts.SmsManagerTest#testContentProviderAccessRestrictions
Change-Id: I9da992565b04ca5fa2656801fd2cfe4b196ef9b4
2018-10-05 16:51:13 -07:00
TreeHugger Robot
4ee3b6bb5e Merge "Fix SmsApplication.setDefaultApplicationAsUser()" 2018-10-04 21:09:22 +00:00