Commit Graph

20177 Commits

Author SHA1 Message Date
TreeHugger Robot
d82422263d Merge "Move launcher activities to the back when back pressed on root task" into sc-dev am: 04d9bf62ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13421173

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d96fcecef001d09b6c9e67b25ad26b5e3494408
2021-02-20 02:08:31 +00:00
TreeHugger Robot
04d9bf62ab Merge "Move launcher activities to the back when back pressed on root task" into sc-dev 2021-02-20 01:15:53 +00:00
Chloris Kuo
e7fdc59600 Merge "NAS Feedback API Change" into sc-dev am: f8cc3c16d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13563511

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1820ffeb35b0865d54b6434ddb3c83384067b176
2021-02-19 23:18:34 +00:00
Chloris Kuo
f8cc3c16d8 Merge "NAS Feedback API Change" into sc-dev 2021-02-19 22:41:40 +00:00
Jeff DeCew
2809fa58a9 Merge changes from topic "phishing_templates" into sc-dev am: 7f9a369d63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13607325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bbea8ef6477e7374c219c233ab84840df8cff75
2021-02-19 18:19:18 +00:00
Jeff DeCew
7f9a369d63 Merge changes from topic "phishing_templates" into sc-dev
* changes:
  Refactor the SmartReply classes
  Filter out RemoteInput actions when Phishing action is present
2021-02-19 18:06:33 +00:00
Jay Aliomer
c424f10347 Merge "Revert^2 "Wallpaper Local color sampling"" into sc-dev am: 3c1756bbef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13601284

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib712fcdbda039009a0597e480d000eb2aca642ea
2021-02-19 17:59:33 +00:00
Jay Aliomer
3c1756bbef Merge "Revert^2 "Wallpaper Local color sampling"" into sc-dev 2021-02-19 17:07:45 +00:00
Chavi Weingarten
3ebe6a968b Merge "Added public APIs to generate and validate a DisplayHash." into sc-dev am: c14465c2bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429136

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecbd79812c4d905035dc68bde44a4416a02a9022
2021-02-19 02:26:19 +00:00
Chavi Weingarten
c14465c2bb Merge "Added public APIs to generate and validate a DisplayHash." into sc-dev 2021-02-19 01:47:14 +00:00
Jay Aliomer
4f172bf877 Revert^2 "Wallpaper Local color sampling"
Test: ImageWallpaperTest
Fixes: 173046221
3fa5fe0a1f

Change-Id: I8393abede247eb7b37695c3ce9adce13a3bcbce3
2021-02-18 20:45:57 -05:00
Kevin Chyn
03d75ce18d Merge "Add ability to listen to LockTask state changes" into sc-dev am: be7698d68a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13608888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85ec87b9588ee94d4f40021623a7e081d0868927
2021-02-18 22:23:18 +00:00
Kevin Chyn
be7698d68a Merge "Add ability to listen to LockTask state changes" into sc-dev 2021-02-18 22:01:54 +00:00
Prabir Pradhan
50b3cc03e6 Move launcher activities to the back when back pressed on root task
This change partially reverts the back button behavior change introduced
in: I48ec35f841ab3b306fe80845150000c390908f5e

Instead of always moving the task to the back when the back button is
pressed on the root task, we only do it when the activity that is open
is a "launcher activity". These are activities that act as the main
entry points into an application, indicated with an intent filter with
ACTION_MAIN and CATEGORY_LAUNCHER.

Bug: 176235889
Test: atest WmTests
Test: atest CtsWindowManagerDeviceTestCases
Test: manual: flash crosshatch, press back button on a launcher activity,
observe task is moved to back; press back on non-launcher activity,
observe task is finished.

Change-Id: I1cbf85f1a007aeedcb66b9343d182188bacc78e7
2021-02-18 20:30:06 +00:00
Kevin Chyn
f18b27217e Add ability to listen to LockTask state changes
Bug: 176211023
Test: Presubmit
Change-Id: I1e9e7151d45751ec6398588788c512f23b2f9fb5
2021-02-18 10:31:52 -08:00
Josh Gao
d4dcaebaf3 Merge "Attach protobuf tombstones to ApplicationExitInfo." am: 2e1418c47f am: 3d9f3f0076 am: a5ef566cd7 am: 46e4b638de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I368ee473b119165bf6103ba7a8917008cb38fa15
2021-02-18 11:04:04 +00:00
Josh Gao
46e4b638de Merge "Attach protobuf tombstones to ApplicationExitInfo." am: 2e1418c47f am: 3d9f3f0076 am: a5ef566cd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44dba1f99f67727a4ba790d52b100f49da385372
2021-02-18 10:47:45 +00:00
Josh Gao
a5ef566cd7 Merge "Attach protobuf tombstones to ApplicationExitInfo." am: 2e1418c47f am: 3d9f3f0076
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id05f24b1febaaacbaf1b1e3a28459e5546ebd510
2021-02-18 10:10:31 +00:00
Josh Gao
2e1418c47f Merge "Attach protobuf tombstones to ApplicationExitInfo." 2021-02-18 08:40:57 +00:00
Suprabh Shukla
9c3a105642 Merge "Adding a permission to protect exact alarms" into sc-dev am: 48fb8fe9df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13458535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I892387ba75826582e766691321523aa6472b9203
2021-02-18 07:29:51 +00:00
Suprabh Shukla
48fb8fe9df Merge "Adding a permission to protect exact alarms" into sc-dev 2021-02-18 07:13:39 +00:00
Jeff DeCew
46d087a8ff Filter out RemoteInput actions when Phishing action is present
TODO:
* Color the new header icon
* Special style for phishing smart actions

