Commit Graph

7771 Commits

Author SHA1 Message Date
Meng Wang
472a065d93 Merge "Move android.provider.Telephony to frameworks/base/core" am: 4d0df870cd am: 9b84a44f04
am: fba2c8041a

Change-Id: I9aab1a8bfe10a2fd661e0bd19452b4a66f6e1a2f
2019-11-27 13:44:06 -08:00
Meng Wang
fba2c8041a Merge "Move android.provider.Telephony to frameworks/base/core" am: 4d0df870cd
am: 9b84a44f04

Change-Id: Ib87b7648cf7cc19b267770a6f1fd910f751c7ab8
2019-11-27 13:38:32 -08:00
Meng Wang
9b84a44f04 Merge "Move android.provider.Telephony to frameworks/base/core"
am: 4d0df870cd

Change-Id: I1015777c7fa0e5b67ea3d9da4c14036842b527aa
2019-11-27 13:31:23 -08:00
Jordan Liu
ea6874a856 Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs" 2019-11-27 19:43:24 +00:00
Meng Wang
6b2264a1cb Move android.provider.Telephony to frameworks/base/core
Bug: 145232482
Test: make
Change-Id: I49a9e8b1b5e3c99f0ed84638fc9f79202b0189b3
2019-11-27 11:06:43 -08:00
Cheney Ni
d493f13043 Merge "Revert "Do not use hidden noteOpNoThrow"" 2019-11-27 10:09:35 +00:00
Zoey Chen
c2cf55d35a Merge "Add SystemApi and NonNull annotation" am: 79ca88e3b5
am: 13dc5222d1

Change-Id: Ic192d93c989dc0fead68a3ed17cec2ff3d40ca28
2019-11-27 02:08:34 -08:00
Zoey Chen
13dc5222d1 Merge "Add SystemApi and NonNull annotation"
am: 79ca88e3b5

Change-Id: Id11ab9f5b4d0ad2623bfa09aea47c2628c133b03
2019-11-27 02:02:49 -08:00
Zoey Chen
79ca88e3b5 Merge "Add SystemApi and NonNull annotation" 2019-11-27 08:41:32 +00:00
Cheney Ni
1427b33d8b Revert "Do not use hidden noteOpNoThrow"
This reverts commit 2290df3155.

Bug: 145257921
Reason for revert: Droidcop-triggered revert due to breakage, bug 145257921.

Change-Id: I95a27179083dbfbf5b3453ef3b45174f91594340
2019-11-27 07:48:35 +00:00
Sooraj Sasindran
ce5105c4fd Merge "Do not use hidden noteOpNoThrow" 2019-11-27 05:22:13 +00:00
Sooraj Sasindran
2290df3155 Do not use hidden noteOpNoThrow
Use system api version of noteOpNoThrow

Bug: 137202333
Test: unit test
Change-Id: I8ddadaa517b77a911f40d3969b0b0980a87adf9f
2019-11-27 03:18:47 +00:00
Sooraj Sasindran
f657633b6f Merge "Do not use hidden withCleanCallingIdentity" 2019-11-27 00:15:07 +00:00
Jordan Liu
15a727439f Expose some SystemApis and edit framework-cellbroadcast-shared-srcs
The APIs are used in the CellBroadcastService, and the
framework-cellbroadcast-shared-srcs library is also linked there.

Bug: 135956699
Test: manual
Change-Id: I5e71ea1ee1a858c0520c241dc7365733441e0f50
2019-11-26 15:26:11 -08:00
Sooraj Sasindran
19e876effb Do not use hidden withCleanCallingIdentity
Do not use hidden withCleanCallingIdentity API

Bug: 140908357
Test: make
Change-Id: I131f7affd811eb7a848ea230b332b53654e6fd43
2019-11-26 22:27:04 +00:00
Xiangyu/Malcolm Chen
a452be9d6f Merge "Add System API to indicate whether physical SIM can be disabled." 2019-11-26 18:37:41 +00:00
Meng Wang
58a95cc4c2 Merge "Telephony: do not use hidden API ArrayUtils." 2019-11-26 18:11:37 +00:00
Jiashen Wang
686df58861 Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" am: 936fd348f7
am: c478e51e9b

