Commit Graph

56 Commits

Author SHA1 Message Date
Meng Wang
e6a40697e1 System API used by telephony to bind to WapPushManager app.
Bug: 145179378
Test: make
Change-Id: Ibfb5ce49d20addcd19775d9e8d762945e71b9843
2020-01-08 13:52:19 -08:00
Meng Wang
1ce0f39441 Merge "ANY_DATA_CONNECTION_STATE_CHANGED: define locally" 2020-01-08 02:26:44 +00:00
Meng Wang
dd43acc58f ANY_DATA_CONNECTION_STATE_CHANGED: define locally
to cut the tie with telephony mainline module.

Bug: 147101086
Test: make
Change-Id: I2b749cadbbf425649b38786821025a1634fe4d4e
2020-01-07 14:05:25 -08:00
Nathan Harold
8b804f3308 Merge "Add Callback for Registration Failure" 2020-01-07 18:17:03 +00:00
Artur Satayev
df4395991f Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I288969b0c22fa3a63bc2e71bb5009fe4a927e154
2020-01-07 13:29:50 +00:00
Meng Wang
0c8855d36c SubscriptionPlan: remove getNetworkTypesBitMask
To avoid using hidden API TelephonyManager#getBitMaskForNetworkType

Bug: 140908357
Test: make
Change-Id: Ibb04fd43117d4b7cf9f768e6ccf9a8f605a2f5e8
2020-01-03 10:28:26 -08:00
Nathan Harold
5e6e983cad Add Callback for Registration Failure
Add a callback to PhoneStateListener to indicate that
a registration procedure has failed.

Bug: 143187047
Test: make update-api && make
Change-Id: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
2020-01-02 17:01:36 -08:00
Automerger Merge Worker
45b1f5ad60 Merge "Exposing voice connection status system APIs as public API" am: 96e8628049 am: 55cc8b27b8 am: 04e221f3f9
Change-Id: Icd243058227e34171c3c6f72de6d3eaf1fee9d6c
2019-12-21 03:02:41 +00:00
Automerger Merge Worker
04e221f3f9 Merge "Exposing voice connection status system APIs as public API" am: 96e8628049 am: 55cc8b27b8
Change-Id: Ic43b8d82f5caeca0a7339d77f4f53bebc408d871
2019-12-21 02:51:34 +00:00
Shi Lu
55cc8b27b8 Merge "Exposing voice connection status system APIs as public API"
am: 96e8628049

Change-Id: I222a9a2b44050825a4553b4b7baa7dfe7de3e046
2019-12-20 18:39:56 -08:00
Shi Lu
96e8628049 Merge "Exposing voice connection status system APIs as public API" 2019-12-21 02:31:36 +00:00
Meng Wang
d75f97d21e Use Parcelable CellIdentity instead of CellLocation in AIDL.
Currently CellLocation is passed over AIDL by manually
marshalling/unmarshalling to/from Bundle, and type info
is not preserved in the process.

Bug: 146092124
Test: make
Change-Id: I6225f100953a2ad354acaa261a774989926393ce
2019-12-20 10:50:09 -08:00
Nathan Harold
dcbe98371e Revert "[DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn"
This reverts commit d80dc8fed4.

Bug: 143082463
Test: compilation

Merged-In: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
Change-Id: I455788f72fc6dec23c0d0d24a1ca8ee9c2f637c9
2019-12-19 17:37:54 -08:00
Noah Zimmt
d80dc8fed4 [DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=6087936&lkbb=6087980&fkbb=6087980, b/146588413
Reverted Changes:
I8445808a0: Expose PreciseDataConnectionState to Public API
Ib6a769f5a: Expose PreciseDataConnectionState to Public API

Note: These CLs are correctly applied in master already.
      The revert should merge to qt-qpr1-dev-plus-aosp only
Change-Id: If98f8ba5f20073bade40f7b167ed185c2e4c0e1b
2019-12-20 00:43:41 +00:00
Nathan Harold
c95b4e5421 Expose PreciseDataConnectionState to Public API
1) Remove Unused Parameters for onDataConnectionState:
The data connection state broadcast includes a number of
parameters that are never used anywhere. To prepare for
updated code that relies on PreciseDataConnectionState,
remove the unused parameters that were internal-only and
included in the broadcast.

-LinkProperties
-NetworkCapabilities
-DataRoaming
-DataAllowed
-Interface name

2) Add Disconnecting State for Data Connections

Add a disconnecting state to correct a mismatch
between the internal and externally visible enums.

This will allow apps to know when connections are
in the process of being torn down, which in the case
of radio link issues could be as much as 15 seconds.

3) Expose PreciseDataConnection for Carrier Apps

Exposes the PSL for PreciseDataConnectionState along
with existing fields in the PreciseDataConnectionState
class.

-Make PreciseDataConnectionState public along with some
 of its fields.
-Expose onPreciseDataConnectionStateChanged.
-Add onPreciseDataConnectionStatesChanged to provide PDCS
 for all APNs in one cohesive batch.

4) Cache PreciseDataConnectionState by APN Type

In telephony registry, multiple different APN types
are all piped through the same cache entry, so every
time any APN changes relative to the previous type,
it triggers an update. This also means that when
a registrant requests the data connection state, only
the most recent type's state is updated.

