Commit Graph

1980 Commits

Author SHA1 Message Date
Automerger Merge Worker
b6c05be16d move IApnSourceService.aidl to android.service.carrier am: 2a03dd50ce am: f3304cec72
Change-Id: Idfbfe4e5420eeeb2d364145e0676762905be3c9b
2019-12-14 06:21:49 +00:00
Chen Xu
2a03dd50ce move IApnSourceService.aidl to android.service.carrier
Bug: 140908357
Test: Build & Manual
Change-Id: I21b83798f5ecd819627a7168c167cf3cfe99dd68
(cherry picked from commit 478ba408d3)
Merged-in: I21b83798f5ecd819627a7168c167cf3cfe99dd68
2019-12-13 17:04:23 -08:00
Automerger Merge Worker
09fa28fcba Merge "Fix crash after destroyed" into qt-qpr1-dev am: f43740e69c
Change-Id: I4d3b9c90ce380ee6d9494a68a5d5dcc116c61399
2019-12-12 09:55:08 +00:00
TYM Tsai
66121902a5 Fix crash after destroyed
Remove the touch listener while destroyed to avoid causing the
IllegalStateException.

Fixes: 144703050
Test: atest CtsAutoFillServiceTestCases
Change-Id: I04b30fa3cef5bea00a4dbd9957cae8246f09a802
(cherry picked from commit 93e1622365)
2019-12-09 06:18:57 +00:00
Meng Wang
0ce27d0e97 Merge "Move android.service.euicc.* into telephony" am: 4d1971e880
am: f275072086

Change-Id: Ic9cfcf08477588a0e66001b609d7ac83c648ed2c
2019-11-27 13:46:53 -08:00
Meng Wang
e1e5d91e5e Merge "Move CarrierIdentifier/CarrierService to telephony" am: 306786abd4
am: 3963cb45d1

Change-Id: If8dcd06b40f13df35a2871151187fc63c8a4cecc
2019-11-27 13:43:23 -08:00
Meng Wang
f275072086 Merge "Move android.service.euicc.* into telephony"
am: 4d1971e880

Change-Id: I7b06c381b0afc3ecee0e9632e9faf0e2834ed881
2019-11-27 13:38:38 -08:00
Meng Wang
3963cb45d1 Merge "Move CarrierIdentifier/CarrierService to telephony"
am: 306786abd4

Change-Id: I20c8065c746f4ce025ef45ef4dc6ad0726f83b22
2019-11-27 13:34:51 -08:00
Meng Wang
4d1971e880 Merge "Move android.service.euicc.* into telephony" 2019-11-27 21:23:59 +00:00
Meng Wang
2b8d61158d Move android.service.euicc.* into telephony
Bug: 145232482
Test: make
Change-Id: I9dc5c904761f688e7abecea47647da29f6cec512
2019-11-27 19:15:55 +00:00
Meng Wang
a9ed606636 Move CarrierIdentifier/CarrierService to telephony
Bug: 145232482
Test: make
Change-Id: I9ba0618bb6f95f5caadc3ac9ac75e97efa5573c6
2019-11-27 19:15:37 +00:00
Hall Liu
ae63546d19 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
am: dab3711435

Change-Id: Ib75482a87545f7743f0049c8e51c354d2294c2af
2019-11-19 15:12:28 -08:00
Hall Liu
dab3711435 Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
Satakshi Rana
bcf751a427 Merge "Assert only one bitmap is provided to ContentSuggestionsService." into qt-qpr1-dev
am: ecc65c6e34

Change-Id: Iaeb50e86668bc458226695e780f15221148b6706
2019-11-19 11:45:02 -08:00
Satakshi
b846e83ff5 Assert only one bitmap is provided to ContentSuggestionsService.
Test: Took a screenshot and verified that AiAi gets invoked and the screenshot notification
shows smart actions.
Long press in Overview shows smart actions.
Bug: 141634285

Change-Id: I1e82f8bb837b8b032e6d25032642e47f492eb495
2019-11-19 10:27:11 -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
Hall Liu
1d7a53da98 Merge changes from topic "mainline4"
* changes:
  Add new API for Telecom to send phone state
  Minor style correction to avoid merge conflict
  non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00: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
Jiashen Wang
3911edcd28 Merge "Add public APIs for carrier apps" am: 89a1e85387
am: e11d665aae

Change-Id: I79ef6999d30a382d46e5c5b972f3ed7028891f5f
2019-11-14 16:14:37 -08:00
Jiashen Wang
e11d665aae Merge "Add public APIs for carrier apps"
am: 89a1e85387

Change-Id: Ie299e00e7389f03ed455994f0492144ec8f7b27e
2019-11-14 16:08:40 -08:00
Jiashen Wang
89a1e85387 Merge "Add public APIs for carrier apps" 2019-11-14 23:47:38 +00:00
Peter Wang
75fb6b1edf Merge "[API Review] Renamed public API eraseSubscriptionsWithOptions" am: 451c6a80e5
am: ded3d9152e

