Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
624,721 Commits 3 Branches 0 Tags
4d9a0952641bbf36aae8f0eff79adecf0c81a246
Commit Graph

624721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
f3efab1326 Merge "Clean up some dump code." into sc-dev 2021-02-17 22:43:07 +00:00
Jorge Gil
6723b90ef8 Merge "Align PIP menu after rotation" into sc-dev 2021-02-17 22:41:00 +00:00
Yan Yan
add92198a5 Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d am: 8f2b5071b3 am: 559fd17ee9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I349d2f7e4c6bbeb28e0cd79be1ed5b6480558144
 2021-02-17 22:30:26 +00:00
Hunter Knepshield
2b2c3e6724 Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9 am: 7c7bb0cb69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65c281e0e6064b7335b9ca7942de1480d0e998c5
 2021-02-17 22:29:55 +00:00
Yan Yan
9fb7d8f7a2 Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d am: 14e64c42ad am: e0610fe112 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f0336b434f42cba3bce793d8ec8d16a401bf117
 2021-02-17 22:29:33 +00:00
Treehugger Robot
efa809eea0 [automerger skipped] Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b am: 94e09fbe6a -s ours 
am skip reason: Change-Id I7a3c442bb27da5948bc9ead146c77213de6b56cc with SHA-1 12af11d6f5 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I974e14f94aa3d3ffd07aff058d5777894cc71ad5
 2021-02-17 22:28:34 +00:00
Brad Ebinger
d9e4faebe8 Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 am: abfa62f80b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6780e5f6a10924f4b445fb100535961b3272166f
 2021-02-17 22:28:02 +00:00
Kevin Chyn
e5ffb5805e Merge "Retrieve authenticatorId when already targetUserId" into sc-dev 2021-02-17 22:17:07 +00:00
Shubang Lu
0fc89d9664 Merge changes from topics "media_metrics_network", "media_metrics_pb_metrics", "media_metrics_track_change" into sc-dev 
* changes:
  Unhide media metrics APIs part 2: playback metrics
  Unhide media metrics APIs part 2: Network event
  Unhide media metrics APIs part 2: Track change event
 2021-02-17 22:11:25 +00:00
TreeHugger Robot
742862492c Merge "Fix early registration problem" into sc-dev 2021-02-17 22:03:01 +00:00
Yan Yan
559fd17ee9 Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d am: 8f2b5071b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d0999c36c05c3bd8e0f6e561cb50cc018936189
 2021-02-17 21:47:45 +00:00
Hunter Knepshield
7c7bb0cb69 Merge "Allow optional package names in carrier configs" am: 68612ac556 am: c47df2e2e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia937988ef040a85a028ec45d69fad3f291860904
 2021-02-17 21:47:17 +00:00
Yan Yan
e0610fe112 Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d am: 14e64c42ad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie04f68e463251668d27d636c77dcd39558125ffb
 2021-02-17 21:46:52 +00:00
Treehugger Robot
94e09fbe6a Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e am: 4b06a33f7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5333980d2af4d3d703fc7bbf1545214697c9841
 2021-02-17 21:46:32 +00:00
Brad Ebinger
abfa62f80b Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf0a66cee2204f7eeb50ea8ce6fe38f2a93b44b
 2021-02-17 21:44:47 +00:00
Yan Yan
8f2b5071b3 Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b93d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fedfbd2270ff5dac3e87e1ed83b0607a4ad2c30
 2021-02-17 21:25:35 +00:00
Yan Yan
bf8113b93d Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" 2021-02-17 21:22:57 +00:00
Hunter Knepshield
c47df2e2e9 Merge "Allow optional package names in carrier configs" am: 68612ac556 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563677

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11323dffc28c43e9463bd9f0cbcc04fad29f7a6a
 2021-02-17 21:16:18 +00:00
Kai Shi
0aa410feb9 Merge "Change config_bandwidthEstimateSource to bandwidth_estimator" into sc-dev 2021-02-17 21:14:07 +00:00
Felipe Leme
cf25028c7c Merge "New API: DevicePolicyManager.listForegroundAffiliatedUsers()" into sc-dev 2021-02-17 21:12:16 +00:00
Yan Yan
14e64c42ad Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cda370ffe8babd62d8b7f38a09e35dd947c3384
 2021-02-17 21:10:13 +00:00
Treehugger Robot
4b06a33f7b Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e407e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d8da5f999b75a05ce45d2d2fe31e5e0fa0b792f
 2021-02-17 21:07:47 +00:00
Beverly Tai
643b5784e9 Merge changes Ibf5f349c,Ie46d630d into sc-dev 
* changes:
  Update owner info with other keyguard indications
  Add test to allow icon-only messages
 2021-02-17 21:06:25 +00:00
Brad Ebinger
cd59a1a0f3 Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I416fd516d93bd0505e3764fc607a2f5f13c3173e
 2021-02-17 21:04:23 +00:00
Hunter Knepshield
68612ac556 Merge "Allow optional package names in carrier configs" 2021-02-17 20:58:27 +00:00
Sherry Hu
bd771b8f98 Merge "Add null check on UsbManager" into sc-dev 2021-02-17 20:49:34 +00:00
Shawn Willden
c418d4ef15 Merge "Add support for app-generated attestation keys." am: 50a66e39cd am: 2da3a280d2 am: bbdb4d9ee5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e4b2bcfa54953e37452a7533a89b49586596502
 2021-02-17 20:49:09 +00:00