This change caches entries in TelephonyRegistry based
on the APN's type (specifically the type among types
which triggered the change).

Bug: 143083105
Test: make update-api && make offline-sdk-docs
      (no functional change in this CL).
Test: atest FrameworksTelephonyTests

Merged-In: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
Change-Id: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
(cherry picked from commit 4d340f12c9)
2019-12-19 13:40:02 -08:00
Automerger Merge Worker
24931ee346 Merge "Remove PhoneStateLister#onOtaspChanged" am: 0d7a5dc2ea am: 6846fe997c am: de89306a0c
Change-Id: I576a3d67755efab9131dc8188d2911bdd497cf47
2019-12-17 21:50:42 +00:00
Meng Wang
6846fe997c Merge "Remove PhoneStateLister#onOtaspChanged"
am: 0d7a5dc2ea

Change-Id: Ide424903fac31549a660ded17d24c14fa4e5db5b
2019-12-17 13:25:04 -08:00
Nathan Harold
4d340f12c9 Expose PreciseDataConnectionState to Public API
1) Remove Unused Parameters for onDataConnectionState:
The data connection state broadcast includes a number of
parameters that are never used anywhere. To prepare for
updated code that relies on PreciseDataConnectionState,
remove the unused parameters that were internal-only and
included in the broadcast.

-LinkProperties
-NetworkCapabilities
-DataRoaming
-DataAllowed
-Interface name

2) Add Disconnecting State for Data Connections

Add a disconnecting state to correct a mismatch
between the internal and externally visible enums.

This will allow apps to know when connections are
in the process of being torn down, which in the case
of radio link issues could be as much as 15 seconds.

3) Expose PreciseDataConnection for Carrier Apps

Exposes the PSL for PreciseDataConnectionState along
with existing fields in the PreciseDataConnectionState
class.

-Make PreciseDataConnectionState public along with some
 of its fields.
-Expose onPreciseDataConnectionStateChanged.
-Add onPreciseDataConnectionStatesChanged to provide PDCS
 for all APNs in one cohesive batch.

4) Cache PreciseDataConnectionState by APN Type

In telephony registry, multiple different APN types
are all piped through the same cache entry, so every
time any APN changes relative to the previous type,
it triggers an update. This also means that when
a registrant requests the data connection state, only
the most recent type's state is updated.

This change caches entries in TelephonyRegistry based
on the APN's type (specifically the type among types
which triggered the change).

Bug: 143083105
Test: make update-api && make offline-sdk-docs
      (no functional change in this CL).
Test: atest FrameworksTelephonyTests

Change-Id: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
2019-12-16 16:16:51 -08:00
Meng Wang
66972daf11 Remove PhoneStateLister#onOtaspChanged
and replace with Registrant in Phone, since the callback is only used
inside telephony.

Bug: 140908357
Test: make
Change-Id: Ia86e9885f85d7f6b3698e96653add00e9b8670ed
2019-12-16 15:10:43 -08:00
Chen Xu
91c9100315 Merge "expose APIs for mainline telephony-sdk"
am: 0bc81e1d23

Change-Id: I0aff3aabfe041fdd24a7a18389b91a6471d3548c
2019-12-16 12:58:06 -08:00
Chen Xu
0bc81e1d23 Merge "expose APIs for mainline telephony-sdk" 2019-12-16 20:51:04 +00:00
Jordan Liu
e0c19be377 Merge changes from topic "cellbroadcastintents"
am: 6bcc4db8c0

Change-Id: Idd0a6a63731f996573f51e3343c3165d692d1adc
2019-12-12 16:02:56 -08:00
Jordan Liu
10373f032e Add API to send background intent
am: d0f439c43b

Change-Id: I82352ac4247dc785efef4c006a440d56e514f575
2019-12-12 16:02:48 -08:00
Jordan Liu
3fd1264acb 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
Merged-In: I89e08b4a50beeb49410521baa9d449b2dc28ecd3
2019-12-12 14:06:59 -08:00
Jordan Liu
d0f439c43b Add API to send background intent
Test: manual
Bug: 144108192
Change-Id: I93c49d377921830a2ae83217a3fbef5026982319
Merged-In: I93c49d377921830a2ae83217a3fbef5026982319
2019-12-12 13:08:12 -08:00
Shi Lu
12645d11e0 Exposing voice connection status system APIs as public API
Test: manual

Change-Id: I5e49f6e4bb3f513d2fb2dcce70b6416f8f80f4a8
2019-12-12 17:28:30 +00:00
Chen Xu
7c35a46442 expose APIs for mainline telephony-sdk
Those telephony SDK internal classes are referenced
by non-updatable framework/base classes.

Bug: 140908357
Change-Id: I943e2a2ca4ac1cb637cc237e580bd5cfca88a516
Merged-in: I943e2a2ca4ac1cb637cc237e580bd5cfca88a516
2019-12-12 00:18:49 -08:00
Meng Wang
d4e90d2e09 Merge "Style fix." 2019-12-10 00:24:32 +00:00
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
3c97f033c5 Style fix.
To avoid merge conflict with internal branch.

Test: make
Change-Id: I04636443ea70f0cbac784a910c3d57fa80bd6bcc
Merged-In: I1b750751148925b4a7bd94553318907654012fc1
2019-12-09 23:30:16 +00: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