Test: manual with notify2 app (for now)
Bug: 161333455
Change-Id: If6fdfe8347f06994662521d63fec64f2ee15ae8d
2021-02-17 20:59:11 -05:00
Josh Gao
c36f532d91 Attach protobuf tombstones to ApplicationExitInfo.
Bug: http://b/159164105
Test: atest CtsAppExitTestCases
Change-Id: I377247e8fc85f917676cb57eaa3128b955634fa5
2021-02-17 17:40:49 -08:00
TreeHugger Robot
524428d091 Merge "Add listener for conversation changes" into sc-dev am: bf07abc3aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13483708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I793bdb27d3b2f09dac7d53bea8e5c9bc4308707f
2021-02-18 00:13:54 +00:00
Alexandre Elias
77d3337088 Merge "Fix transition animation when going back twice" into sc-dev am: 4d9a095264
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13593523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I211dde21ee621acc73dc6d3461e0913461f9a176
2021-02-18 00:09:31 +00:00
TreeHugger Robot
bf07abc3aa Merge "Add listener for conversation changes" into sc-dev 2021-02-17 23:53:55 +00:00
Shuo Qian
db9ef8e719 Merge "Add APIs for updating, query 5G slicing status" into sc-dev 2021-02-17 23:39:17 +00:00
Alexandre Elias
4d9a095264 Merge "Fix transition animation when going back twice" into sc-dev 2021-02-17 23:12:59 +00:00
Alexandre Elias
ae5517e9a4 Fix transition animation when going back twice
The logic in ag/5108931 was intended to suppress the next return
animation if it would cross a task boundary, while preserving return
animations in all other cases.  However, it accidentally caused
excessive suppressions in the case of repeated back button presses.  The
reason is that although the sending activity is indeed only topOfTask
when moving forward cross-task, it's *always* topOfTask when pressing
back, so the state of the sending activity doesn't contain sufficient
information to feed this logic.

