Commit Graph

3684 Commits

Author SHA1 Message Date
Brad Ebinger
8a838a991d Merge "Query isEmergencySmsMode API when checking if emergency for GPS" am: dedc27142d am: 3b176bc1de
am: 6862694d61

Change-Id: Id37265bae6fc641b77073c16b5a1b9a54a49b750
2019-03-22 10:59:52 -07:00
Brad Ebinger
3b176bc1de Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
am: dedc27142d

Change-Id: Ieccb97fb300455e9338c022c46466bed355be79a
2019-03-22 10:36:07 -07:00
Brad Ebinger
dedc27142d Merge "Query isEmergencySmsMode API when checking if emergency for GPS" 2019-03-22 17:18:47 +00:00
Xiangyu/Malcolm Chen
764bf9cbeb Merge changes from topics "128902411", "128645056"
* changes:
  API Feedback for CBRS
  Remove clearDefaultsForInactiveSubIds.
2019-03-22 06:48:24 +00:00
Malcolm Chen
32240b572b API Feedback for CBRS
Bug: 128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
2019-03-21 21:52:32 -07:00
Michele Berionne
be4d9657a7 Merge "Modified MultiSim APIs"
am: c5461c4490

Change-Id: I12da49b887202f340be7f1a290bdc8c99863eac0
2019-03-21 12:07:24 -07:00
Michele Berionne
702540117f Merge "Modified MultiSim APIs" 2019-03-21 08:01:43 +00:00
Michele
8e17c7064d Modified MultiSim APIs
Capitalize S in Multisim.
isMultiSimSupported should return three states, to describe the three possible cases
(hardware not supported, hardware supported but carrier restricted, available)

Bug: 128524079
Test: compilation
Change-Id: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
Merged-In: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
2019-03-20 23:04:52 -07:00
Michele
6e1c1094d8 Modified MultiSim APIs
Capitalize S in Multisim.
isMultiSimSupported should return three states, to describe the three possible cases
(hardware not supported, hardware supported but carrier restricted, available)

Bug: 128524079
Test: compilation
Change-Id: Icbd36f714c577a965d39336d54d7224c8c2c7cd2
2019-03-20 17:18:56 -07:00
Brad Ebinger
5eeb79d4b5 Query isEmergencySmsMode API when checking if emergency for GPS
When location SUPL request comes in for GPS NI handler,
also check emergency SMS mode in telephony, which
is true for a carrier defined amount of time after an
emergency SMS is sent.

Bug: 126091115
Test: manual - send fake emergency sms, check api is true.
Change-Id: I34d26d2940af5b0c412e20ce3668344da8656339
2019-03-20 11:11:10 -07:00
TreeHugger Robot
3b7df49b05 Merge "When device ID access is revoked get app info as calling user" 2019-03-20 01:19:20 +00:00
Malcolm Chen
c4c05b6d92 Remove clearDefaultsForInactiveSubIds.
clearDefaultsForInactiveSubIds is no longer needed as Telephony
has internal logic to clear or update default settings automatically.

Bug: 128645056
Test: manual
Change-Id: Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9
2019-03-19 14:17:24 -07:00
Xiangyu/Malcolm Chen
2fa9c1c238 Merge "Remove SubscriptionManager#setMetered API." 2019-03-19 20:32:34 +00:00
Brad Ebinger
c6d673901a Merge "Emergency API review"
am: 853983ef32

Change-Id: Idcfa450fba2e08d825bbe2b95094a7e7f070421b
2019-03-18 16:50:54 -07:00
sqian
3b5f87f965 Emergency API review
1) Remove 'current' in Emergency APIs
2) Remove nullable
3) Handled the null Telephony service case
4) Hide getEmergencyServiceCategoryBitmask
5) Make getEmergencyUrns unmodifiable

Test: Treehugger
Bug: 122368381
Bug: 126699022
Bug: 126701211
Merged-In: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
Change-Id: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
2019-03-18 15:18:00 -07:00
Malcolm Chen
fd838e9585 Remove SubscriptionManager#setMetered API.
Bug: 123661746
Test: sanity
Change-Id: Ia6772dee1bd566e0be6b06455d92c923d2c01b12
2019-03-18 13:52:37 -07:00
Jordan Liu
ca075c3176 Merge "Add slot based ICC channel APIs"
am: e278d2bcdd