Change-Id: If10fb4a795415bca2a0be8d334ba6e6e738c819a
2019-11-26 10:11:17 -08:00
Jiashen Wang
c478e51e9b Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public"
am: 936fd348f7

Change-Id: I5e915d62c31a05a4b6d6a1e61df814444e68fb37
2019-11-26 10:06:08 -08:00
Jiashen Wang
936fd348f7 Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" 2019-11-26 17:56:55 +00:00
zoey chen
cb52ec37c8 Add SystemApi and NonNull annotation
Bug: 143738957
Test: make
Change-Id: I0e5c0e57c14dd18ab51d33a9552dba86ef4e6000
Merged-In: I0e5c0e57c14dd18ab51d33a9552dba86ef4e6000
2019-11-26 11:47:57 +08:00
Meng Wang
e5adf943f6 Merge "Expose API isInEmergencySmsMode" am: afb05a64c1
am: c5634216d7

Change-Id: I620ad9e5c268ea90b189cd8827909d8f1ba08aa2
2019-11-25 16:26:21 -08:00
Meng Wang
c5634216d7 Merge "Expose API isInEmergencySmsMode"
am: afb05a64c1

Change-Id: Ifb691669cc59b409490ab951db7f68160203b4d8
2019-11-25 16:20:20 -08:00
Meng Wang
afb05a64c1 Merge "Expose API isInEmergencySmsMode" 2019-11-26 00:13:00 +00:00
Meng Wang
3dfc84ef72 Expose API isInEmergencySmsMode
Bug: 145161090
Test: cts
Merged-In: Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec
Change-Id: Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec
2019-11-25 23:56:28 +00:00
Malcolm Chen
c5dedead28 Add System API to indicate whether physical SIM can be disabled.
Bug: 133379187
Test: build
Change-Id: I764f344b0d430cb49ccccc9f402139ea32e70c92
2019-11-25 15:36:06 -08:00
Jiashen Wang
7a48dfdcb7 Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public
Change
CarrierConfigMananger#KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to
a public API.
Bug: 128629337
Test: Manually tested on P20 device.

Change-Id: I9e214607d4b791f11c8b688268fa1d58d66c23fc
Merged-In: I9e214607d4b791f11c8b688268fa1d58d66c23fc
2019-11-25 15:06:49 -08:00
Meng Wang
8adec1b5d9 Merge "Expose API isInEmergencySmsMode" 2019-11-25 23:06:23 +00:00
Jiashen Wang
829ca16f1b Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" 2019-11-25 23:01:13 +00:00
Xiangyu/Malcolm Chen
19c52ea987 Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other."
am: 0f2c3d963d

Change-Id: I70fe3e46ce42dcb8ad7a344906735d1d55421fc7
2019-11-25 15:00:04 -08:00
Xiangyu/Malcolm Chen
62351088ee Merge "Add comment in getSubscriptionsInGroup about throwing IllegalStateException"
am: e14caf398e

Change-Id: I2d5160d893eb8c47556ba5101503bf3a7aafa195
2019-11-25 14:51:53 -08:00
Hall Liu
7e5a236984 Merge "Revert submission" 2019-11-25 21:36:11 +00:00
Hall Liu
7bdd72d23e Revert submission
Reason for revert: Broke a test: b/145140538

Change-Id: If4f76b6f4900bc5ddc0d372e0f0840bec0c7353f
2019-11-25 21:34:30 +00:00
Meng Wang
064b674358 Expose API isInEmergencySmsMode
Bug: 140908357
Test: cts
Change-Id: Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec
2019-11-25 13:33:26 -08:00
Meng Wang
60a46c5833 Telephony: do not use hidden API ArrayUtils.
Make a local copy instead.