Change-Id: Ibbcb82cf7d2eb0c51e1b4f6c290e1acc8cc628c5
2019-11-14 11:19:05 -08:00
Peter Wang
ded3d9152e Merge "[API Review] Renamed public API eraseSubscriptionsWithOptions"
am: 451c6a80e5

Change-Id: If559af58f06c0b7d8e9c118752cfdf82877761e7
2019-11-14 11:11:37 -08:00
Jiashen Wang
216ae8d08e Add public APIs for carrier apps
Add public APIs to for carrier apps to trigger activation flow and vice
versa without carrier privilege.
Bug: 139446545
Test: Manually tested

Change-Id: I26d4d9d435dbfbf1e87bef962c6bced057784e0a
Merged-In: I26d4d9d435dbfbf1e87bef962c6bced057784e0a
2019-11-13 19:44:11 -08:00
Peter Wang
7e16b391b6 [API Review] Renamed public API eraseSubscriptionsWithOptions
to without "withOptions", aidl definitions for EuiccController,
EuiccService are kept unchanged

Bug: 139474431
Bug: 143986109
Test: Build
Change-Id: Ic11bae7a24c99995b76dd4c5ef764f8a87deed52
Merged-In: Ic11bae7a24c99995b76dd4c5ef764f8a87deed52
2019-11-14 03:35:25 +00:00
Artur Satayev
756d3b447a Merge "Add @UnsupportedAppUsage annotations for greylist." am: 423c3a32d6
am: 7a565c45b1

Change-Id: I48075ef4296e0b55c0055f7364c5129bbd60e9ed
2019-11-11 09:33:13 -08:00
Artur Satayev
7a565c45b1 Merge "Add @UnsupportedAppUsage annotations for greylist."
am: 423c3a32d6

Change-Id: I5387b4742fdaf67ad3189356f2361f73969b53a8
2019-11-11 09:13:24 -08:00
Artur Satayev
3be4d59369 Merge "Add @UnsupportedAppUsage annotations for max-p." am: 8893f158c6
am: da4d6567c2

Change-Id: Iff80c388dec2c6f8184b739be6fb38b8ec8a1a49
2019-11-08 09:49:03 -08:00
Artur Satayev
da4d6567c2 Merge "Add @UnsupportedAppUsage annotations for max-p."
am: 8893f158c6

Change-Id: I2f249063c274b54a58a24cda23f1d5a60fa14540
2019-11-08 09:38:12 -08:00
Artur Satayev
fc46be7dbd Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m

Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Artur Satayev
ee9c6e7571 Add @UnsupportedAppUsage annotations for max-p.
See go/UnsupportedAppUsage for more details.

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
Merged-In: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-11-08 16:17:13 +00:00
Lyn Han
b1bfd957ac Dedup smart reply updates for bubble flyout [DO NOT MERGE]
am: 0ee7184551

Change-Id: Ib953b3ed58ca5ab515bd37c8435a39aeed23bb9e
2019-11-07 10:49:42 -08:00
Amit Mahajan
41f6ef08ba Merge "Create @SystemApi CarrierMessagingServiceWrapper."
am: 4ae457ad9d

Change-Id: Ibce5805d4f4ad4781f42d936cf13381e86d69512
2019-11-04 16:19:03 -08:00
Amit Mahajan
4ae457ad9d Merge "Create @SystemApi CarrierMessagingServiceWrapper." 2019-11-04 22:54:58 +00:00
Amit Mahajan
02e56cc0ba Create @SystemApi CarrierMessagingServiceWrapper.
This is primarily a wrapper over ICarrierMessagingService
that to create a stable API to communicate with CarrierMessagingService.

Test: basic messaging sanity
Bug: 143609473
Merged-in: I67fda8bab3902b358c483f992633dbdfe3a8cda2
Change-Id: I67fda8bab3902b358c483f992633dbdfe3a8cda2
(cherry picked from commit 92642659e8)
2019-11-04 12:44:01 -08:00
Chen Xu
44d0c2a7dc Merge "new TelephonyRegistryManager"
am: 7a79194fcb

Change-Id: I89e60de64c4c3b8b760413c136241b6c9c0fc98f
2019-11-04 10:35:20 -08:00
Chen Xu
7a79194fcb Merge "new TelephonyRegistryManager" 2019-11-04 18:21:51 +00:00
Chen Xu
1f1c25e815 new TelephonyRegistryManager
today telephonyRegistry lives in system process
this is intended to persists all telephony listeners when
phone process crash. Telephony today notify system server by
using AIDL APIs directly. Instead, we are exposing a proper API
surface: telephonyRegistryManager where only phone app and
carrier privileged apps are allowed to use APIs in
TelephonyRegistryManger to notify telephony related status update.

