Commit Graph

7118 Commits

Author SHA1 Message Date
Shuo Qian
12a2b2ec6d Merge "Compare Emergency number display priority" am: a9d551ca7b am: 1f36225eaf
am: 8b1a350056

Change-Id: I3b84be0f8beba2d9108eeb4d43f4c633b837e368
2018-10-18 09:55:24 -07:00
Hall Liu
57d933fc2c Merge "Add new carrier configs for RTT" am: c6b2c9df68 am: bbaf7644b2
am: 3cdba1092b

Change-Id: I00307083adaf3c1b2b4866ab8c3db51f1dc24387
2018-10-18 09:26:02 -07:00
Chen Xu
21c589aa66 Merge "support mno carrier id" 2018-10-18 16:00:35 +00:00
TreeHugger Robot
a02e61107f Merge "Temporarily revert device identifier access check to previous behavior" 2018-10-18 15:59:18 +00:00
Shuo Qian
8b1a350056 Merge "Compare Emergency number display priority" am: a9d551ca7b
am: 1f36225eaf

Change-Id: Ie177f4fda621f5415f236bae305731ebcf7c34fe
2018-10-18 08:39:48 -07:00
Jack Yu
e4eab61e1a Merge "Supported v1.3 data profile" am: 1e4f6fbe23 am: 405ea01c54
am: 7413496e2c

Change-Id: Ibc6299f8b5a03e2f7228f462486342fed00ed67c
2018-10-18 08:33:01 -07:00
Hall Liu
3cdba1092b Merge "Add new carrier configs for RTT" am: c6b2c9df68
am: bbaf7644b2

Change-Id: Icdaa952d20034f9295c96023677d29f953594a98
2018-10-18 08:26:51 -07:00
Jack Yu
7413496e2c Merge "Supported v1.3 data profile" am: 1e4f6fbe23
am: 405ea01c54

Change-Id: Ia6737beb1fda5a01159a9ed52e5e26976744b9ab
2018-10-18 07:52:24 -07:00
Roland Levillain
9426e28727 resolve merge conflicts of acbcff9e7d to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 117349311
Change-Id: I1d07e5d6e749bd96cf322dd77422d6401233f081
2018-10-18 14:18:17 +01:00
chen xu
2e801e043e support mno carrier id
Bug: 110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
2018-10-17 22:07:40 -07: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
Shuo Qian
1f36225eaf Merge "Compare Emergency number display priority"
am: a9d551ca7b

Change-Id: I59d2226ba82c67af80ebbd7f976991f1ed4ee8c4
2018-10-17 17:19:35 -07:00
Hall Liu
bbaf7644b2 Merge "Add new carrier configs for RTT"
am: c6b2c9df68

Change-Id: I353d63a70d36cbac54ae0af826934409a6d67093
2018-10-17 17:11:11 -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
Shuo Qian
a9d551ca7b Merge "Compare Emergency number display priority" 2018-10-17 22:12:02 +00:00
Hall Liu
c6b2c9df68 Merge "Add new carrier configs for RTT" 2018-10-17 19:58:53 +00:00
Jack Yu
405ea01c54 Merge "Supported v1.3 data profile"
am: 1e4f6fbe23

Change-Id: Ib7292e5de8ff39879244e4922412287c9f4ce9ab
2018-10-17 10:44:06 -07:00
Jack Yu
1e4f6fbe23 Merge "Supported v1.3 data profile" 2018-10-17 15:56:41 +00: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
Shuo Qian
59c8b87ad4 Merge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c
am: a781751b32

Change-Id: Ib7d3dd0f7ce06edf736c493cde6778365c366ae2
2018-10-16 18:06:09 -07:00
Shuo Qian
a781751b32 Merge "Make SubscriptionManager.getSlotIndex public"
am: 719310cd2c