This patch changes to suppress when the receiving activity is task root,
which is a more direct and reliable signal.  (By definition, the return
transition from an activity will cross a task boundary if and only if
it's the task root.)

Fixes: 177780499
Test: New test in ag/13593522

Change-Id: Ia5751da6122dc1ddb557f45318712185fa0b3df9
2021-02-17 23:12:19 +00:00
Chloris Kuo
024505545c NAS Feedback API Change
Add onNotificationFeedbackReceived API and Notification#hasImage

Test: CtsLegacyNotification29TestCases
Test: atest com.android.systemui.statusbar.notification
Test: atest AssistantFeedbackControllerTest
Bug: 177032312
Change-Id: I5e95e7794290ba40c1a1ac0b77d8eb09572f4a01
2021-02-17 14:18:05 -08:00
Anna Zappone
4b65ce05ca Add listener for conversation changes
Add hidden ConversationListener and registration in PeopleManager
for People Tiles to register a listener to individual
conversation storage changes for targetted updates.

Test: DataManagerTest, PeopleServiceTest, PeopleManagerTest
Bug: 178792356
Change-Id: I0cab6913c138d6ac515fed74741dd62bf967772b
2021-02-17 21:49:32 +00:00
Felipe Leme
3f4a9c7e45 Merge "New API: DevicePolicyManager.listForegroundAffiliatedUsers()" into sc-dev am: cf25028c7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13455518

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f6826b3fa4a790e1174199f16ca6e9064127a28
2021-02-17 21:26:24 +00:00
Shuo Qian
bdf6533611 Add APIs for updating, query 5G slicing status
Test: atest DevicePolicyManagerTest
Bug: 178655595
Change-Id: I6f823be6737f7c7b3dc918230cbb927fac97c6eb
Merged-In: I6f823be6737f7c7b3dc918230cbb927fac97c6eb
(cherry picked from commit 1f4ea44b5f)
2021-02-17 18:34:20 +00:00
Felipe Leme
002e214afd New API: DevicePolicyManager.listForegroundAffiliatedUsers()
Bug: 173541467
Bug: 179163496

Test: m update-api

Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.DeviceOwnerTest#testListForegroundAffiliatedUsers_onlyForegroundUser,testListForegroundAffiliatedUsers_extraUser,testListForegroundAffiliatedUsers_notDeviceOwner,testListForegroundAffiliatedUsers_notAffiliated,testListForegroundAffiliatedUsers_affiliated

Change-Id: I520dc35da627d7cb89f6ff2d7010fc04af1b01f7
2021-02-17 10:31:25 -08:00
Shashwat Razdan
9d7f5bf17a Merge "Addressing a bug in parcelization of SmartspaceAction's bundle." into sc-dev am: 01640845f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13585236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I022a39041f4e50a256f56bcddcb34ebd68a028c9
2021-02-17 17:34:07 +00:00
Shashwat Razdan
01640845f0 Merge "Addressing a bug in parcelization of SmartspaceAction's bundle." into sc-dev 2021-02-17 17:18:44 +00:00
Lucas Dupin
3544c408bb Merge "Revert "Wallpaper Local color sampling"" into sc-dev am: a7db6403df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13601035

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68bef5e578f261ee2fedeb1ba8180f82fd322b59
2021-02-17 16:57:31 +00:00
Lucas Dupin
a7db6403df Merge "Revert "Wallpaper Local color sampling"" into sc-dev 2021-02-17 16:36:06 +00:00
chaviw
19de7eab9b Added public APIs to generate and validate a DisplayHash.
Added public APIs to call into WindowManagerService, which will then
call into DisplayHasherService in mainline. Also, renamed to DisplayHash

Test: atest DisplayHashManagerTest
Bug: 155825630
Change-Id: I1e10a773fba9471dff41894389e0a9508446d3cc
2021-02-17 08:24:54 -08:00
Flavio Fiszman
72bb4e7579 Merge "Creates PeopleManager API isConversation" into sc-dev am: ee168ad8e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562387

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0f5ea8614ecfd0b660b43d271d383a677c04cf3
2021-02-17 15:48:36 +00:00
Jay Aliomer
3fa5fe0a1f Revert "Wallpaper Local color sampling"
Revert "Implement local color extraction"

Revert "Implement local color extraction"

Revert submission 13553866-wallpaper-local-color-extraction-sc-dev

Reason for revert: b/180490435 
Reverted Changes:
I5755525f9:Wallpaper Local color sampling
I5487881c0:Implement local color extraction
Icbab7c6c2:Implement local color extraction

Change-Id: I1cf02a24555167165959e5c4f0bd25b655bd6b6e
2021-02-17 15:40:52 +00:00
Flavio Fiszman
ee168ad8e9 Merge "Creates PeopleManager API isConversation" into sc-dev 2021-02-17 15:33:20 +00:00
Julia Reynolds
8411ab5bcd Merge "Add apis for notification channel editing" into sc-dev am: 94bfa64f01
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13562972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34e6920a4c33bbceb7e134bbef15323b82a222ff
2021-02-17 14:37:00 +00:00
Julia Reynolds
94bfa64f01 Merge "Add apis for notification channel editing" into sc-dev 2021-02-17 14:12:03 +00:00
Alex Johnston
e5cb0d2d5b Merge "Allow PO to set network logging delegate" into sc-dev 2021-02-17 13:44:06 +00:00
Flavio Fiszman
d243c60e63 Creates PeopleManager API isConversation
Change-Id: I075cd72363ba0ea0e84bb57fe017fce20e051862
Test: atest DataManagerTest
Bug: 180122164
2021-02-17 10:51:12 +00:00
Gavin Corkery
0d15c26328 Merge "Initialize RebootReadinessManagerService" into sc-dev am: 37dbb4e5d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13454846

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80233896f7830145c7757628163b85c46a4680bf
2021-02-17 08:02:13 +00:00
Suprabh Shukla
d0bbe0b976 Adding a permission to protect exact alarms
Added a new permission to protect the alarm manager APIs setAlarmClock
and setExactAndAllowWhileIdle. The change will apply to apps targeting
API S and above.
- The permission will be granted by default to apps that request it.
- This will be a user facing permission as these APIs allow for exact
scheduling, and an app should generally only use them when scheduling
work on behalf of the user. This means the user can revoke it when they
want.
- Alarms set with this API will also be allowed to start FGS from the
background.
- Quota on exact, allow-while-idle alarms has been relaxed generously,
while alarm-clocks remain totally uninhibited.
- Apps that are exempted from battery via <allow-in-power-save> in the
sysconfig, can still use exact, allow-while-idle alarms without the
permission, but with lower quota.
- Inexact, allow-while-idle alarms do not require this permission, but
will *not* be allowed to start FGS from the background.
- A new API to query the state of this permission is included.

Test: atest FrameworksMockingServicesTests:com.android.server.alarm
atest CtsAlarmManagerTestCases

BYPASS_INCLUSIVE_LANGUAGE_REASON=Existing APIs

Bug: 171306433
Change-Id: Ifb6a3f3c42316b1c83fe6960920501f5e0ee51f2
2021-02-16 23:44:20 -08:00
Gavin Corkery
37dbb4e5d5 Merge "Initialize RebootReadinessManagerService" into sc-dev 2021-02-17 07:43:18 +00:00
Shashwat Razdan
70e0b0cb35 Addressing a bug in parcelization of SmartspaceAction's bundle.
Bug: 176851064
Test: Manual
Change-Id: I22df17f6c521aabc41f65507225431db1d27c9fa
2021-02-16 23:32:23 +00:00