Bug: 140908357
Test: Build & Manaul
Change-Id: I1b750751148925b4a7bd94553318907654012fc1
(cherry picked from commit 288b71c8c1)
Merged-in: I1b750751148925b4a7bd94553318907654012fc1
2019-11-01 22:44:36 +00:00
Lyn Han
0ee7184551 Dedup smart reply updates for bubble flyout [DO NOT MERGE]
[Cherrypicked from master]

Smart reply updates are not visually interruptive and bubbles should not
show flyout for them, since flyout text remains the same.

1) Modify NoMan.isVisuallyInterruptive to skip evaluation of fields
irrelevant to bubbles

2) Modify NotificationComparator to rank interruptive notifs higher

3) Pipe bool (isInterruptive) from system_process to SysUI
	NoMan --- set bool on notif record and ranking
	Ranking --- parcel bool for cross-process transport
	SysUI notif entry --- get bool from ranking
	SysUI bubble data --- on notif entry update, suppress flyout if isInterruptive=false

	Considered adding "isInterruptive" bool to StatusBarNotification.
	Did not because "visually-interruptive" is additional information that the
	system figured out and SBNs should be limited to info from the app.

4) NoMan --- schedule ranking update if interruptive changes for bubble

Fixes: 138755533
Test: manual - send one sms => flyout appears once
Test: manual - send multiple sms in a row => flyout appears for each one
Test: atest FrameworksUiServicesTests
Test: atest NotificationComparatorTest
Test: atest SystemUITests
Change-Id: Id4b855054689ee73a109bb7cd18004531b41f28c
(cherry picked from commit 0dddc61824d091e48962e36939828cae3cde2aa9)
2019-11-01 14:31:40 -07:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Peter Wang
0ecde1f5f9 Fixed java doc for EuiccService#eraseSubscriptions
Bug: 143138878
Test: on device
Change-Id: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
Merged-In: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
2019-10-28 12:40:23 -07:00
Peter Wang
2ab852d411 Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-25 14:26:22 -07:00
Michele
db421f56e8 Removal of usage of hidden APIs
Moved RESOLUTION_ACTIONS from EuiccService to EuiccResolutionUiDispatcherActivity,
so that it does not need to be made public.

Bug: 137202333
Test: compilation
Change-Id: If8011bbe6af32c038f55d851acc2406eba208de6
Merged-In: If8011bbe6af32c038f55d851acc2406eba208de6
2019-10-24 00:26:22 +00:00
Beverly
f50e3d227e Merge "Fix zen alarms only mode check" into qt-qpr1-dev
am: 9c81f1754c

Change-Id: Icc9bff293fec3cf4ddd4255b74a4709b249bb7e9
2019-09-06 12:38:07 -07:00
Beverly
dcc5cfc561 Fix zen alarms only mode check
Also fixes setting the consolidated zen policy logging.

Fixes: 140329813
Test: android.app.cts.NotificationManagerTest#testTotalSilenceOnlyMuteStreams
Test: android.app.cts.NotificationManagerTest#testAlarmsOnlyMuteStreams
Change-Id: I43d503ac23d7b0b141930d77cb76f1f589b22525
2019-09-06 17:25:47 +00:00
Aurimas Liutikas
488d37b2d0 Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: ed5beec21b
am: de0ebb082e

Change-Id: I60c55b6706e8d43121e8b2c7a35efff38668f66b
2019-08-30 08:54:38 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
Tony Mak
e9f236906d Merge "Hold a strong reference to the callback in TextClassifierService" into qt-qpr1-dev
am: 8247b5f5a6

Change-Id: I8591d0ac8025589679e9462e82c7bbcf4ea8ea63
2019-08-22 14:43:03 -07:00
Tony Mak
7ba3fd4546 Hold a strong reference to the callback in TextClassifierService
Issue:
TextClassifierService failed to invoke the callback to send the result back to client
occasionally because  the callback object may be GCed.
And thus smart selection failed occasionally, as the client doesn't get a response
back when it hits this issue. It won't fallback to local textclassifier due to the
timeout specified in TextView.

Cause:
We thought that ITextClassifierCallback is a "cross process" reference, and
so we only store a weak reference of it to avoid leak.
And it turns out that it is wrong. As soon as the weak ref gets GCed in
the service, that counts as dropping the callback. The service doesn't
know about any strong references the client has.

Bug: 138865849

Test: Try smart selection over 30 times, make sure smart action is shown
for every single time.

Merged-In: Ia9218cf67e8d67697a0fdff22c7918a55efc39ca

Change-Id: I4d89518dfff777ba5d999d9ba89d7f4cf7598e75
2019-08-22 14:19:23 +00:00