Change-Id: Ifaaddfc58ee684393bcabfc214d72746125ed158
2019-03-18 13:38:37 -07:00
Jordan Liu
e278d2bcdd Merge "Add slot based ICC channel APIs" 2019-03-18 18:36:54 +00:00
chen xu
0ede222bde add two more parameters to carrier id TestAPI
Bug: 128441910
Test: atest GtsGmscoreHostTestCases:com.google.android.gts.telephony.TelephonyHostTest
Change-Id: Ida6201b632153acd04b1a224d9f31706cbcf1999
2019-03-16 18:13:27 -07:00
Sooraj Sasindran
f6b0d994a7 Merge changes from topic "Porting-ONSAPIChanges"
am: 31c7607ee6

Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083
2019-03-15 12:53:18 -07:00
Sooraj Sasindran
31c7607ee6 Merge changes from topic "Porting-ONSAPIChanges"
* changes:
  Should not turn on validation for data
  Provide network bands in AvailableNetworkInfo
2019-03-15 19:31:55 +00:00
Michael Groover
ea196114fb When device ID access is revoked get app info as calling user
When a calling package from another user ID does not meet the new
requirements to access device identifiers its application info will
be queried to determine its target SDK. However since the permission
check for device identifiers runs as user 0 the current query would
look for the application info under user 0. This change queries for
the application info using the calling user ID to ensure the correct
info is returned and prevent any issues with an
INTERACT_ACROSS_USERS_FULL permission check.

Fixes: 128359188
Test: Manually verified app that queries Build#getSerial from work
      profile did not fail due to INTERACTS_ACROSS_USER_FULL perm.
Change-Id: Iaea4e3952bd1e329bde7de0ace004bb8478821f5
2019-03-14 18:36:37 -07:00
Jordan Liu
118895f571 Add slot based ICC channel APIs
These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.

Bug: 126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
Merged-In: I3f47a8ac07813ea9e326c7d76123352708bfeea2
2019-03-14 14:25:25 -07:00
Sooraj Sasindran
3b09d711f9 Should not turn on validation for data
Should not turn on validation for data switch every time.
Provide result as a callback

Test: verified manually
Bug: 126264455
Merged-In: I5df2311d91fdab34563148b4466163696e52faf9
Change-Id: I5df2311d91fdab34563148b4466163696e52faf9
2019-03-13 15:36:11 -07:00
Xiangyu/Malcolm Chen
851ec326d9 Merge "Don't return hidden subscription in getActiveSubIdList"
am: d2cb5a0608

Change-Id: Ie8d0998a15b2fa905ba5073f47badf51afd1154a
2019-03-12 16:12:05 -07:00
Jordan Liu
04c28872d1 Add slot based ICC channel APIs
These are SystemApis which require MODIFY_PHONE_STATE, and can be used
to open ICC channels when there is no available subscription, using the
slot index instead of subId.

Bug: 126578014
Test: builds
Change-Id: I3f47a8ac07813ea9e326c7d76123352708bfeea2
2019-03-12 22:09:31 +00:00
Malcolm Chen
9ac7e52a93 Don't return hidden subscription in getActiveSubIdList
Now getActiveSubscriptionInfoList will not return hidden
subscriptions. And getActiveSubIdList should be consistent
with it. In the mean time, internal SubscriptionController
API should have a way to specify if caller wants hidden
subscriptions or not.

Bug: 124690005
Test: manual
Change-Id: I46ccae88167c2988d71a6e07da2937bf9644a1f0
Merged-In: I46ccae88167c2988d71a6e07da2937bf9644a1f0
2019-03-12 14:09:33 -07:00
Daniel Huang
9b82062164 Merge "Modify API return type and add callback."
am: f96cc08066

Change-Id: I8d8ff3efd4666c4548dfe8a142ae0ad3f0b34b2c
2019-03-11 23:16:53 -07:00
Daniel Huang
f96cc08066 Merge "Modify API return type and add callback." 2019-03-12 06:02:04 +00:00
Chen Xu
ab85849ce7 Merge "rename precise carrier id to specific carrier id"
am: 118354f77c

Change-Id: I2ef97c1013e3e77b7ec4ec311eaa437503a758e8
2019-03-11 14:54:34 -07:00
Shuo Qian
36ad7638dc Merge "Emergency API review" 2019-03-11 18:39:35 +00:00
TreeHugger Robot
9b9406f8c1 Merge "Use a boolean Consumer instead of RoleManagerCallback." 2019-03-11 17:22:40 +00:00
danielwbhuang
a335880efe Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.

Test: build pass
Bug: 124616182
Merged-In: I32fe1407deabe36485227ec75931bec334d85abe
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
2019-03-11 20:02:16 +08:00
chen xu
2b0139ca18 rename precise carrier id to specific carrier id
Bug: 126727010
Test: atest CtsTelephonyTestCases

