Commit Graph

27 Commits

Author SHA1 Message Date
Jordan Liu
e1b7ab1abe Do not modify passed in intent
If the caller wanted to use that intent object after passing it to this
method, it would be mutated in an unexpected way. Instead we create a
copy of the intent and broadcast that.

Bug: 144108192
Test: atest com.android.internal.telephony.CellBroadcastIntentsTest
Change-Id: I89e08b4a50beeb49410521baa9d449b2dc28ecd3
2019-12-09 15:45:21 -08:00
Meng Wang
dfc2459c7c Merge "SubscriptionPlan: move out of telephony" am: c4090312df am: 3172db5841
am: 405e5f3c15

Change-Id: I1c3921c9f10ac744a42490f1258fc67f30385b25
2019-12-06 15:27:41 -08:00
Treehugger Robot
c4090312df Merge "SubscriptionPlan: move out of telephony" 2019-12-06 23:12:58 +00:00
Meng Wang
4c17c814d8 Merge "SubscriptionPlan: move out of telephony" am: a11df59bb4 am: 968927d7ff
am: 088c61aaf4

Change-Id: Idefd8043655b3ab11b62f73a36989a149db35856
2019-12-06 14:03:31 -08:00
Meng Wang
1ba2871a02 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I3bfb0ec699f46b0cc34c3bc2e13bfb242bc295bf
2019-12-06 13:50:15 -08:00
Meng Wang
a11df59bb4 Merge "SubscriptionPlan: move out of telephony" 2019-12-06 21:37:52 +00:00
Meng Wang
36673a4b44 SubscriptionPlan: move out of telephony
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.

Bug: 145814152
Test: make
Change-Id: I4c7ae02f9f4f154c99263521e08265d6fb367272
2019-12-06 11:47:46 -08:00
Meng Wang
da2141d66a Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" am: 392f3db6b0 am: 484b1b87e0
am: d32f3a1db3

Change-Id: I63311ec4fecd388e595a864d94b3bbb4c1fe8b89
2019-12-06 00:32:55 -08:00
Meng Wang
5fce3f501b Merge "Move DataConnectionRealTimeInfo from telephony to core." am: 037b717fe8 am: d973a4b22c
am: cb7a8f3245

Change-Id: I0cf190f6e9e46b99ff14ff5b93ee82008a374f13
2019-12-06 00:27:48 -08:00
Meng Wang
392f3db6b0 Merge "Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager" 2019-12-06 00:32:40 +00:00
Meng Wang
62d2ff8b36 Move SIM_ACTIVATION_TYPE_* to TelephonyRegistryManager
Because the constants are only used by TelephonyRegistryManager and
TelephonyRegistry.

Bug: 140908357
Test: make
Change-Id: I6933d1aa5b8dc35f136c8c4aed8572221ddfb755
2019-12-05 21:32:03 +00:00
Meng Wang
fdf6fc2718 Move DataConnectionRealTimeInfo from telephony to core.
Bug: 145232482
Test: make
Change-Id: I11cce938c15c604d0a72dd5c11727afd63cfce31
2019-12-04 17:51:42 -08:00
Jordan Liu
5e21a0deaa Merge "Add API to send background intent" 2019-12-04 21:07:23 +00:00
Jordan Liu
45c0d54dfa Add API to send background intent
Test: manual
Bug: 144108192
Change-Id: I93c49d377921830a2ae83217a3fbef5026982319
2019-12-04 10:36:37 -08:00
Chen Xu
8713b167a9 expose APIs for mainline telephony-sdk
Those telephony SDK internal classes are referenced
by non-updatable framework/base classes.

Bug: 140908357
Change-Id: I943e2a2ca4ac1cb637cc237e580bd5cfca88a516
2019-12-02 15:00:03 -08:00
Chen Xu
b6d1319d1a telephony annotations part 2
adding missing annotations

Bug: 140908357
Test: Build

Merged-In: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
(cherry picked from commit f85cf993d3)
2019-11-20 14:09:16 -08:00
Hall Liu
dd4c7ab10c Fix build breakage caused by bad merge conflict
Fixes: 144808911
Test: compiles
Change-Id: I8ede11a58b9c5baa4720732657ec3a13fb263c64
2019-11-19 19:08:20 -08:00
Treehugger Robot
7622ccb5f0 Merge "Move RLog out of telephony module" 2019-11-20 01:59:18 +00:00
Hall Liu
f47ee8f193 Merge commit 'ae63546d19f91931a9a05015b149ddc19091c895' into manual_merge_ae63546d19f91931a9a05015b149ddc19091c895
Change-Id: Ic7b8ec208eaed5fc3a9f5ee90dac5ffeb9a18543
2019-11-19 17:25:46 -08:00
Meng Wang
e88b4d2918 Move RLog out of telephony module
Bug: 144374158
Test: make
Change-Id: I7702677c8bb2529655ef03fc0a27c33743ae01b5
Merged-In: If983bc315218486be73567cd1919d1f60250f670
2019-11-19 16:16:08 -08:00
Hall Liu
7ffa1d11bf Add new API for Telecom to send phone state
Add new API to replace Telecom's prior usage of hidden TelephonyRegistry
methods.

Bug: 141576016
Test: CTS
Change-Id: I0049f55e8eadaa144ad844026524197198700038
2019-11-15 18:29:16 -08:00
Hall Liu
80b82f13b4 Minor style correction to avoid merge conflict
Test: NA
Bug: 141576016
Change-Id: I51f4bd741a94e5f143d9ffba70a11b8234ee4d3d
Merged-In: I1b750751148925b4a7bd94553318907654012fc1
2019-11-15 18:29:05 -08:00
Chen Xu
8eb62f9485 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
Merged-In: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-11-15 18:02:40 -08:00
TreeHugger Robot
28c7e9c2ea Merge "Pipe through featureId from caller to permission checks in telephony code" 2019-11-15 18:18:02 +00:00
Philip P. Moltmann
33692f734f Pipe through featureId from caller to permission checks in telephony
code

A featureId is only used by runtime permissions.

Test: atest FrameworksTelephonyTests CtsAppOpsTestCases
Bug: 136595429
Change-Id: I7ef41e8961e48d40e5685c4a521e83cb20953e48
2019-11-14 13:40:55 -08:00
Meng Wang
ef2350fd09 Move RLog out of telephony module
Bug: 144374158
Test: make
Change-Id: If983bc315218486be73567cd1919d1f60250f670
2019-11-14 13:10:18 -08:00
Chen Xu
1f6cfa5399 non-mainline telephony related AIDL refactor/decoupling
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony

Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-10-16 15:30:24 -07:00