Commit Graph

2861 Commits

Author SHA1 Message Date
Peter Wang
0ddf44070b [API Review] APIs in SubscriptionManager
Bug: 146362772
Bug: 148180034
Test: atest SubscriptionControllerTest, TelephonyDatabaseHelperTest, TelephonyProviderTest
Change-Id: I77cad8f828ac38976355b7a5f3e8d757b73694ca
Merged-In: I77cad8f828ac38976355b7a5f3e8d757b73694ca
2020-03-19 16:06:52 -07:00
Shuo Qian
9ae1afee27 API Council Feedbacks
1) Update doc of ACTION_UPDATE_EMERGENCY_NUMBER_DB
2) Add new APIs EXTRA_VERSION and EXTRA_REQUIRED_HASH
3) Rename isDataConnectionEnabled to IsDataConnectionAllowed
4) Format the API documentations with html format
5) Throw errors for shutdownAllRadios, isAnyRadioPoweredOn
6) Modify the doc of TelephonyManager.getEmergencyNumberDbVersion
7) Add UPDATE_CONFIG permission for ACTION_UPDATE_EMERGENCY_NUMBER_DB

Test: Treehugger; Manual made a call; make -j offline-sdk-docs
Bug: 147696692
Bug: 147805285
Bug: 148217670
Bug: 148218347
Change-Id: Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754
Merged-In: Idf3dee3de5ebf75ca8b8fbaaf879e69f7ae4b754
(cherry picked from commit dc86120fca)
2020-03-10 21:53:36 +00:00
Daniel Bright
71d3dacaa7 Switched out PhoneConstants.PhoneKey
Test: FrameworksTelephonyTests TeleServiceTests TelephonyProviderTests
Bug: 147465477
Merged-In: I2e147c9dc4383f7979740f2fd3ded44cd7d060e4
Change-Id: I2e147c9dc4383f7979740f2fd3ded44cd7d060e4
2020-03-09 18:03:23 -07:00
Automerger Merge Worker
d676d83bf9 Merge changes from topic "displayinfo" am: cf66c06c32
Change-Id: I174e073cd5b0423666a3be6d8cac8efbdbd25414
2020-03-03 21:21:06 +00:00
Jack Yu
05c4fe1301 Move override logic from SysUI to Telephony
Test: atest NetworkControllerDataTest, NetworkControllerSignalTest
Bug: none
Change-Id: I4519d6671297de10cc573b607d21ab030b497950
Merged-In: I4519d6671297de10cc573b607d21ab030b497950
2020-03-03 11:36:14 -08:00
Automerger Merge Worker
5a935b209f Merge "Rewriting phone constants for mainline" am: 03c3d36ce8
Change-Id: I354cec0b3891a8cdc1f8069dd6b7de523a08aa5f
2020-03-02 20:39:58 +00:00
Daniel Bright
0b5d2852b3 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
Merged-In: I84d6687ca6cab86c8c68dc2dd2679cfee0919c1e
Change-Id: Ic02e02a4b1ac989a974938dc87118a6f7c926e9e
2020-02-27 11:26:11 -08:00
Automerger Merge Worker
75e9dfa509 Merge "Make hidden API isDataCapable for Telephony" am: a4335f0840
Change-Id: I9de9160762fa625267026dc376c591242a3287e8
2020-02-06 04:22:39 +00:00
Shuo Qian
a4335f0840 Merge "Make hidden API isDataCapable for Telephony" 2020-02-06 04:07:37 +00:00
sqian
3ba4afa5d5 Make hidden API isDataCapable for Telephony
Rename isDataCapable to isDataConnectionEnabled as a System API for
 System UI.

Cherry-picking TelephonyManager part of ag/10063635

Test: RILTest; Treehugger; cts
Bug: 147017757
Merged-In: I96b45575eb7f030f3dcb9539c06f8ec25539e2e9
Merged-In: I19ac83f5865e8763cd9414c41d4609f79d0db164
(cherry picked from commit 291415806f)

Change-Id: I96b45575eb7f030f3dcb9539c06f8ec25539e2e9
2020-02-04 18:36:00 -08:00
Peter Wang
caabef3f2c Merge "[Telephony Mainline] Expose APIs in SubscriptionManager"
am: c0e02ab436