Change-Id: I4561ae8c15c429912695e0753b2ab3137a4e1e44
(cherry picked from commit 45f6621391)
Merged-in: I4561ae8c15c429912695e0753b2ab3137a4e1e44
2019-03-10 01:06:33 -08:00
Sooraj Sasindran
153a235d10 Merge "Modify API return type and add callback." 2019-03-09 05:44:06 +00:00
Hai Zhang
f5e8ccd88f Use a boolean Consumer instead of RoleManagerCallback.
And use RemoteCallback for it under the hood. This removes one AIDL
interface and allows using lambda, while aligning with what
PermissionControllerService does.

Bug: 127691087
Test: manual
Change-Id: Ia94e5bac59773380b2a4764d766bf6ff1dd5b7ff
2019-03-08 15:51:02 -08:00
Nazanin Bakhshi
26891a4429 Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE"
am: 016409b3d5

Change-Id: I2ced5079661da96b12c3359b6dc89412b585993a
2019-03-08 10:45:20 -08:00
Nazanin Bakhshi
016409b3d5 Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" 2019-03-08 18:25:59 +00:00
Chen Xu
556f2721d9 Merge "rename precise carrier id to specific carrier id" 2019-03-08 17:57:16 +00:00
Xiangyu/Malcolm Chen
7a2dd73329 Merge "Adding callback for setPreferredDataSubscriptionId."
am: 442084c722

Change-Id: Ic66db8504d02a22d8da38159e6d2fcf6decd1878
2019-03-08 06:19:31 -08:00
danielwbhuang
1f2850c472 Modify API return type and add callback.
1. Modify the type from boolean to void for updateAvailableNetworks().
2. Adding callback for updateAvailableNetworks().
3. Define error codes for update available networks results.

Test: build pass
Bug: 124616182
Change-Id: I32fe1407deabe36485227ec75931bec334d85abe
2019-03-08 12:30:15 +08:00
sqian
613c3d5826 Emergency API review
1) Remove 'current' in Emergency APIs
2) Remove nullable
3) Handled the null Telephony service case
4) Hide getEmergencyServiceCategoryBitmask
5) Make getEmergencyUrns unmodifiable

Test: Treehugger
Bug: 122368381
Bug: 126699022
Bug: 126701211
Change-Id: I6eb1d8a3ae1625ff3f43f983c488c2969649713b
2019-03-07 15:49:20 -08:00
Xiangyu/Malcolm Chen
442084c722 Merge "Adding callback for setPreferredDataSubscriptionId." 2019-03-07 22:47:31 +00:00
Malcolm Chen
db859e7ece Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE
Redefine a PhoneStateListener event so that it reflects which
subscription is currently being used for Internet data. It could
be default user data subscription or currently active opportunistic
subscription.

Bug: 124260187
Test: unittest
Change-Id: Icb90b5bd93845c29157cafddcd53335728638ec2
Merged-In: Icb90b5bd93845c29157cafddcd53335728638ec2
2019-03-07 19:20:47 +00:00
chen xu
45f6621391 rename precise carrier id to specific carrier id
Bug: 126727010
Test: atest CtsTelephonyTestCases

Change-Id: I4561ae8c15c429912695e0753b2ab3137a4e1e44
2019-03-06 17:54:01 -08:00
Malcolm Chen
fd11df2924 Adding callback for setPreferredDataSubscriptionId.
The purpose is to provide a way to return success or failure upon
switching data to CBRS subscription.
The same callback is used for ONS to call internal API. Later it
will also be used by Carrier apps to call TelephonyManager#
setPreferredOpportunisticDataSubscription.

Bug: 122255288
Test: manual

Change-Id: Id3f43e024c902d6785017e7866f9e804a486b04f
Merged-In: Id3f43e024c902d6785017e7866f9e804a486b04f
2019-03-06 14:54:41 -08:00
Andrei-Valentin Onea
20ebeb61a9 Merge "Add @UnsupportedAppUsage annotations"
am: 842e3aa420

Change-Id: Ie3bc96e663223de383be59cb764f139f459c5a67
2019-03-06 09:46:00 -08:00
Andrei-Valentin Onea
28eb381cae Merge "Add @UnsupportedAppUsage annotations"
am: 8cbc2e9ad1

Change-Id: I83a19c3b85546749e360ef979e8e6eeac09e29ea
2019-03-06 09:37:26 -08:00
Andrei-Valentin Onea
842e3aa420 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:19:05 +00:00
Andrei-Valentin Onea
8cbc2e9ad1 Merge "Add @UnsupportedAppUsage annotations" 2019-03-06 17:17:27 +00:00