Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
460,899 Commits 3 Branches 0 Tags
13c4957cb4e483edccd603d6c677ec169124db21
Commit Graph

4295 Commits

Author SHA1 Message Date
Jayachandran Chinnakkannu
ff27c7aa44 Merge "Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE" 2020-01-16 00:13:13 +00:00
Nathan Harold
bbc2aaeaaa Merge changes from topic "barring-info" 
* changes:
  Add a BARRING_TYPE_UNKNOWN for Unreported Barring
  Add Callback to notify changes of barring status
 2020-01-16 00:06:07 +00:00
Jayachandran C
f0a973b564 Add new system API constant DEFAULT_PREFERRED_NETWORK_MODE 
Bug: 140768340
Test: Following tests have been done
atest packages/services/Telephony/tests/
atest frameworks/opt/telephony/tests/telephonytests/
Manual sanity to check basic telephony

Change-Id: Ia114e4546d88e294ed37b6632a1eae6a06fbf7bc
 2020-01-15 13:45:07 -08:00
Automerger Merge Worker
d3cb54c8d9 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23 am: f01f6aec2f 
Change-Id: I93ebc67677fc326871ba151a4b6bae0bc60e197d
 2020-01-15 03:36:50 +00:00
Automerger Merge Worker
f01f6aec2f Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" am: b498fbf860 am: b7336f1d23 
Change-Id: If317967b103c8b797a74b089c13b518c33b60465
 2020-01-15 03:24:56 +00:00
Allen Su
b498fbf860 Merge "[RCS] Implement notifyRcsAutoConfigurationReceived()" 2020-01-15 02:42:27 +00:00
Nathan Harold
c564b1dc33 Add Callback to notify changes of barring status 
-Create a BarringInfo class to pass Barring information
 from HAL to PhoneStateListener.
-Add a multi-callback registrant so that ServiceStateTracker
 and potentially DcTracker can also listen to barring info in
 the future.

Bug: 143226991
Test: make update-api && make && atest BarringInfoTest
Change-Id: I08240259f3142beeca991238bf705236f0303954
 2020-01-14 13:54:09 -08:00
Daniel Bright
f16dc0708a Merge "Rewriting phone constants for mainline" 2020-01-14 21:14:35 +00:00
Automerger Merge Worker
b74675a238 Merge changes Iec082f0c,I86a479af am: 52cc4a4321 am: 30a1749f8e 
Change-Id: Ibf943b652da9c94aedd8c58952cf84b90e7bdca2
 2020-01-14 19:21:07 +00:00
Automerger Merge Worker
f30c746b69 Merge "Add new @SystemApis for RCS dependencies" am: 6408fa473f am: dd840cdaae 
Change-Id: I307990e1b794a659b5110406794ba927d223be86
 2020-01-14 18:17:11 +00:00
