Commit Graph

3868 Commits

Author SHA1 Message Date
Sarah Chin
92860a704b Handle 5G meteredness in telephony framework
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
2019-08-30 14:27:39 +00:00
satayev
6f09b69e9e Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b am: 6cb0b46b2a am: 9a5fea62c9
am: ff545cf558

Change-Id: I3301daf833937db137d32e7b07df0fe727499104
2019-08-15 15:36:15 -07:00
satayev
9a5fea62c9 Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8 am: 4a607da02b
am: 6cb0b46b2a

Change-Id: I9ea46ce95161b5560cde7352d8a2464eb45f099d
2019-08-15 14:01:06 -07:00
satayev
6cb0b46b2a Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8
am: 4a607da02b

Change-Id: I1516a6375c546f4af54984a4bff2ab2dcbc1783c
2019-08-15 13:39:04 -07:00
satayev
4a607da02b Merge "Move telephony/cdma/ classes into appropriate package."
am: 46c04b7bb8

Change-Id: I1fb05b0e09c492fa95af92e6b146364492177f61
2019-08-15 13:18:41 -07:00
TreeHugger Robot
9dfafd6a6f Merge "Add @UnsupportedAppUsage annotations to telephony-common." 2019-08-15 17:24:14 +00:00
Artur Satayev
7c3d157392 Add @UnsupportedAppUsage annotations to telephony-common.
See go/UnsupportedAppUsage for more details.

This is needed to not lose greylist information, by moving telephony-common from bootclasspath in ag/9025572.

Bug: 137350495
Bug: 139336111
Test: m

Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-08-15 14:59:06 +00:00
TreeHugger Robot
fb67fb4f13 Merge "replace hidden Context APIs" 2019-08-15 10:56:38 +00:00
TreeHugger Robot
4430cbd5c6 Merge "Don't log incomplete sms apps" 2019-08-15 09:08:18 +00:00
Artur Satayev
f772c13f9d Move telephony/cdma/ classes into appropriate package.
Not changing the java packages, but rather moving the source location. This allows running metalava on them.

Test: m
Change-Id: I3b46644361239d85818dd885f461dfc94de49dca
2019-08-14 10:48:10 +01:00
Eugene Susla
dcbc073c14 Don't log incomplete sms apps
It's suspicious for an app ro register for SMS_DELIVER broadcast but lack
required components to be considered for an sms app, but we can't do much
about it.

Test: presubmit
Fixes: 139274708
Change-Id: I0932a3d788da8a1535893615ed34a0970aebf865
2019-08-12 10:53:30 -07:00
Andrew Sapperstein
c8230fa7b5 Merge "Add a blacklist for preinstalled carrier apps." into qt-dev am: aa3689c4d9
am: 386126a450

Change-Id: Ifef573480a9b53feecb11daac978ab340ca59fa3
2019-08-08 14:40:06 -07:00
Andrew Sapperstein
386126a450 Merge "Add a blacklist for preinstalled carrier apps." into qt-dev
am: aa3689c4d9

Change-Id: I4a9898f5a205b7ff13ef8631870cbe3f8451923b
2019-08-08 14:30:33 -07:00
Andrew Sapperstein
60cc649995 Merge "Add a blacklist for preinstalled carrier apps." into qt-dev
am: aa3689c4d9

Change-Id: I00e9ee3cccfbe56d02e1d23edc35c87ad73ec85d
2019-08-08 14:30:31 -07:00
TreeHugger Robot
3d13c27d52 Merge "use @SystemAPI for creating UserHandle" 2019-08-08 18:30:01 +00:00
Andrew Sapperstein
e016781807 Add a blacklist for preinstalled carrier apps.
Allows an OEM to specify that a preinstalled carrier app, even if
TelephonyManager says it should have carrier privileges, does not
get granted the default permissions and does not get enabled when
a compatible SIM is inserted.

Bug: 138150105
Test: verified locally
Change-Id: I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac
Merged-In: I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac
2019-08-08 15:05:06 +00:00
Andrew Sapperstein
1a3158b8e1 Add a blacklist for preinstalled carrier apps.
Allows an OEM to specify that a preinstalled carrier app, even if
TelephonyManager says it should have carrier privileges, does not
get granted the default permissions and does not get enabled when
a compatible SIM is inserted.

