Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
750,128 Commits 3 Branches 0 Tags
2348e76c09e231e4b1abd5e07377aaac6182c19d
Commit Graph

750128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2348e76c09 Merge "Add ScopedLocalRef for new Strings in JNI" into tm-dev 2022-03-03 15:28:07 +00:00
Philip Junker
abcfe41ed2 Merge "Move logic from PMS#wakePowerGroupLocked() into PowerGroup#wakeUpLocked()." into tm-dev 2022-03-03 15:27:49 +00:00
TreeHugger Robot
01eeccd8fe Merge "Add DozeSuppressor to DozeModule" into tm-dev 2022-03-03 14:45:24 +00:00
Charles Chen
c4c1ac53fd Merge "Promote startActivityAsUser to SystemApi" into tm-dev 2022-03-03 14:26:27 +00:00
Gavin Corkery
4682aac632 Merge "Add isSameApp to PackageManagerInternal" into tm-dev 2022-03-03 13:49:14 +00:00
TreeHugger Robot
33a2b4bacd Merge "Incorporate API feedback: CAI requestCursorUpdates()" into tm-dev 2022-03-03 13:27:04 +00:00
Robert Horvath
1b0ffb5b13 Merge "Mark focused Views as keep clear areas" into tm-dev 2022-03-03 13:14:56 +00:00
Chaohui Wang
527df1cbfa Merge "Enable fixed LicenseHtmlGeneratorFromXmlTest" into tm-dev 2022-03-03 12:55:04 +00:00
Kholoud Mohamed
0f7a1a7083 Merge "broadcast profile-relevant intents to DMRH" into tm-dev 2022-03-03 12:37:57 +00:00
TreeHugger Robot
b7cca6b1ff Merge "MediaHiearchyManager: prevent NPE in updateTargetState()" into tm-dev 2022-03-03 12:15:23 +00:00
Riddle Hsu
f2fe0dbe18 Merge "Add empty addTransactionCommittedListener for StubTransaction" into tm-dev 2022-03-03 11:47:16 +00:00
Tsung-Mao Fang
1db2b7cec6 Merge "Fix a few tests" into tm-dev 2022-03-03 11:41:01 +00:00
TreeHugger Robot
b34bc34f42 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4fe1d2d420 -s ours am: b7da7ff258 -s ours am: ded7bcc73a -s ours am: ce63f7c723 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie97da8a80b2695b27707e2fa79cfec96f98dbdc3
 2022-03-03 11:27:26 +00:00
TreeHugger Robot
7410b316b4 Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev am: 4d4af2e2cf am: d1ea118441 am: bec17ff53d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898

Change-Id: I3c60b16e01db910e3194f62198907456c552f850
 2022-03-03 11:26:34 +00:00
Bill Yi
7f88644c65 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6 am: a16c2cac55 -s ours am: 0fb61ed319 -s ours am: a31350883a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05a4e9fb90b962658f16f1c39ad6098e76735788
 2022-03-03 11:25:59 +00:00
TreeHugger Robot
f89f27e005 Merge "Fix flag in QSSecurityFooter" into tm-dev 2022-03-03 11:13:25 +00:00
TreeHugger Robot
ce63f7c723 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4fe1d2d420 -s ours am: b7da7ff258 -s ours am: ded7bcc73a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I672a86c6ddb0c03d9a48c5cc9e8d0238b111f6ce
 2022-03-03 11:03:50 +00:00
TreeHugger Robot
bec17ff53d Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev am: 4d4af2e2cf am: d1ea118441 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898

Change-Id: I29825e05bac8196dccbe26844118697a277d91b0
 2022-03-03 11:03:29 +00:00
Bill Yi
a31350883a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6 am: a16c2cac55 -s ours am: 0fb61ed319 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I327d49d1c174fa5f1aae0d75ded53a2c1d7969fa
 2022-03-03 11:03:15 +00:00
TreeHugger Robot
fdf73b0ae7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4fe1d2d420 -s ours am: 92bd8e3d33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dbafe0d4cc6df15ab5f201c54f36b327c2fc8da
 2022-03-03 10:53:02 +00:00
Naomi Musgrave
032eae98fe Merge "Refactor content recording out of DisplayContent" into tm-dev 2022-03-03 10:46:43 +00:00
Naomi Musgrave
3302797586 Merge "MediaProjection sets content recording details in WM directly." into tm-dev 2022-03-03 10:45:36 +00:00
Muralidhar Reddy Mule
2156ca39c2 Merge "[MEP] UnsupportedOperationException is thrown when carrier app tries to download subscription." into tm-dev 2022-03-03 10:40:30 +00:00
TreeHugger Robot
ded7bcc73a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4fe1d2d420 -s ours am: b7da7ff258 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fdcb9c01331b82ef912bfbf618a134b4aa24956
 2022-03-03 10:32:09 +00:00
TreeHugger Robot
d1ea118441 Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev am: 4d4af2e2cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898

Change-Id: I079ea3eb1102128d7a4059008884b5f15ed85b08
 2022-03-03 10:32:00 +00:00