Bug: 137202333
Test: make
Change-Id: I3218bca2d296c548b9d8427f70df8f7a33d0d449
2019-11-25 11:18:10 -08:00
Tomasz Wasilczyk
896d585ddd Merge "Allow null TransmitPowerRange ctor argument for ModemActivityInfo" 2019-11-25 18:18:17 +00:00
Jiashen Wang
48ae8d52c3 Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public
Change
CarrierConfigMananger#KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to
a public API.
Bug: 128629337
Test: Manually tested on P20 device.

Change-Id: I9e214607d4b791f11c8b688268fa1d58d66c23fc
2019-11-25 17:23:02 +00:00
TreeHugger Robot
bc56ea3551 Merge "Add change ID for platform compat" 2019-11-25 00:23:58 +00:00
Shuo Qian
4aeff5ba6e Merge "Introduce APIs for Emergency Number Database version" 2019-11-23 02:33:50 +00:00
Malcolm Chen
d9fc243c91 Don't allow reading IMSI of one active sub if only has carrier privilege
on the other.

Bug: 136123413
Test: unittest
Change-Id: I67a0121d3e965f193be9e827533646423502fe70
Merged-In: I67a0121d3e965f193be9e827533646423502fe70
2019-11-22 17:54:20 -08:00
Malcolm Chen
4f609c7834 Add comment in getSubscriptionsInGroup about throwing IllegalStateException
Bug: 142250528
Test: build
Change-Id: I57b87755f6ddf962721e620f869ff48370e3f2d6
Merged-In: I57b87755f6ddf962721e620f869ff48370e3f2d6
2019-11-22 17:54:17 -08:00
Sarah Chin
e068056cf4 Merge "Add NR to CellInfo" am: 35cf55c4eb
am: ad7bacce36

Change-Id: I23865ded492f2252137c846045c11360fda37823
2019-11-22 17:16:34 -08:00
Sarah Chin
ad7bacce36 Merge "Add NR to CellInfo"
am: 35cf55c4eb

Change-Id: I2753e3f851f1e3c3d2c617b5d930efc980ecaa7f
2019-11-22 17:10:58 -08:00
Sarah Chin
35cf55c4eb Merge "Add NR to CellInfo" 2019-11-23 01:05:04 +00:00
Sarah Chin
012ed94ad8 Add NR to CellInfo
Add HAL 1.4 to CellInfo, CellInfoNr, CellIdentityNr

Test: atest RILTest
Bug: 144874741
Change-Id: I9a34b57cebddb3be810b86080aff1022557c4c24
Merged-In: I9a34b57cebddb3be810b86080aff1022557c4c24
2019-11-22 15:54:58 -08:00
Sarah Chin
b63c1d95e4 Merge "Add NR to CellInfo" 2019-11-22 23:48:47 +00:00
Tomasz Wasilczyk
c6dd53b367 Allow null TransmitPowerRange ctor argument for ModemActivityInfo
There are existing usages in other Android code that pass null here,
causing a crash. Instead of fixing these other places (ctor is already
annotated as NonNull), let's just be graceful here as there is already
logic to handle empty input.

Bug: 143565652
Test: it builds
Change-Id: I86544bc47ff05f19a86e211fb1af87585ea68bd5
2019-11-22 22:39:57 +00:00
Jack Yu
563151db65 Merge "Added sub id to SmsCbMessage" 2019-11-22 17:28:43 +00:00
Sarah Chin
b2edb53b7d Add NR to CellInfo
Add HAL 1.4 to CellInfo, CellInfoNr, CellIdentityNr

Test: atest RILTest
Bug: 144874741
Change-Id: I9a34b57cebddb3be810b86080aff1022557c4c24
2019-11-21 17:41:38 -08:00
Hall Liu
68a00bcf3d Add change ID for platform compat
Add definition of the change ID for the APN permissions change for
platform compat.

Bug: 144631034
Test: compiles
Change-Id: I6388418453ddec5b4ff45efebd81ffabd62b64ba
2019-11-21 16:35:37 -08:00