Bug: 138150105
Test: verified locally
Change-Id: I0afec28f1f18227947c1fe9e6bb5fd0dad3b5dac
2019-08-07 23:51:50 +00:00
Chen Xu
05cba99462 replace hidden Context APIs
Bug: 137202333
Test: Build & Unit test
Change-Id: I1c0e364949aa6b518c126224097774066e089a17
2019-08-06 17:09:17 -07:00
Chen Xu
59d76e97bb use @SystemAPI for creating UserHandle
Bug: 137202333
Test: Build & Unit test
Change-Id: Id2a696bed6a80c92291c8f968f3aaa8db6bb83df
2019-08-05 11:39:13 -07:00
Chen Xu
6dcc20e79a apply correct @SystemAPI for PackageManager
Bug: 138772432
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSuspendPackage
Change-Id: I93441ed2dba933946aeaeabcfdb65e41bfccc447
2019-08-05 11:20:58 -07:00
Artur Satayev
70507ed5a1 Add @UnsupportedAppUsage annotations for max-p.
See go/UnsupportedAppUsage for more details.

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@

Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-08-01 19:46:29 +01:00
Chen Xu
84e8e76e63 Merge "use packageManager @SystemAPI" 2019-07-31 21:59:17 +00:00
Chen Xu
4b5f423c5c use packageManager @SystemAPI
Bug: 137202333
Test: Build
Change-Id: I1c0cb7840cb7d68fd720723eec96aa51aefc1df8
2019-07-30 15:21:03 -07:00
Chen Xu
324606e459 use @SystemAPI in AppOpsManager
Bug: 137202333
Test: Build & unit test
Change-Id: Ief8d20b62df5fcd99980182d9bb896bd82ac70e9
2019-07-29 16:09:24 -07:00
TreeHugger Robot
c3edd4a600 Merge changes from topic "providers"
* changes:
  Move few remaining permission methods
  Move providers to permission manager
2019-07-18 01:06:34 +00:00
Todd Kennedy
583378df9c Move providers to permission manager
Bug: 135279435
Test: atest PermissionUpdateListenerTest
Test: atest android.content.pm.cts.PackageManagerTest
Test: atest android.permission2.cts.RestrictedPermissionsTest
Test: atest TeleServiceTests
Test: atest DataConnectionTest
Change-Id: Ife563589929b2662c60e1a0ab0ec8f6a2d7e4c12
2019-07-16 13:09:33 -07:00
Hunter Knepshield
c3b90ecd40 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 4c452a6534

Change-Id: Ic5baff7a7530d473e6f78899442f6834df33cb3b
2019-07-12 11:33:37 -07:00
Jordan Liu
7dad5ea750 Merge "Use TM SubId in getDataState and getDataActivity" into qt-r1-dev 2019-07-12 18:29:05 +00:00
TreeHugger Robot
4c452a6534 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-07-12 18:00:48 +00:00
Xiangyu/Malcolm Chen
dbb897ee22 Merge changes from topic "135105735" into qt-r1-dev
am: 896cdfa547

Change-Id: Ie661fdc8a29645fa1b319cf1db8a896a8d21deae
2019-07-12 10:43:52 -07:00
Jordan Liu
44f9007474 Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27 am: 6ef6ff9ca1
am: 853c565de9

Change-Id: I450f32dbe6ce710afaf81950bcf5b683d2b479a6
2019-07-11 18:50:25 -07:00
Jordan Liu
853c565de9 Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27
am: 6ef6ff9ca1

Change-Id: I547a76c5da5f1ce58ed77853591ec1d4ba8f9318
2019-07-11 18:39:58 -07:00
Jordan Liu
6ef6ff9ca1 Merge "Use TM SubId in getDataState and getDataActivity"
am: 3968a18c27

Change-Id: I69e39b4867b78182217357d14ef96c966e3b7dd3
2019-07-11 18:30:26 -07:00
Malcolm Chen
ac56a4254e Provide @hide API to return merged IMSIs from grouping.
Bug: 135105735
Test: test app. Apply grouping and call the new API, to make sure
it returns correct values.

Change-Id: I99586976d3421d4b35be465201ee33cbb2dfd1d9
2019-07-11 13:19:36 -07:00
Nathan Harold
9d2660041a Use TM SubId in getDataState and getDataActivity
-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

