Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
497,528 Commits 3 Branches 0 Tags
c26eaefedae7ea93f8616bb13c23667cbbc23907
Commit Graph

497528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
c26eaefeda Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a5b6676a580376ae20dc1713886f56d830760bd
 2021-02-13 01:40:28 -08:00
Winson
985d71551d Parcel queriesProviders in ParsingPackageImpl 
This was broken in the original migration, causing this field to be
dropped on reboot.

Bug: 178209505

Test: TODO, separate change will include comprehensive parceling test

Change-Id: I67219fe00c7b92677391fd46305bf0424d74e5f3
(cherry picked from commit 00f69942be)
 2021-02-11 16:57:08 +00:00
Tim Murray
8f5e000257 CachedAppOptimizer: don't take AM lock when freezer is not enabled 
Freezing and unfreezing don't reqiure the AM lock when freezer is not
enabled.

Test: boot, no lock contention on unfreezeTemporarily
Bug: 161866124

Change-Id: Ic650456aa8938db38b368042ce3f42fa43e7a130
Merged-In: Ic650456aa8938db38b368042ce3f42fa43e7a130
 2021-02-10 22:12:12 +00:00
TreeHugger Robot
43ad2093d4 Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 am: 3516e98daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fc3424fffffc3751faf53f8ca87d2c94864ce23
 2021-02-10 00:04:17 +00:00
Eugene Susla
e52ac322a3 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours am: 6766245f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb89ffd735b559380e1ce321b0a8d1170ab44f2e
 2021-02-10 00:04:09 +00:00
TreeHugger Robot
0bc002f78c Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 am: 8eef0f9d26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c4cc928f634c0dfdc3ec3d036c8c5dfc0bb7167
 2021-02-10 00:03:39 +00:00