Change-Id: I8599664e033e579f18acf30203fa3ff9207122a2
2020-01-24 10:37:27 -08:00
Treehugger Robot
c0e02ab436 Merge "[Telephony Mainline] Expose APIs in SubscriptionManager" 2020-01-24 18:31:32 +00:00
Automerger Merge Worker
1702fe47fd Merge "Move filterMobileSubscriptionInSameGroup into KeyguardUpdateMonitor." am: 263fe3768c
Change-Id: I47a1be725673ddbb8f3915b349d9610c48b8ceda
2020-01-24 17:45:42 +00:00
Treehugger Robot
263fe3768c Merge "Move filterMobileSubscriptionInSameGroup into KeyguardUpdateMonitor." 2020-01-24 17:35:39 +00:00
Peter Wang
78af57db36 [Telephony Mainline] Expose APIs in SubscriptionManager
Bug: 146362772
Fix: 146362772
Test: Build, TelephonyProviderTest
Merged-In: Icaff3117cab45e6458931a600fa8d63821e0fe13
Change-Id: Icaff3117cab45e6458931a600fa8d63821e0fe13
2020-01-23 13:03:37 -08:00
Malcolm Chen
43ed6f45ed Move filterMobileSubscriptionInSameGroup into KeyguardUpdateMonitor.
This avoids race condition that, KeyguardUpdateMonitor refreshes active
sub list however CarrierTextController filtered it based on stale active
data subId.

By move filterMobileSubscriptionInSameGroup into KeyguardUpdateMonitor,
it becomes the single source of truth about which carrier name should be
shown.

Bug: 138456731
Test: manual and unittest
Merged-In: Ida3a90c5408b056cad7a79fbba84fe880ce1e5be
Change-Id: Ida3a90c5408b056cad7a79fbba84fe880ce1e5be
2020-01-23 13:02:52 -08:00
Meng Wang
7961f0d579 Merge "Use Intent.EXTRA_REBROADCAST_ON_UNLOCK instead of hidden API"
am: 9222283997

Change-Id: I2df7a271747582d519e6fade06e3e8ee599dc764
2020-01-22 10:12:31 -08:00
Meng Wang
0e8d91a230 Use Intent.EXTRA_REBROADCAST_ON_UNLOCK instead of hidden API
Bug: 147912059
Test: make
Change-Id: Iae022db9c8ae39e9f55034c91b98ca82869933c9
2020-01-17 15:58:13 -08:00
Xin Li
e13851556b DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
Treehugger Robot
922ec35d28 Merge "Replace usages of ServiceState#getDataNetworkType" 2020-01-15 04:05:36 +00:00
SongFerngWang
798d0baa26 mainline:Replace serviceState.getDataRegState and getVoiceRegState
Replace serviceState.getVoiceRegState with getState
Replace serviceState.getDataRegState with getDataRegistrationState

Bug: 146637978
Test: atest NetworkControllerBaseTest (PASS)
atest CarrierTextControllerTest (PASS)

Change-Id: I0cbdfd5d3de3a78326703ede1640f01430bae18a
Merged-In: I0cbdfd5d3de3a78326703ede1640f01430bae18a
2020-01-10 13:09:51 +08:00
Hall Liu
5a95a70964 Replace usages of ServiceState#getDataNetworkType
Replace usages of ServiceState#getDataNetworkType with equivalent
@SystemApi methods

Test: atest NetworkControllerEthernetTest NetworkControllerSignalTest
NetworkControllerWifiTest NetworkControllerDataTest
Test: visual inspection of the status bar
Bug: 146834818

Change-Id: Iab62fed8cdba659d39e12a264d239bb3d8917ee8
2020-01-07 13:03:24 -08:00
Xin Li
dd7e1b8a32 DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-master
Change-Id: I2b5667dbbb21f5be830f9338c8cb32d4778ed0c1
2020-01-02 13:29:43 -08:00
Automerger Merge Worker
f5877dcd5c Merge "Get clock title on demand" am: 7da7428409 am: f17c2e2e8e
Change-Id: I63553cffba04f6082c09cb2561dc737dcb7faffc
2019-12-16 15:06:38 +00:00
Treehugger Robot
7da7428409 Merge "Get clock title on demand" 2019-12-16 14:45:23 +00:00
Automerger Merge Worker
bf85fd9e0f DO NOT MERGE - Do not show Bluetooth icon when headset is not active am: 91182f3507
Change-Id: If5a5aad9444a1a55f2ba2fa22f52e529d5a29219
2019-12-16 11:20:33 +00:00
Robert Snoeberger
61d1af8031 Get clock title on demand
Don't cache the title so that a new title can be retreived when the
language changes.

