Jack Yu
89398af062
Merge "Traffic descriptor only data profile should be enabled" into tm-dev am: e55b0a1f17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567917
Change-Id: I30f34f43502ffe10677e1432c4a05dd51a37de7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 16:07:44 +00:00
Jack Yu
e55b0a1f17
Merge "Traffic descriptor only data profile should be enabled" into tm-dev
2022-05-25 15:46:25 +00:00
TreeHugger Robot
df2b24a558
Merge "Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957" into tm-dev-plus-aosp
2022-05-25 15:32:15 +00:00
Jeff DeCew
9add045b55
Revert suppression of recalculation to fix jump after aod->ls animation am: c003cb8785
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581099
Change-Id: I3790cf5b7ceb9c59e7d31b4bbbe4ba86b2db5960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:56:56 +00:00
Rubin Xu
c8c601c335
Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065
Change-Id: Ic70701d437bc15b73b8ff85004c0329059499d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 12:20:46 +00:00
Rubin Xu
356f81b957
Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065
Change-Id: I8453536d82e840da22d7f94a167f4a95b3826ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 12:01:56 +00:00
Rubin Xu
2b2b455884
Merge "Map WRITE_SECURITY_LOG permission to gid"
2022-05-25 11:43:50 +00:00
Jeff DeCew
c003cb8785
Revert suppression of recalculation to fix jump after aod->ls animation
...
The change I6575f733b17d6c8905150c0a7854d752dd0a5cfe suppressed recalculation of the number of notifications whenever dozeAmount != 0. However, this meant that from the time the device was locked to the time it finished the screen on animation, the number of notifications that fit on the device was never updated. In cases where notifications changed while on aod, this meant the number could be completely wrong. But even without that, this meant that when locking the device and then unlocking, the count would be based on the height of the notifications given their non-keyguard expansion state (i.e. first notification expanded) which meant that we almost always showed too few notifications during the aod->ls transition.
I am unable to reproduce b/229882633 (which that CL was fixing) until I also revert I139d25e2bb57257a18f18f6288f3e18b7a1b72d1 which landed a week later.
Bug: 229882633
Fixes: 232079794
Test: atest NotificationPanelViewControllerTest
Test: numerous failed attempts to reproduce b/229882633#comment2
Test: unlock; screen off (to aod); screen on (to ls); observe no jumps
Test: post notify notifications with "no text" ; slow animations; lock; aod -> ls; post notifications via shell during animation; observe no jumps during or at end of animation
Change-Id: Ib3a3c6377a71cc4c1a1b06eb652237a5493a56d0
2022-05-25 10:59:29 +00:00
Lucas Lin
76ca007028
[automerger skipped] Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev am: 0b2c39c7b2 -s ours
...
am skip reason: Merged-In I35fc360204f0227a969ff2b12a4c47f701a55a9c with SHA-1 3f5bf1f059 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18114464
Change-Id: Ib169631707278e737040a2480aa4280ecfe91371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:35:04 +00:00
lucaslin
8dcd80f7e3
[automerger skipped] Send VPN manager event when VPN is deactivated am: b708333765 -s ours
...
am skip reason: Merged-In I35fc360204f0227a969ff2b12a4c47f701a55a9c with SHA-1 3f5bf1f059 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18114464
Change-Id: I4c1d3a32ae1f77bf80ce62dd8cd53954d8c9a456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:34:50 +00:00
Lucas Lin
0b2c39c7b2
Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED", "CATEGORY_EVENT_DEACTIVATED_BY_USER" into tm-dev
...
* changes:
Send VPN manager event when VPN is deactivated
Send VPN manager event when VPN always-on status is changed
2022-05-25 10:20:18 +00:00
TreeHugger Robot
d94d4f0bd2
Merge "Do not get portInfo if physical address is 0x0000" into tm-dev am: 054f5c15c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570258
Change-Id: If3663a7d9ef50613acaf6b528ddcf7474d7de9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 10:07:39 +00:00
TreeHugger Robot
054f5c15c9
Merge "Do not get portInfo if physical address is 0x0000" into tm-dev
2022-05-25 09:50:05 +00:00
Sudheer Shanka
f9d1137bbb
Merge "Allow shell uid without checking the package name." into tm-dev am: 5caf3932af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18584744
Change-Id: Ia6dfd5a36d36d803ef6f08ca2fd2f904dfd12851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:28:55 +00:00
Sudheer Shanka
5caf3932af
Merge "Allow shell uid without checking the package name." into tm-dev
2022-05-25 08:13:54 +00:00
Tony Huang
225f54892a
Merge "Fix NPE if draging again while animating" into tm-dev am: a876e7b2d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570244
Change-Id: Id96f7a42ee860487749c10ee36b5a157217fcdb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:09:45 +00:00
Calvin Pan
ca00515971
Merge "Fix using incorrect view in app language selection" into tm-dev am: fa264b81be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18579445
Change-Id: I3f794e4add28c46c7e2f77ea39eb12db82f683a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 07:08:48 +00:00
Tony Huang
a876e7b2d0
Merge "Fix NPE if draging again while animating" into tm-dev
2022-05-25 06:53:54 +00:00
Calvin Pan
fa264b81be
Merge "Fix using incorrect view in app language selection" into tm-dev
2022-05-25 06:51:35 +00:00
TreeHugger Robot
401192a1c0
Merge "Use max height attr as backup for device config" into tm-dev am: 248de47fe1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18529605
Change-Id: I78137d58d0d3df36c42ffc4e7839475c24ae3958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:52:24 +00:00
TreeHugger Robot
248de47fe1
Merge "Use max height attr as backup for device config" into tm-dev
2022-05-25 03:26:37 +00:00
Calvin Pan
5f8fa45e80
Fix using incorrect view in app language selection
...
Bug: 233175025
Test: By manual
Change-Id: Idd5b277cdfb737acf9262ff5efbeca93afaa100f
2022-05-25 03:15:19 +00:00
Lyn Han
ef171ff795
Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev am: 5bcfb4c3fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566290
Change-Id: I10c6b9359aad18cb438e7062f9feb59ce3233c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 03:00:52 +00:00
TreeHugger Robot
90b5c42444
Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313
Change-Id: Idc7555a3d1334951c732100a6ab6347fb0c9c91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 02:59:56 +00:00
Matt Casey
f3ddb863ca
Merge "Fix chooser handle color." into tm-dev am: e55d23f3ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581092
Change-Id: If6ecc99254d278a6d2408c9f0fa4f8c17c5e0a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 02:59:36 +00:00
Calvin Pan
40e5e91374
Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev am: 8848ca6f3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18570256
Change-Id: Ia85a9f6abde36fbb17aa8b38b337bfe5b8270812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 02:59:16 +00:00
Matt Casey
6984fa2ca1
Merge "Align outer edge of profile tabs and icons" into tm-dev am: 4a191d7fad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18566767
Change-Id: Ie32c9831e186f77e549f7b39b63b5f55e3c434e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 02:58:49 +00:00
Lyn Han
5bcfb4c3fd
Merge "Revert "Make media squishy for portrait shade open and close"" into tm-dev
2022-05-25 02:49:22 +00:00
TreeHugger Robot
d5b0c3f163
Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev
2022-05-25 02:40:34 +00:00
Matt Casey
e55d23f3ae
Merge "Fix chooser handle color." into tm-dev
2022-05-25 02:40:30 +00:00
Calvin Pan
8848ca6f3b
Merge "Fix app language show "Und" when all languages in the suggestion list" into tm-dev
2022-05-25 02:36:24 +00:00
Matt Casey
4a191d7fad
Merge "Align outer edge of profile tabs and icons" into tm-dev
2022-05-25 02:34:45 +00:00
TreeHugger Robot
b7b6f4db45
Merge "[CDM] Update binding flag for self-managed apps" into tm-dev am: c4be963fe0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567157
Change-Id: I08977b9fbca434074ef8f72c0085e820c92d57b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:46:40 +00:00
TreeHugger Robot
c4be963fe0
Merge "[CDM] Update binding flag for self-managed apps" into tm-dev
2022-05-25 01:38:30 +00:00
Yuri Lin
bb4c1d7752
Merge "Disable review permissions notification with config flag" into tm-dev am: fe8f3855a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18581093
Change-Id: Idc6433b46fccd6d98f3991e40086ffb9cb4acf30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:29:45 +00:00
Santos Cordon
c26ff2d8e2
Merge "Apply a maximum time to Screen brightness RampAnimator." into tm-dev am: 7cda9b01e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17707268
Change-Id: I4479d0811c1e3b6324fedea8a83c500aab12c1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:29:29 +00:00
TYM Tsai
15ccd31eeb
Merge "Fix inline tooltip position is wrong" into tm-dev am: edca30dce8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350147
Change-Id: Ia7e2af3df18f68943d9cb45fd02dcdc44c10e42b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 01:28:36 +00:00
Yuri Lin
fe8f3855a6
Merge "Disable review permissions notification with config flag" into tm-dev
2022-05-25 01:26:47 +00:00
Santos Cordon
7cda9b01e3
Merge "Apply a maximum time to Screen brightness RampAnimator." into tm-dev
2022-05-25 01:11:38 +00:00
TYM Tsai
edca30dce8
Merge "Fix inline tooltip position is wrong" into tm-dev
2022-05-25 01:05:17 +00:00
Sudheer Shanka
6db81c15df
Allow shell uid without checking the package name.
...
Bug: 230779051
Test: manual
Change-Id: I2867a15840a0987c948179e2f8069e652c4a0c1f
2022-05-24 17:37:48 -07:00
TreeHugger Robot
fed94f67d9
Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev am: ec3ee0a5c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577093
Change-Id: I4500dffa6905ec35c62a40012ca4b73079449b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:14:41 +00:00
TreeHugger Robot
ec3ee0a5c3
Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev
2022-05-25 00:08:29 +00:00
Jack Wang
62019ce6b5
Merge "Grant visibility of voice interaction to the client app" into tm-dev am: b92b97dd6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730109
Change-Id: I98fc38862aa3806fd5ba08035f4d29aa4b7f2d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:06:14 +00:00
skxu
ba9d4a3b30
Use max height attr as backup for device config
...
Fixes: 231754479
Test: Manual. Verified that change works on a physical device via device config commands.
Change-Id: I63f635ffaa258625aff7a2a23e54eacedeb5da71
2022-05-25 00:05:06 +00:00
TreeHugger Robot
81c5dfc798
Merge "NotificationPanelViewController: separate DEBUG flag for drawable" into tm-dev am: cbad872980
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18586451
Change-Id: I47d35637576457c6026cc9c3b86bb8d93f97e377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:04:59 +00:00
Andrey Epin
811af17338
Merge "Fix a11y navigation in Chooser" into tm-dev am: 247cb3a3bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18408340
Change-Id: If12a696b18c96de41c474a5b1fd41ddbdaf438a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:04:15 +00:00
Jack Wang
b92b97dd6d
Merge "Grant visibility of voice interaction to the client app" into tm-dev
2022-05-24 23:59:11 +00:00
TreeHugger Robot
cbad872980
Merge "NotificationPanelViewController: separate DEBUG flag for drawable" into tm-dev
2022-05-24 23:55:07 +00:00
Andrey Epin
247cb3a3bc
Merge "Fix a11y navigation in Chooser" into tm-dev
2022-05-24 23:45:14 +00:00