Bill Yi
0fb61ed319 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6 am: a16c2cac55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12fff499ce413e52d91517427d52d39571e56b38
 2022-03-03 10:31:53 +00:00
TreeHugger Robot
b7da7ff258 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4fe1d2d420 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id429409feedcadfd6476806b4474d7a6902d2e69
 2022-03-03 10:31:29 +00:00
Wu Ahan
b716e34486 Merge "Log event logs about wallpaper surface request visibility" into tm-dev 2022-03-03 10:31:17 +00:00
TreeHugger Robot
92bd8e3d33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4fe1d2d420 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id48c5cb173b2e9c70c8468102e18c1c76e1387cb
 2022-03-03 10:30:42 +00:00
TreeHugger Robot
215136fda5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e0647b9540 -s ours am: f4dbb096f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e2d5cdaf58a294e1476e9f46df17b71eb1fdb6b
 2022-03-03 10:30:28 +00:00
Wu Ahan
1a2749a1e2 Log event logs about wallpaper surface request visibility 
Bug: 212940778
Bug: 221194708
Test: See b/221194708
Change-Id: I1911bd25e87eb925f693d0e6db6da6840055f77b
 2022-03-03 10:22:02 +00:00
TreeHugger Robot
4d4af2e2cf Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 10:08:40 +00:00
TreeHugger Robot
4fe1d2d420 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-03-03 10:08:40 +00:00
TreeHugger Robot
85efd31de9 Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6 2p: f913029828
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 10:08:40 +00:00
TreeHugger Robot
f4dbb096f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e0647b9540 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibab56362fdb93ce85495e36befa0c34d8e467ae2
 2022-03-03 10:06:50 +00:00
Chaohui Wang
2d3bc30cdb Enable fixed LicenseHtmlGeneratorFromXmlTest 
Test: Run presubmit
Bug: 219375421
Change-Id: Id79dfb9799796d697d50672bbbe3bb8dde6fe434
 2022-03-03 10:05:27 +00:00
Vadim Caen
8fa5667732 Merge "Move OnBackInvokedCallback to window package." into tm-dev 2022-03-03 10:03:41 +00:00
Philip Junker
f1f93f2c17 Move logic from PMS#wakePowerGroupLocked() into PowerGroup#wakeUpLocked(). 
Move quiescent check into PMS#wakeUp. Add tests for
PowerGroup#dreamLocked(), #dozeLocked(), #sleepLocked() and wakeUpLocked().

Test: atest FrameworksServicesTests:PowerManagerServiceTest
Test: atest FrameworksServicesTests:PowerGroupTest
Bug: 200653844
Change-Id: I88782a37be269b9c9d28c22f5add0ecd4f3217af
 2022-03-03 10:37:37 +01:00
Tsung-Mao Fang
6ac2d6a34a Fix a few tests 
Test: Run SettingsLib tests
Fix: 206425424
Change-Id: I0f9c1040a191d90b2729ddc5318ae90f1ca20f00
 2022-03-03 09:33:52 +00:00
TreeHugger Robot
6763835ac0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 09:19:01 +00:00
TreeHugger Robot
d5756b1bda Merge changes from topic "presubmit-am-58188ae3ac814c1f9143426693ab3d03" into sc-v2-dev-plus-aosp am: d22eaf68e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17062829

Change-Id: Ifb40406dcf2751b5897e2a13ac16a5b1f1d58962
 2022-03-03 09:15:35 +00:00
Bill Yi
2e3a4319e9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 86fdb807af am: 65548aaa11 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ab5e8dfef4a91152027cec57df9d95e26232510
 2022-03-03 09:15:23 +00:00
TreeHugger Robot
c840164db8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cd54d570be -s ours am: 02e0f62b17 -s ours am: af26d37b32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id38f5585c67a0be5ad63bb25fceed5a495492f6d
 2022-03-03 09:13:57 +00:00
Bill Yi
138a1f11c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eee138e509 -s ours am: 6b0e3816fd -s ours am: 1d6c1a440f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e2a78996db0aef9748fa148aa4bac78085760aa
 2022-03-03 09:13:25 +00:00
TreeHugger Robot
e0647b9540 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-03 09:11:39 +00:00
TreeHugger Robot
d22eaf68e3 Merge changes from topic "presubmit-am-58188ae3ac814c1f9143426693ab3d03" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 86fdb807af
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 09:11:39 +00:00
Christian Göllner
83b263e77e MediaHiearchyManager: prevent NPE in updateTargetState() 
For some reason, even after adding the checks for -1 in
`isCurrentlyInGuidedTransformation()`, there are still times when
`startHost` and/or `endHost` can be null, causing a NPE.

Fixes: 221754301
Test: N/A
Change-Id: I05d02ac7dcd6b0d8a850f9a8bbef8ce6205a8231
 2022-03-03 10:07:34 +01:00
TreeHugger Robot
c44fdb988e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 08:56:12 +00:00
TreeHugger Robot
accbe584f2 Merge "Move DisplayPowerRequest logic into PowerGroup." into tm-dev 2022-03-03 08:52:24 +00:00
TreeHugger Robot
4415e6e1e3 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 08:49:58 +00:00