Bug: 124813345
Test: Open picker app, change language, check that language updates in
picker app.

Change-Id: Iab1c70f965154b3bf10ee98c73db2443c4d83c36
2019-12-13 17:02:40 -05:00
Automerger Merge Worker
fd02e6e693 Merge "ServiceState merges voice and data into a single value" am: 72f579d5f2 am: 4b108f74f6
Change-Id: Ia68eb336d8b916cb93b83ba14b6423560f29a42d
2019-12-13 21:48:35 +00:00
SongFerngWang
afd025f4ab ServiceState merges voice and data into a single value
The voice and data is the same for operator name at ServiceState.
So ServiceState merges voice and data into a single value.
- merge the voice and data OperatorAlphaLong,OperatorAlphaShort, and
OperatorNumeric.

Bug: 144663018
Test: Build pass.
      atest NetworkControllerDataTest (PASS)
      atest ServiceStateTest (PASS)
      atest TelephonyMetricsTest (PASS)
      atest ServiceStateProviderTest (PASS)

Change-Id: I67e4a822c792bf9a9e174146ef8d65d9927d7612
Merged-In: I67e4a822c792bf9a9e174146ef8d65d9927d7612
2019-12-12 22:10:04 +08:00
Automerger Merge Worker
896414c79d DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time" am: b0d526ac12
Change-Id: Id030fe62bd5d665e291ce6ac11b03fdaf1f2af88
2019-12-11 23:26:29 +00:00
Ugo Yu
91182f3507 DO NOT MERGE - Do not show Bluetooth icon when headset is not active
Do not show Bluetooth icon when A2DP, HFP and Hearing
aid profiles are connected but not active.
Other Bluetooth profile will retain the same behavior.

Bug: 144061558
Test: atest com.android.systemui.statusbar
Change-Id: Id0fab356f041e90a7654c8e18185c6aa15e2d4df
2019-12-11 13:06:09 +00:00
Evan Laird
b0d526ac12 DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time"
See CL with change id (I0680034ed9315aa2c05282524d48faaed066ebd0) for
the meaningful changes/description. This change was reverted in qt-qpr1-dev
in order to fix a bug but never got unreverted due to the qt-dev CL
having the same change-id as the reverted one.

Bug: 119041698
Test: atest NotificationManagerServiceTest
Test: atest ForegroundServiceNotificationListenerTest
Change-Id: I50f16072b0e56ab69aabf8010ffffd172ca7c05a
2019-12-09 17:15:00 -05:00
Peter Wang
cead28dcee Merge "[Telephony Mainline] Expose hidden APIs and consts" am: 415143daf5
am: cfffdedc87

Change-Id: I26b52ec69d769591243c65caaec8066f1744d7a7
2019-12-04 15:55:20 -08:00
Peter Wang
415143daf5 Merge "[Telephony Mainline] Expose hidden APIs and consts" 2019-12-04 23:39:50 +00:00
Peter Wang
98598bfe16 [Telephony Mainline] Expose hidden APIs and consts
Exposing constants that were originally hidden

Test: build
Bug: 140908357
Change-Id: I12b8d338a58c0ffe294137171b8bac7d80a0b776
Merged-In: I12b8d338a58c0ffe294137171b8bac7d80a0b776
2019-12-03 19:12:47 +00:00
Wilson Wu
fe7f309fae Merge "Support showing alignment hint based on aligniment state of dock" into qt-qpr1-dev
am: fc3f1408da

Change-Id: I4b9b1fd4c3209a6e3ae42c65d0a2b4c8484fc8ba
2019-11-26 02:39:29 -08:00
Wilson Wu
fc3f1408da Merge "Support showing alignment hint based on aligniment state of dock" into qt-qpr1-dev 2019-11-26 10:29:40 +00:00
Jerry Chang
4bbf1596b9 Support showing alignment hint based on aligniment state of dock
Bug: 141984730
Test: atest SystemUITests:KeyguardIndicationControllerTest
Change-Id: Ic0911683725a0e54406df06b948169c4dde94764
Merged-In: Ic0911683725a0e54406df06b948169c4dde94764
2019-11-26 11:03:10 +08:00
Malcolm Chen
eb7ac68dff Merge "Do not consider SIM state for inactive SIM/modem slot." am: 445720a321
am: a575fdfc31