Yan Yan
a931d4516d Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" 2021-02-17 20:40:44 +00:00
Alex Johnston
20fcf469a3 Merge "Update network logging metrics" into sc-dev 2021-02-17 20:36:50 +00:00
Treehugger Robot
3ad85e407e Merge "pm: Require manifest.json for .dm (dex-metadata) files." 2021-02-17 20:36:43 +00:00
Igor Murashkin
abe2776ddf pm: Require manifest.json for .dm (dex-metadata) files. 
Example file:
  $> unzip CtsApkVerityTestAppPrebuilt.dm manifest.json ; cat manifest.json
  {
    "packageName": "android.appsecurity.cts.apkveritytestapp",
    "versionCode": 30
  }
  
Cherry-picked from 12af11d6f5

Test: adb install-multiple -r foo.apk foo.dm
Test: atest FrameworksServicesTests:com.android.server.pm.dex.DexMetadataHelperTest
Bug: 179295368
Merged-In: I7a3c442bb27da5948bc9ead146c77213de6b56cc
Change-Id: I7a3c442bb27da5948bc9ead146c77213de6b56cc
 2021-02-17 20:34:17 +00:00
TreeHugger Robot
ad09e265ae Merge "Support ADB command for denying client auth" into sc-dev 2021-02-17 20:29:50 +00:00
Kevin Chyn
e43e5b1337 Retrieve authenticatorId when already targetUserId 
Previous change ag/13413165 stopped the framework from retrieving
authenticatorId when the current user is already the target user.
However, this happens immediately after enrollment, since enroll
and getAuthenticatorId are separate operations. So, add a way to
retrieve authenticatorId only when necessary.

Fixes: 179737483
Bug: 178018968
Test: manual
Change-Id: I71673fc672c60733616634a2fdf3153a3b2d02e1
 2021-02-17 12:29:11 -08:00
Brad Ebinger
4597584e8c Merge "Move to ACCESS_RCS_USER_CAPABILITY_EXCHANGE for UCE APIs" into sc-dev 2021-02-17 20:28:24 +00:00
TreeHugger Robot
0d831306f8 Merge "New API: UserManager.isUserForeground()." into sc-dev 2021-02-17 20:27:56 +00:00
Brad Ebinger
c7baa4862f Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" 2021-02-17 20:27:18 +00:00
TreeHugger Robot
e89b53ff78 Merge "Use @InstallScenario instead of @InstallReason" into sc-dev 2021-02-17 20:26:23 +00:00
Mat Bevilacqua
5ac16ac5e8 Merge "Delete data storage on changes to HAL data" into sc-dev 2021-02-17 20:25:25 +00:00
Soonil Nagarkar
7ea2a7e1cb Fix early registration problem 
SystemDeviceIdleHelper was attempting to interact with the system before
it was ready.

Bug: 180445021
Test: atest android.webkit.cts.GeolocationTest
Change-Id: I27c68f9a80124c314485fc8b053c6eb2dc423abc
 2021-02-17 12:21:37 -08:00
Shawn Willden
bbdb4d9ee5 Merge "Add support for app-generated attestation keys." am: 50a66e39cd am: 2da3a280d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad2f426ed43fdb9b4e62c81902d9f7ff8e936535
 2021-02-17 20:14:54 +00:00
Flavio Fiszman
66fa53a953 Merge "Fix launching intent in People Tile" into sc-dev 2021-02-17 20:12:40 +00:00
Kweku Adams
8b93675da5 Clean up some dump code. 
Move JobServiceContext dump inside the class so it can be modified more
directly. Also make the JobConcurrencyManager dump a little cleaner.

Bug: 141645789
Bug: 171305774
Test: visually inspect dump
Change-Id: I4f699e8b17da329251e1f53e44bf9fac978b3510
 2021-02-17 12:11:57 -08:00
Matt Pietal
8963b30f44 Merge "PIN bouncer - Update animations" into sc-dev 2021-02-17 19:51:53 +00:00
Chih-hung Hsieh
e9d63c6dd8 Merge "Ignore tidy checks which produce warnings" am: ec9f1c6833 am: b737e334f9 am: a7f0ba1a7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584227

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ff9c3ed28991cfa3d91eb46bac1fe6efce4c5c
 2021-02-17 19:48:44 +00:00
Treehugger Robot
eb03672631 Merge "Expose a setter for install scenarios" am: 29ec0b24c7 am: 34312d2173 am: 04422ecae9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ef7bdd1b1b1c3153613740e64dab458697f84fd
 2021-02-17 19:48:02 +00:00
Automerger Merge Worker
efdfa53d4d Merge "Merge changes I3242ad0e,I5daced20,Iefd284ae am: f1d78f17c2 am: 3371693fda am: 0fd3dfe01b" into sc-dev 2021-02-17 19:47:51 +00:00
Peter Kalauskas
2b2fab3981 Merge "Add debug text to NotificationPanelViewController" into sc-dev 2021-02-17 19:47:46 +00:00
Cody Kesting
3de749bcd4 Merge changes I3242ad0e,I5daced20,Iefd284ae am: f1d78f17c2 am: 3371693fda am: 0fd3dfe01b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580104

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd62dea9ccaaa967fef6c1cc06483e3d3cabbc1b
 2021-02-17 19:47:39 +00:00