(This CL is an un-revert of aosp/984377)

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: I035f2c44a7955e88608b1c336acb72fb68c3e450
Merged-In: I035f2c44a7955e88608b1c336acb72fb68c3e450
2019-07-11 12:39:31 -07:00
Nathan Harold
af984d0d4e Use TM SubId in getDataState and getDataActivity
-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

(This CL is an un-revert of aosp/984377)

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: I035f2c44a7955e88608b1c336acb72fb68c3e450
2019-07-11 11:52:55 -07:00
Hunter Knepshield
b26cbbd53d Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

NOTE: This is identical to ag/8193293, except that the
SubscriptionManager modifications don't make
getActiveSubscriptionIdList() static (it was causing test failures). A
further bug can be pursued to make everything static all at once.

Bug: 135684437
Test: manual
Change-Id: Iad6a3c2635e5eac2d33a16aa460b98394fd817f4
2019-07-10 13:14:44 -07:00
Eugene Susla
6e7bb1e7cf Merge "Fix sms app changed broadcast" into qt-dev am: 0a98e4b693
am: e5c5ec7316

Change-Id: Id0142e70768afdc4ae02f8c2f97137e984b563a7
2019-07-03 16:52:44 -07:00
Eugene Susla
e5c5ec7316 Merge "Fix sms app changed broadcast" into qt-dev
am: 0a98e4b693

Change-Id: I6223c8373f8e00446f5c7c51496bbacff6483be5
2019-07-03 16:32:02 -07:00
Eugene Susla
cbdc139229 Merge "Fix sms app changed broadcast" into qt-dev
am: 0a98e4b693

Change-Id: Ic2ab525c22b17afc97b5220a8c5b4ddd18db225b
2019-07-03 16:32:01 -07:00
Eugene Susla
0fa8049fe8 Fix sms app changed broadcast
Fixes: 136257475
Test: switch sms holder in settings, and ensure ceceived broadcasts for both
becoming and leaving the sms app status
Change-Id: I10dda3fd8ebd38ab12bdb8192ed4f3863f4238b8
2019-07-02 11:06:26 -07:00
Jordan Liu
d521d87d45 Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev
am: 85a55afa3e

Change-Id: Iefbc1fe1cb0967703a897068f433517108f087a0
2019-07-01 20:30:50 -07:00
TreeHugger Robot
85a55afa3e Merge "Revert "Check Carrier Privilege on Hidden Subs"" into qt-r1-dev 2019-07-02 02:11:37 +00:00
Nazanin Bakhshi
1ca89a995b Merge "Add device identifier permission checks to TelephonyPermissions" 2019-07-01 23:26:18 +00:00
Jordan Liu
3c41bb707b Revert "Check Carrier Privilege on Hidden Subs"
This reverts commit 6fc804b3f9.

Reason for revert: causes test failures b/136421546

Change-Id: I3b1dcd78aea6beeadb82626145e868954286bbee
2019-07-01 23:03:50 +00:00
Michael Groover
94672cea7c Add device identifier permission checks to TelephonyPermissions
Bug: 131916175
Fixes: 136305129
Test: atest PhoneSubInfoControllerTest
Change-Id: Icca98347ab76b7c3468b95756a33a758a3abde37
Merged-In: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2019-07-01 17:53:11 +00:00
Nathan Harold
00cf005bd1 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev
am: 09ef9e13a7

Change-Id: Ibb3792dfc28f93dfe96ea67367963b115dbff155
2019-06-28 23:22:35 -07:00
Nathan Harold
09ef9e13a7 Merge "Check Carrier Privilege on Hidden Subs" into qt-r1-dev 2019-06-29 06:07:52 +00:00
Nathan Harold
3b0cf87a5b Merge "Revert "Use TM SubId in getDataState and getDataActivity"" am: 4d4e2474ea am: f5ee9c61be
am: 22d0ed63cc

Change-Id: Ibb0e9d7f55c8f1ba6179e7afbd63e33c23628822
2019-06-27 16:06:15 -07:00
Nathan Harold
6fc804b3f9 Check Carrier Privilege on Hidden Subs
When calling CheckCarrierPrivilegeForAnySubId the
hidden subscriptions were not being taken into account
due to getAllActiveSubscriptionIds being a public method
that intentionally ignores hidden subscriptions.

Bug: 135684437
Test: manual
Change-Id: I7688e4fe25fd2c6ed22dc8edc508345c1a3d447c
2019-06-27 16:02:35 -07:00