Eugene Susla
19456a4b0a [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifda810cfa71d212d92dd63ab052136e8fe5e723a
 2021-02-10 00:03:36 +00:00
Michael Groover
58c483b685 [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours am: ebde0f1f40 -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ba88ee303eb38e19d124331abfda6e09a14afdf
 2021-02-10 00:03:20 +00:00
TreeHugger Robot
3516e98daa Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e2cfb8ccae18862b73fc4360016abfe1aa6613
 2021-02-09 23:41:02 +00:00
Eugene Susla
6766245f10 [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 am: 3f1fb6507a -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I689d2e339d23f8dd2b08f360d27d8520be5c41c2
 2021-02-09 23:40:58 +00:00
TreeHugger Robot
8eef0f9d26 Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 am: a964117367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22ef7c07d5e7a7284810aff3f5308fcacb1f6b2c
 2021-02-09 23:40:38 +00:00
Eugene Susla
3c24d07dfb [automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bc4d6f366fab119da399da1a1a37024c4717dde
 2021-02-09 23:40:28 +00:00
Michael Groover
ebde0f1f40 [automerger skipped] resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev am: 8750762ce0 -s ours 
am skip reason: Change-Id I9b8786a321b1ba79d81b74c3041589f30df8e9c8 with SHA-1 a953322575 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id982e8e6f2931509943c5d8e0f77202d04183c9e
 2021-02-09 23:40:02 +00:00
TreeHugger Robot
88ad6db9f3 Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4952f07571992a24f29a80063cd205b54592a5a1
 2021-02-09 23:01:41 +00:00
Eugene Susla
3f1fb6507a [automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd50 -s ours am: 80d043197c -s ours am: 4a510d0fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13180989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51e17655a64f6d3c6ed5a8eac5a22d6eebb68c38
 2021-02-09 23:01:36 +00:00
TreeHugger Robot
a964117367 Merge changes from topic "cdm_overlay-qt-dev" into qt-dev am: 6759663285 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365cb6b774ccb9a4d73654b73bfde00ef2eaf327
 2021-02-09 23:01:16 +00:00
Eugene Susla
4d587c5aa9 RESTRICT AUTOMERGE am: 30e9d28c22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0ce89b57ab01e6316b5cad5854b26624b460043
 2021-02-09 23:01:14 +00:00
Marco Ballesio
911519f25a freezer: handle exception in locks file format 
Safeguard /proc/locks processing from wrongly formatted /proc/locks
files

Bug: 179171387
Test: could not reproduce the issue, but verified that no crashes
occurred in a prolonged test (4hrs+)

Change-Id: Ia8a12903f2e520e51780c8b05876aa1c9083e92b
(cherry picked from commit fb4f4073f6)
 2021-02-09 19:36:07 +00:00
TreeHugger Robot
d41c119656 Merge "Fix the the proto definition for app startup and fully drawn events." into rvc-qpr-dev 2021-02-09 00:38:05 +00:00
Calin Juravle
6b232cc058 Fix the the proto definition for app startup and fully drawn events. 
ActivityMetricsLoggers build the proto with the compilation reason first
and then the compilation filter. Instead of changing the logging code,
we prefer to change the proto field order: this will facilitate the
speed up the resolution without the need to purge data or wait for
further release builds.

It is ok, because both fields are in fact int32 proto values so the ABI
does not change.

Test: m
Bug: 178108751

(cherry picked from commit cf676e8028c2611461dc3e009dd9fe771f44bdb2)

Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Change-Id: I03c701efe2181ae7796547267902f884007593eb
 2021-02-08 23:24:20 +00:00
Michael Groover
8750762ce0 resolve merge conflicts of 540b50bbe7 to qt-qpr1-dev 
Bug: 173421434
Change-Id: Ie3b327c2ab900616b2137d8347d5e8560484ec40
Merged-In: I9b8786a321b1ba79d81b74c3041589f30df8e9c8
 2021-02-08 20:23:21 +00:00
TreeHugger Robot
ed6a63240f [automerger skipped] Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours am: 2fffbcb7df -s ours 
am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1b9ce053c64fc31c03ce0f984b25480de0eb52c
 2021-02-08 17:46:42 +00:00
TreeHugger Robot
2fffbcb7df [automerger skipped] Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours 
am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409002a313787764b16cb23080c38e9273104638
 2021-02-08 17:23:08 +00:00
TreeHugger Robot
6d4ff2e0f0 Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev 2021-02-08 17:00:32 +00:00
TreeHugger Robot
97bd8baafb Merge "[DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility" into rvc-qpr-dev 2021-02-08 05:18:37 +00:00
TreeHugger Robot
96f010c384 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-07 16:18:24 +00:00
Bill Yi
feb3d04f23 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5da7c7256fc62de8672c76d3b59d2d25d1d5d544
 2021-02-07 04:38:32 +00:00
Michael Groover
9b85c6411e resolve merge conflicts of a13fc7f314 to qt-qpr1-dev 
Bug: 173421434

Change-Id: Ia5912645861a88e819189321861ffd81240c34d6
Merged-In: I03072c65e1c7101538a7a20541d2ac59a2d213e3
 2021-02-05 23:57:15 +00:00
TreeHugger Robot
d11f218b8e Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser"" into rvc-qpr-dev 2021-02-05 20:53:55 +00:00
Taran Singh
e272df9338 Merge "Handle cancelled Insets animation" into rvc-qpr-dev 2021-02-05 17:38:50 +00:00
Taran Singh
e2307d9a48 Handle cancelled Insets animation 
If an Insets animation was cancelled before it could complete,
handle it gracefully.

Fix: 154381667
Test: Run monkey runner that on any window that has edit text
      atest InsetsControllerTests
Change-Id: I052a0455f536a1c839a2782e54f19143295ba6c6
 2021-02-05 17:38:31 +00:00
Antoan Angelov
c6bda518da [RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser" 
This reverts commit 10f79644fc.

Reason for revert: Explained in b/153995973#comment40

Bug: 153995973

Change-Id: I437400528cb98e9ce665ebc308bfe05f4f24ca13
 2021-02-05 11:59:48 +00:00
Cole Faust
89af47ea21 Merge "Create ux restricted customizations for DeviceDefault buttons and switches" into rvc-qpr-dev 2021-02-05 01:24:59 +00:00
TreeHugger Robot
da9d2f5090 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-04 21:32:25 +00:00
TreeHugger Robot
6649fba9a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-04 21:17:16 +00:00
TreeHugger Robot
b0124be005 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-04 20:06:55 +00:00
TreeHugger Robot
82c672dff6 Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-qpr-dev 
* changes:
  Fix legacy APIs when VPN switches to suspended underlying network.
  Backport test coverage from aosp/1547496.
  Backport some helpers in ConnectivityServiceTest.
  Test for bugs with suspended VPN underlying networks.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Improve testing of CONNECTIVITY_ACTION broadcasts.
  Test passing an underlying network array with null network in it.
  Make testVpnNetworkActive more deterministic.
  Make MockVpn more realistic and easier to use.
  Increase test coverage for VPN info sent to NetworkStatsService.
  Simplify MockVpn.
  Test a VPN with an underlying network that does not yet exist.
 2021-02-04 07:01:55 +00:00
Evan Laird
bc878b6a4d DO NOT MERGE: Associate notif cancels with notif posts am: 24a1d2c990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1e59e74decf4453eb0489bbc7139032b9e0387c
 2021-02-04 00:24:25 +00:00
Cole Faust
ef02e3e5f4 Create ux restricted customizations for DeviceDefault buttons and switches 
In automotive, onscreen components can be "ux restricted",
which means you can't use them at the moment for safety reasons,
for example while driving. Make DeviceDefaults buttons and
switches visually change to indicate to the user that they
are ux restricted.

Fixes: 178644245
Test: Manually
Change-Id: I5bccf4c0331fa496be9b90fb41381c9b674bf237
 2021-02-03 14:46:20 -08:00
Evan Laird
24a1d2c990 DO NOT MERGE: Associate notif cancels with notif posts 
CancelNotificationRunnables just spin on the work handler of
NotificationManagerService, hoping that they get executed at the correct
moment after a PostNotificationRunnable and before the next
EnqueueNotificationRunnable completes. Otherwise, you end up in a bad
state where the cancel either is canceling notifications before they get
a chance to post, or missing its only chance to cancel the notification
(for instance, ActivityManagerService is the only caller that can cancel
FGS notifications).

This change attempts to execute a CancelNotificationRunnable at the
moment its run() method is called, otherwise it associates the runnable
with the latest enqueued notificaiton record which has yet to post.

It then associates PostNotificationRunnable with the delayed cancel
list, executing any missed cancel operations immediately upon finishing
the PostNotificationRunnable.

Test: atest SystemUITests NotificationManagerServiceTest; manual
Bug: 162652224
Bug: 119041698
Change-Id: I88d3c5f4fd910a83974c2f84ae3e8a9498d18133
 2021-02-03 15:53:58 -05:00
Miranda Kephart
a27a700887 Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev am: ec9dd28b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13071816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I223a724e33f676432d338c304775f1bd2092a8e0
 2021-02-03 20:49:22 +00:00
Miranda Kephart
c70d040f48 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b96 -s ours 
am skip reason: skipped by user mkephart

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I596ca54fdfa4a36b4e45687f5d746db87d947d6c
 2021-02-03 20:49:16 +00:00
TreeHugger Robot
b74579eb2a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-03 18:12:12 +00:00
Bill Yi
cedf9e55c8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I08a2c5dd92bb39b48e4eb0ffc8c0703f4f60e25a
 2021-02-03 18:12:10 +00:00
TreeHugger Robot
62d3f3abb6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-03 18:06:29 +00:00
TreeHugger Robot
9946795ef4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-03 18:05:36 +00:00
Bill Yi
44aeb32d9d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic3d09832985aa99be71c3ba982650405574cbda1
 2021-02-03 17:01:21 +00:00
Miranda Kephart
c6baa82ffe Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-qpr-dev 2021-02-03 16:50:04 +00:00
Miranda Kephart
ec9dd28b39 Merge "[DO NOT MERGE] Close screenshot process on user switched" into rvc-dev 2021-02-03 16:00:14 +00:00
Miranda Kephart
a8ef91d3d2 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev am: 21eb07cfd0 -s ours am: 3687a2834e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420830

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96ebd7c19ca124bc71cef6835d1ada5af0d90f04
 2021-02-03 15:40:07 +00:00