Change-Id: I047aeb10e151a1ed9505f2a1dd093e846ff656d8
2019-11-25 13:38:55 -08:00
Malcolm Chen
a575fdfc31 Merge "Do not consider SIM state for inactive SIM/modem slot."
am: 445720a321

Change-Id: I757ddca30fac47b084ed03c48642b558a7f9300e
2019-11-25 13:32:22 -08:00
Xin Li
9ae3822f83 DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master
Bug: 144955631
Merged-In: I86c741f7ede242568aab436f673000c9f0da5813
Change-Id: Ia6a3a55023e4e66811c4ef7c6ccd05c5db3e5944
2019-11-24 05:17:08 +00:00
Malcolm Chen
d38443557f Do not consider SIM state for inactive SIM/modem slot.
ActiveModemCount could be smaller than max SIM slot in single SIM mode
mode. In this case, do not consider mSimErrorState for inactive slots.

Bug: 142514392
Test: manual and unittest
Change-Id: Ieff64f7c2e7bf4db7d603d3824dc6fea71e3f6cd
Merged-In: Ieff64f7c2e7bf4db7d603d3824dc6fea71e3f6cd
2019-11-22 17:54:15 -08:00
Govinda Wasserman
4b63818b1f Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev
am: f924933058

Change-Id: Ib2c9ae43c276523b79975bbdfbfc82c6553800ba
2019-11-22 06:06:43 -08:00
Govinda Wasserman
f924933058 Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev 2019-11-22 13:27:32 +00:00
Satakshi Rana
b3f8e32d6a Merge "Passing feedback for screenshots in SysUI" into qt-qpr1-dev
am: a681b9d205

Change-Id: I1134f387c1659f495562dc036ea58943537aa695
2019-11-20 10:58:27 -08:00
James Mattis
ed6fe63662 Merge "Swap param order in registerSoftApCallback" am: 1dcfd69218
am: fa968e9691

Change-Id: I0efdc1f3fd35fe059747b6ba2c6b0dc1731b3388
2019-11-20 10:40:05 -08:00
James Mattis
fa968e9691 Merge "Swap param order in registerSoftApCallback"
am: 1dcfd69218

Change-Id: Icfb927efccdab7adda38ca71c30564a29cad785f
2019-11-20 10:32:33 -08:00
Satakshi
da07b0eec5 Passing feedback for screenshots in SysUI
(cherry picked from commit aaf695366e)

Test: Took a screenshot and verified that AiAi gets notified for
share/edit/delete/smart action clicked and exceptions thrown.
Ran tests-
'atest ScreenshotNotificationSmartActionsTest'
'atest ScreenshotNotificationSmartActionsGoogleTest'
Bug: 141634285
Change-Id: Ief6400549b30cf1c0c8a374aa443cf6347f84875
Merged-In: Ief6400549b30cf1c0c8a374aa443cf6347f84875
2019-11-20 09:51:00 -08:00
Satakshi Rana
2613be298f Merge "Screenshot Notification Smart Action: AiAi and - Sys UI integration" into qt-qpr1-dev
am: 73b4e1923a

Change-Id: Ib545347db4b8aa49f2467e785d0572ce2f5d5b25
2019-11-19 09:22:01 -08:00
Satakshi
ce35ce9f08 Screenshot Notification Smart Action: AiAi and - Sys UI integration
Create a constant in ContentSuggestionsManager, which will
be used to pass a hardware bitmap to ContentSuggestionsService.
In the presence of this key in the request extras, we skip taking a
snapshot in ContentSuggestionsPerUserService.
Bitmap is extracted from reading this value from extras in
ContentSuggestionsService.

Create ScreenshotNotificationSmartActionsProvider, which is overridden
in GoogleSystemUI.
Calling AiAi is guarded by a device config flag created in cl/277143225.

(cherry picked from commit d2010f2628 and c45d86fc15)

Test: Manually tested the code in this CL and corresponding change in SystemUIGoogle.
Took a screenshot and verified that AiAi gets invoked and the screenshot notification
shows smart actions.
Ran new tests added in this CL
'atest ScreenshotNotificationSmartActionsTest'
'atest ContentSuggestionsPerUserServiceTest'
Bug: 141634285
Change-Id: I439a4be9aac53fb02b566ae4d438afe3edf2b37a
Merged-In: I439a4be9aac53fb02b566ae4d438afe3edf2b37a
2019-11-18 16:06:08 -08:00