Flavio Fiszman
79b3f0520c
Merge "Change People Tile config activity layout" into sc-dev
2021-03-31 12:32:51 +00:00
Kholoud Mohamed
89096eea16
[automerger skipped] Merge "Create new permission QUERY_AUDIO_STATE" am: ddf5a7dc62 am: 06179bfbd8 am: 5efda0886d -s ours
...
am skip reason: skip tag Change-Id If1bfcb1341402717fec74cc704caa7e1eb18fa2e with SHA-1 63a2278e0b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652850
Change-Id: I2f37b3fe1856c47cbceeb52893c828bbc1509e9b
2021-03-31 12:07:47 +00:00
Kholoud Mohamed
cede725795
[automerger skipped] Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca am: 51a15fab3f am: cbebf234e2 -s ours
...
am skip reason: skip tag Change-Id I8a2a49aa45704d8991e9cf3689b5259442fb1db3 with SHA-1 5e7b121444 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093
Change-Id: Idce06f26f46d5842e657e0ec5cece709c5863e30
2021-03-31 12:06:44 +00:00
Anton Hansson
1a737c45cc
[automerger skipped] Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64 am: e52b6cba86 am: 556944ee49 -s ours
...
am skip reason: skip tag Change-Id I74f20b37d23370e258e7fc7130e28c5312abf46c with SHA-1 0de31fe1e2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658122
Change-Id: I79fab0b97a30cf0ccf542aaac27ecf840ad3620a
2021-03-31 12:05:53 +00:00
Chalard Jean
59634a7fc7
Merge changes Id7ee1bd3,I5ea44a94 into sc-dev
...
* changes:
[NS08] Expose public NetworkScore API
[NS07] Add the rest of the scoring policy
2021-03-31 11:42:19 +00:00
Anton Hansson
a154af8881
Merge "Delete framework-updatable-sources filegroup" into sc-dev
2021-03-31 11:36:40 +00:00
Kholoud Mohamed
0c6dd4d8e2
Merge "Remove silent provisioning hack from DPMS" into sc-dev
2021-03-31 11:30:36 +00:00
Jason Chang
dfe477f26d
Merge "Apply "Dominant Palette A - 800" color to the background of One-Handed mode" into sc-dev
2021-03-31 11:29:11 +00:00
Kholoud Mohamed
5efda0886d
Merge "Create new permission QUERY_AUDIO_STATE" am: ddf5a7dc62 am: 06179bfbd8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652850
Change-Id: Ie24548086d23070ac0bef7b96f777e4da1cda152
2021-03-31 11:28:34 +00:00
Kholoud Mohamed
cbebf234e2
Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca am: 51a15fab3f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093
Change-Id: Ida36341fdbff976ae4b60ab71d78195facb36621
2021-03-31 11:28:08 +00:00
Anton Hansson
556944ee49
Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64 am: e52b6cba86
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658122
Change-Id: I9608abaf2ea697d453c802f66beae0c3c6e55680
2021-03-31 11:27:22 +00:00
TreeHugger Robot
c6a4ff2641
[automerger skipped] Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." into mainline-prod am: 21f28e69e1 -s ours
...
am skip reason: skip tag Change-Id I3303bb14516f07a55d82a16b59c111ab3f8b0389 with SHA-1 8fdfd46218 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049945
Change-Id: Ifab31b0e5609ded3e7a571a1b576477b9912af04
2021-03-31 11:26:50 +00:00
TreeHugger Robot
7735cb4771
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 11:17:08 +00:00
Kholoud Mohamed
06179bfbd8
Merge "Create new permission QUERY_AUDIO_STATE" am: ddf5a7dc62
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652850
Change-Id: Ied477808e908f2d54451879b22e747d2bea2d5cd
2021-03-31 10:52:07 +00:00
Kholoud Mohamed
51a15fab3f
Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093
Change-Id: I6d9bd8c1e97e9b40b7458d7f82466fb665d74f09
2021-03-31 10:48:59 +00:00
TreeHugger Robot
21f28e69e1
Merge "BroadcastInterceptingContext: use passed-in broadcast Handler." into mainline-prod
2021-03-31 10:45:57 +00:00
Anton Hansson
e52b6cba86
Merge "Partial cp of "Prepare role code for modularization."" am: a81f292a64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658122
Change-Id: I2ac5306261e93c99a3a38b1ad0cd9f68525f2ec1
2021-03-31 10:45:37 +00:00
Anton Hansson
23c24d3364
[automerger skipped] Merge "Remove custom annotation libs" am: 355f8c28b1 am: a056f69a7a am: 45e3d62dfa -s ours
...
am skip reason: skip tag Change-Id I4583da7bf5849783d6c5e88a762e04a8fe3e8760 with SHA-1 31df3e6e2b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658119
Change-Id: I98f03bba691b32d9ceafb6be431f7ba9887dcb6b
2021-03-31 10:45:27 +00:00
Josh Gao
5e4659c7f9
Merge "NativeTombstoneManager: track proto change." am: 5e3543c626 am: 9dc77df4b6 am: e370cca30a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657519
Change-Id: I0de4ba105b5ce791127ca22e5966bb650fe85316
2021-03-31 10:45:06 +00:00
Flavio Fiszman
e4931c88d5
Change People Tile config activity layout
...
Change-Id: I7df41980e1d9fe6b14a91be9ff68fad0c1c7185f
Test: manual
Bug: 183721209
2021-03-31 10:34:13 +00:00
Kholoud Mohamed
ddf5a7dc62
Merge "Create new permission QUERY_AUDIO_STATE"
2021-03-31 10:28:01 +00:00
Kholoud Mohamed
531fcd63ca
Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD"
2021-03-31 10:27:23 +00:00
Louis Chang
579904799b
Merge "Fixes few corner issues of multi-window windowing mode split-screen" into sc-dev
2021-03-31 10:21:58 +00:00
Wilson Wu
889e3d63bb
Merge "Make IInputMethodPrivilegedOperations to async (1/N)" into sc-dev
2021-03-31 10:17:25 +00:00
Anton Hansson
a81f292a64
Merge "Partial cp of "Prepare role code for modularization.""
2021-03-31 10:14:11 +00:00
TreeHugger Robot
b2ee6ea14d
Merge "Send input timeline from app to InputDispatcher" into sc-dev
2021-03-31 10:11:49 +00:00
Anton Hansson
b3394bc5a2
Partial cp of "Prepare role code for modularization."
...
This keeps MainThread building against core_current.
Test: m framework-annotations-lib
Merged-In: I74f20b37d23370e258e7fc7130e28c5312abf46c
Change-Id: Iaa9833a5615c80b58e64975d4f0f0e38a5e76a3e
2021-03-31 11:09:22 +01:00
Anton Hansson
45e3d62dfa
Merge "Remove custom annotation libs" am: 355f8c28b1 am: a056f69a7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658119
Change-Id: If1a872b9c574e906eecdd9821b980709011e9f83
2021-03-31 10:03:53 +00:00
Josh Gao
e370cca30a
Merge "NativeTombstoneManager: track proto change." am: 5e3543c626 am: 9dc77df4b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657519
Change-Id: Id01822def93f911af8d913ad5772e3dcab88b169
2021-03-31 10:03:05 +00:00
Anton Hansson
35c0b09876
Delete framework-updatable-sources filegroup
...
Inline these sources in the only place it is used.
Bug: 184125529
Test: presubmit
Change-Id: I42e7044471262bf901b8c130a50e1a8a8170c600
2021-03-31 09:33:33 +00:00
TreeHugger Robot
91aea8ebc8
Merge "Tweak exposure effect on ImageWallpaper." into sc-dev
2021-03-31 09:31:23 +00:00
Lorenzo Colitti
aa7de1bfcd
BroadcastInterceptingContext: use passed-in broadcast Handler.
...
Currently, BroadcastInterceptingContext always runs broadcast
receivers on the thread that called sendBroadcast. This means:
1. Receivers might run on the wrong thread, making the test less
realistic.
2. If any receiver checks what thread it's running on, then
either the check needs to be modified or deleted, or the test
must call sendBroadcast on the thread that the receiver
expects to run on. The latter is impossible when there is more
than one receiver that needs to run on more than one thread.
This CL adds a setUseRegisteredHandlers method that allows tests
to say that they want each receiver to run on the Handler
specified at registration time.
This CL also enables the new mode for ConnectivityServiceTest,
and resolves a TODO to re-enable a disabled thread check.
The new mode cannot be enabled by default because it would break
most of the tests.
[This is a partial cherry-pick of an AOSP change that also
made changes to ConnectivityServiceTest, and which conflicts in
mainline-prod. This CL only includes the changes to
BroadcastInterceptingContext.]
Bug: 173331190
Test: atest TetheringTests
Merged-In: I3303bb14516f07a55d82a16b59c111ab3f8b0389
Change-Id: I95c2371d4e9f51aab2bc6e6368d133e8a75987cd
2021-03-31 18:28:14 +09:00
Anton Hansson
a056f69a7a
Merge "Remove custom annotation libs" am: 355f8c28b1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658119
Change-Id: I3892eeaa0b31bbef26d4599bd0f37591956a1f79
2021-03-31 09:26:34 +00:00
Anton Hansson
355f8c28b1
Merge "Remove custom annotation libs"
2021-03-31 09:20:54 +00:00
Josh Gao
9dc77df4b6
Merge "NativeTombstoneManager: track proto change." am: 5e3543c626
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657519
Change-Id: I02fc90f30cd8728db564df509e8a4869f12646b4
2021-03-31 09:20:05 +00:00
Zhen Zhang
eed249828f
Merge "Create package-level last time usage stats for app hibernation" into sc-dev
2021-03-31 09:04:50 +00:00
Ioannis Ilkos
50d4ba03b5
Merge "Per process DMA-BUF stats" into sc-dev
2021-03-31 08:48:55 +00:00
TreeHugger Robot
5255b95e96
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 08:44:29 +00:00
Rubin Xu
34242f4c5a
Merge "Disable write-ahead log on LockSettingsStorage" into sc-dev
2021-03-31 08:44:05 +00:00
Paul Hu
dbb6403a1a
Merge "Add documents for isOem/Vendor/Product" am: 67b816def6 am: 1593239f22 am: 055f044724
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657399
Change-Id: I919cb5686b00247e8b3f158b2a881fb21f87651b
2021-03-31 08:42:31 +00:00
Josh Gao
5e3543c626
Merge "NativeTombstoneManager: track proto change."
2021-03-31 08:29:54 +00:00
Jeff Chang
6742af3acc
Merge "Revert f714906c for startActivityForResult" into sc-dev
2021-03-31 08:23:11 +00:00
Suprabh Shukla
fad1fea130
Merge "Fail callers that use exact alarms without permission" into sc-dev
2021-03-31 08:11:59 +00:00
Paul Hu
055f044724
Merge "Add documents for isOem/Vendor/Product" am: 67b816def6 am: 1593239f22
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657399
Change-Id: I8787bcfb24a901528c41ade5e175aed859539ff1
2021-03-31 07:57:36 +00:00
Nataniel Borges
2935ef01dc
Merge "Move Pip assertions to flickerlib" into sc-dev
2021-03-31 07:54:24 +00:00
Louis Chang
3f790d2eba
Merge "Dump warning logs to prevent app crash while no top-resumed changes" into rvc-qpr-dev am: b6d433cdbd am: 2b5dae1c57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896651
Change-Id: I4719a6ff203dafa59fd688f405efe44f19c1577b
2021-03-31 07:17:54 +00:00
Paul Hu
1593239f22
Merge "Add documents for isOem/Vendor/Product" am: 67b816def6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657399
Change-Id: Ib6deea94f8e17808b355b586dc29c2e1c6aa380c
2021-03-31 07:13:18 +00:00
Jason Chang
c15df4e3ac
Apply "Dominant Palette A - 800" color to the background of
...
One-Handed mode
Change the One-Handed mode background color to
Dominant Palette A - 800. (#3C4043)
Bug: 177314967
Test: manual
Test: atest WMShellUnitTests
Change-Id: I68852d362f6f425832d36f3e60c2a41b9e505216
2021-03-31 15:11:16 +08:00
Louis Chang
2b5dae1c57
Merge "Dump warning logs to prevent app crash while no top-resumed changes" into rvc-qpr-dev am: b6d433cdbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896651
Change-Id: I199c71ab75007a6fef25c71ecf433d2f939e43e9
2021-03-31 06:55:05 +00:00
Bill Lin
eb4158fbb0
Merge "Dispatch newDisplayLayout in updateDisplayLayout() directly" into sc-dev
2021-03-31 06:53:40 +00:00