Change-Id: Ia942ecfefef8f26ff0b1f140c0692c81aebd11fa
2018-10-16 17:54:52 -07:00
Shuo Qian
719310cd2c Merge "Make SubscriptionManager.getSlotIndex public" 2018-10-17 00:37:35 +00:00
Chen Xu
a7274eb9b2 Merge "refactor radioPowerstate" 2018-10-17 00:14:45 +00:00
TreeHugger Robot
ce5c43379f Merge "Make SubscriptionManager.getSlotIndex public" 2018-10-16 23:07:29 +00:00
sqian
5660149817 Compare Emergency number display priority
Define the rules for emergency numbers that may have higher display
priority, and make Emergency number comparable for these values. This
is also essential for sorting the list so that an emergency number with
higher display priority should be listed in a lower index.

Test: Treehugger, unit test
Bug: 112657134
Change-Id: I46fb009ce862ec3c593a05b4b04e180faf198fc4
2018-10-16 14:44:53 -07:00
Jack Yu
72e3077715 Supported v1.3 data profile
1. Supported IRadio v1.3 data profile.
2. Do not send data profile list when the list is empty.
3. Only set profile id when the data profile must persist on the
   modem.

Test: Manual and unit tests
Bug: 73659459

Change-Id: I1414b5346cec1d617f7093c3761dbd77fe594a8b
2018-10-16 14:21:58 -07: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
9ec58ff433 Merge "Move SDK Check for getNeighboringCellInfo" 2018-10-16 16:50:22 +00: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
chen xu
6ea046e734 Merge "Telephony light grey list clean up for Q" am: b9749f750f
am: 700b5c3062

Change-Id: I22775147345a2c2159f18c49a94ec7e9d2a314a3
2018-10-15 16:02:42 -07:00
chen xu
700b5c3062 Merge "Telephony light grey list clean up for Q"
am: b9749f750f

Change-Id: Ia23066251baf4f1f876f7e80bfd31e465917d8dc
2018-10-15 15:44:17 -07:00
chen xu
e2592af979 Telephony light grey list clean up for Q
Bug: 112477300
Test: Telehony unit test
Change-Id: I5229224fe9a65b3647a42070f287e23f67084bda
2018-10-15 18:47:20 +00:00
sqian
996a318e8d Make SubscriptionManager.getSlotIndex public
- Make public
- Improved the documentation
- Rename subId to subscriptionId
- Make INVALID_SIM_SLOT_INDEX public

Test: Treehugger
Bug: 113072551
Change-Id: I61376966868f62db841ffd1b9c8ac045054e2207
Merged-In: I61376966868f62db841ffd1b9c8ac045054e2207
2018-10-15 17:30:22 +00:00
chen xu
253bdb7175 Telephony light grey list clean up for Q
Bug: 112477300
Test: Telehony unit test
Change-Id: I5229224fe9a65b3647a42070f287e23f67084bda
Merged-in: I5229224fe9a65b3647a42070f287e23f67084bda
2018-10-15 10:19:43 -07:00
Michael Groover
2422220258 Merge "Temporarily relax the privileged device identifier access check" 2018-10-13 20:26:57 +00:00
sqian
e29d4a7f45 Make SubscriptionManager.getSlotIndex public
- Make public
- Improved the documentation
- Rename subId to subscriptionId
- Make INVALID_SIM_SLOT_INDEX public

Test: Treehugger
Bug: 113072551
Change-Id: I61376966868f62db841ffd1b9c8ac045054e2207
2018-10-12 20:51:22 -07: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
Chen Xu
2a670634e3 Merge "refactor data/voice roaming states" am: 6bd29ab2df am: 652ec06948
am: 6169b04385

Change-Id: I921e3dd8f4c82d83d1f12657813945fbcc2e21b2
2018-10-12 11:57:14 -07:00
Chen Xu
6169b04385 Merge "refactor data/voice roaming states" am: 6bd29ab2df
am: 652ec06948

Change-Id: I1f82195e5477401f3216db92bbdac388bbe16c7f
2018-10-12 11:32:19 -07:00
Chen Xu
652ec06948 Merge "refactor data/voice roaming states"
am: 6bd29ab2df

Change-Id: Iac8184fe2dfdb7ff4c3d93ecb7c0c9dd9a7a46a5
2018-10-12 11:20:18 -07:00
Chen Xu
6bd29ab2df Merge "refactor data/voice roaming states" 2018-10-12 18:02:17 +00:00