Meng Wang
52cc4a4321 Merge changes Iec082f0c,I86a479af 
* changes:
  telephony/common/* should use android.util.Log
  Use com.android.telephony.Rlog for mainline module.
 2020-01-14 18:06:22 +00:00
Brad Ebinger
6408fa473f Merge "Add new @SystemApis for RCS dependencies" 2020-01-14 17:31:36 +00:00
allenwtsu
f7ce51f9cf [RCS] Implement notifyRcsAutoConfigurationReceived() 
Bug: 147122370
Test: build pass
Change-Id: I239c53806b148e899d8078c469731f05e8b97885
 2020-01-14 14:30:01 +08:00
Daniel Bright
4bcbfce5fc Rewriting phone constants for mainline 
* Exposing Emergency extra constants through TelephonyManager
* Always reading or writing PhoneConstants.SubscriptionKey
with SubscriptionManager.EXTRA_SUBSCRIPTION_KEY

Bug: 147465477
Test: FrameworksCoreTests, FrameworksServicesTest, CarrierTests
Change-Id: I84d6687ca6cab86c8c68dc2dd2679cfee0919c1e
 2020-01-13 16:07:48 -08:00
Automerger Merge Worker
d01f21c4d2 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" am: b1c730d069 am: a2d0828670 am: 0a235b9416 
Change-Id: I2d09de57c3ec3e501ea1b0d9b92430547d9cf6e4
 2020-01-13 23:28:05 +00:00
Automerger Merge Worker
0a235b9416 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" am: b1c730d069 am: a2d0828670 
Change-Id: I8ad4301faeded70e3d298088816fc72b75b4bc2e
 2020-01-13 23:22:01 +00:00
Allen Su
b1c730d069 Merge "[RCS] Add set/getRcsProvisioningStatusForCapability()" 2020-01-13 23:15:14 +00:00
Xiangyu/Malcolm Chen
34fb1da756 Merge "Move ACTION_CARRIER_* intent and extras from TelephonyIntents to TelephonyManager." 2020-01-13 21:56:31 +00:00
Brad Ebinger
10327316a9 Add new @SystemApis for RCS dependencies 
As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Merged-in: Id25bfffc1c40db8b183206dc598165272da7356c
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
 2020-01-13 13:38:07 -08:00
Automerger Merge Worker
8d2f9806c7 Merge "Add Callback for Registration Failure" am: 93db49faec am: 5532d79f90 
Change-Id: I5e6e2b3b41b24e6122963644633d63d14e8a7605
 2020-01-13 21:24:06 +00:00
Treehugger Robot
93db49faec Merge "Add Callback for Registration Failure" 2020-01-13 20:58:00 +00:00
Meng Wang
6d3e821058 Use com.android.telephony.Rlog for mainline module. 
Bug: 144374158
Test: make
Merged-In: I86a479affb8e0fa8e48734324a6a05c68230d910
Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
 2020-01-13 10:32:55 -08:00
Automerger Merge Worker
dea27d3676 Merge "[Telephony Mainline] Add new api for Mvno matching" am: 2d83e92bbd am: dc4bd96c79 
Change-Id: Iccb0bbb7247fba66348b488894de01717bd9254a
 2020-01-13 17:23:02 +00:00
Calvin Pan
2d83e92bbd Merge "[Telephony Mainline] Add new api for Mvno matching" 2020-01-13 16:54:50 +00:00
Automerger Merge Worker
62dba7a4e6 Merge "Use new UnsupportedAppUsage annotation." am: b2c3eaaf10 am: 904b7f9de2 
Change-Id: I62868fbcba5ffd65a441808e2a0cda59c9597654
 2020-01-13 14:37:21 +00:00
Treehugger Robot
b2c3eaaf10 Merge "Use new UnsupportedAppUsage annotation." 2020-01-13 14:27:29 +00:00
changbetty
9ec425857c [Telephony Mainline] Add new api for Mvno matching 
Bug: 144977430
Test: make
Change-Id: I550e93ab8662c81068a6d52fef2e3c299607c18f
Merged-In: I550e93ab8662c81068a6d52fef2e3c299607c18f
 2020-01-13 05:01:44 +00:00
Nathan Harold
c41cb737ed 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
Merged-In: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
Change-Id: I4a4ba4479dfd465a9d8063135f3b4bf4e1323e99
(cherry picked from commit 5e6e983cad)
 2020-01-12 10:33:03 -08:00
TreeHugger Robot
c54923ca57 Merge "Add new @SystemApis for RCS dependencies" 2020-01-11 02:54:22 +00:00
Malcolm Chen
93fcf24a23 Move ACTION_CARRIER_* intent and extras from TelephonyIntents to 
TelephonyManager.

The purpose is to expose them as @SystemApi as they are used externally.

Bug: 140908357
Test: unittest
Change-Id: I3dabcb853ebbd648b20d97b446db11476780be25
 2020-01-10 16:39:36 -08:00
Automerger Merge Worker
df1499d027 Merge "Add a copy of Rlog for the telephony mainline module" am: 00fe08f5bf am: 9fc52ab1fc 
Change-Id: I6cb1ffe87de13320e7ac166e9392ecdc59f8027c
 2020-01-10 22:20:16 +00:00
Meng Wang
00fe08f5bf Merge "Add a copy of Rlog for the telephony mainline module" 2020-01-10 22:05:03 +00:00
Brad Ebinger
f8e4614a91 Add new @SystemApis for RCS dependencies 
As part of mainline, remove telephony dependencies from RcsService
and PresencePolling apps.

Bug: 147319232
Test: atest CtsTelephonyTestCases
Change-Id: Id25bfffc1c40db8b183206dc598165272da7356c
 2020-01-10 13:24:12 -08:00
Automerger Merge Worker
ab6c0737f9 Merge changes from topic "146593004" am: 3863c17fd2 am: acf7918f60 
Change-Id: I49421bb2304df82c44e6c8204b9f89fb843590b9
 2020-01-10 19:24:39 +00:00
Makoto Onuki
eba9902300 Add a copy of Rlog for the telephony mainline module 
Bug: 144374158
Test: boot
Merged-In: I5be0497a17d00152286fe3351bf58e75b675ceb6
Change-Id: I5be0497a17d00152286fe3351bf58e75b675ceb6
(cherry picked from commit 57e56f2d3c)
 2020-01-10 11:05:43 -08:00
Xiangyu/Malcolm Chen
3863c17fd2 Merge changes from topic "146593004" 
* changes:
  Remove usage of @hide @Deprecated Telephony API in NPMS
  Use proper Telephony API to supply sim pin and puk.
  Hook supplyPin and supplyPuk to proper impl with subId specified
 2020-01-10 18:53:42 +00:00
Jayachandran Chinnakkannu
40d1c39d69 Merge "Move ACTION_SIGNAL_STRENGTH_CHANGED to local" 2020-01-10 18:26:37 +00:00
Sarah Chin
0262cb7765 Merge "5G meteredness for telephony framework" 2020-01-10 16:36:48 +00:00
Sarah Chin
325287407f 5G meteredness for telephony framework 
Added networkTypes to SubscriptionPlan
Send SubscriptionPlans as dispatch via listener
Updated API for R

Bug: 139070884
Test: atest FrameworksTelephonyTests
Test: atest cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
Change-Id: Idb67fb7676adf9e1158113e7b8b08e655f470920
Merged-In: Idb67fb7676adf9e1158113e7b8b08e655f470920
(cherry-pick from ag/9459941)
 2020-01-09 22:48:59 -08:00
Automerger Merge Worker
a6110193f8 Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." am: 9bda007cb8 am: a881005317 
Change-Id: I14834c28abb17cdc0397950470e45f4e73462dff
 2020-01-10 04:46:53 +00:00
Meng Wang
9bda007cb8 Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." 2020-01-10 04:25:45 +00:00
Sarah Chin
80b73b9e1c 5G meteredness for telephony framework 
Added networkTypes to SubscriptionPlan
Send SubscriptionPlans as dispatch via listener
Updated API for R

Bug: 139070884
Test: atest FrameworksTelephonyTests
Test: atest cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
Change-Id: Idb67fb7676adf9e1158113e7b8b08e655f470920
Merged-In: Idb67fb7676adf9e1158113e7b8b08e655f470920
(cherry-pick from ag/9459941)
 2020-01-09 19:45:14 +00:00
Artur Satayev
54af4fc42a 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: I547d7fb2e6bc2e9707bbc0d14dc1e8cd632c5a23
Merged-In: I547d7fb2e6bc2e9707bbc0d14dc1e8cd632c5a23
 2020-01-09 13:52:18 +00:00
Sarah Chin
df94694c42 Merge "Handle 5G meteredness in telephony framework" 2020-01-09 05:03:24 +00:00
Meng Wang
b8ffe81593 Use com.android.telephony.Rlog for mainline module. 
Bug: 144374158
Test: make
Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
 2020-01-09 04:42:58 +00:00
Meng Wang
8af4d4ad78 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
Merged-In: I6225f100953a2ad354acaa261a774989926393ce
Change-Id: I6225f100953a2ad354acaa261a774989926393ce
 2020-01-08 20:29:27 -08:00
Automerger Merge Worker
e576ba8f8d Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce5293 am: f5a037d685 
Change-Id: I09813d60dacabbd98e395816f9d7cb6d965a4f19
 2020-01-09 03:45:21 +00:00
Treehugger Robot
0104ce5293 Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" 2020-01-09 02:48:14 +00:00
Sarah Chin
0b7efca5e6 Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-09 02:23:13 +00:00
Sarah Chin
1431ab2ee5 Handle 5G meteredness in telephony framework 
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
 2020-01-09 02:13:47 +00:00