Commit Graph

659317 Commits

Author SHA1 Message Date
Kholoud Mohamed
adea53e413 Merge "Revert "Create non-bypassable op restrictions"" into sc-dev am: b04a005c3f am: 1b75773363 am: f5c59257b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14660730

Change-Id: I9a05af77c2d85eebaac58dba9a02bfa6e6a042cb
2021-05-20 11:05:51 +00:00
Kholoud Mohamed
f5c59257b2 Merge "Revert "Create non-bypassable op restrictions"" into sc-dev am: b04a005c3f am: 1b75773363
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14660730

Change-Id: I5b63e2002a15c377acb6ba0fd854eea8b7a58def
2021-05-20 10:40:56 +00:00
Kholoud Mohamed
1b75773363 Merge "Revert "Create non-bypassable op restrictions"" into sc-dev am: b04a005c3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14660730

Change-Id: I5e894fab946234ba61a25d3cb643669ebea0cf2c
2021-05-20 10:09:53 +00:00
Kholoud Mohamed
b04a005c3f Merge "Revert "Create non-bypassable op restrictions"" into sc-dev 2021-05-20 09:48:56 +00:00
Les Lee
73a46899fb [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 8df7b875d4 am: 4a0ba977cc -s ours am: 625dd1690b -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 776fd52d84 is already in history

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

Change-Id: Ide5281e495d5462c2b9316232216cf00d6075c7d
2021-05-20 09:23:54 +00:00
Paul Hu
86fc305311 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: d166cae0b8 am: 40373dc1c2 -s ours am: b31a6b7e1b -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 e0269622bb is already in history

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

Change-Id: I45cd79563f66e5d137234dca42ba70a68da3383d
2021-05-20 09:23:45 +00:00
Les Lee
a135cdb283 [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 8df7b875d4 -s ours am: e689237a80 -s ours am: 4023cc850d -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 ab4abcf073 is already in history

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

Change-Id: I4b3c6babeb8838e90652a6542d093b8ddae0ddc3
2021-05-20 09:23:37 +00:00
Paul Hu
c927e39e1e [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: d166cae0b8 -s ours am: 595e0afb00 -s ours am: 32086d3e2e -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 fac3fc8ff5 is already in history

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

Change-Id: I8fc4c3ca54151e00ffa91944328456c9e88fc7a5
2021-05-20 09:23:24 +00:00
Wei Sheng Shih
63abb977de Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev am: 9a535ee8dd am: 80f7d1d88c am: 0240a384c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271582

Change-Id: Id9d1d915276a4e1a4b8c42004def5db1f4e1854c
2021-05-20 09:22:56 +00:00
Wei Sheng Shih
fa882f10b1 Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev am: 9a535ee8dd am: 60b5e400ef am: 16fd9ea023
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271582

Change-Id: Ia53b47b8ae8728a08f617b85cad8240daf5e9386
2021-05-20 09:22:34 +00:00
Les Lee
625dd1690b [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 8df7b875d4 am: 4a0ba977cc -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 776fd52d84 is already in history

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

Change-Id: Ia29b8d3dd8131762bcbbb7e8e075e2fe3d3bbbe9
2021-05-20 09:15:47 +00:00
Paul Hu
b31a6b7e1b [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: d166cae0b8 am: 40373dc1c2 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 e0269622bb is already in history

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

Change-Id: Iecfef7bbe38e118e52f53de07d653ec5497b0b56
2021-05-20 09:15:39 +00:00
Les Lee
4a0ba977cc Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 8df7b875d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622496

Change-Id: Ic4c5fc6e7fa3b78e52c529b597ca36a5390472e2
2021-05-20 09:11:41 +00:00
Paul Hu
40373dc1c2 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: d166cae0b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622493

Change-Id: Ie9e62c30eea19718b96314b9f4bb4def8e9110c2
2021-05-20 09:10:47 +00:00
Les Lee
4023cc850d [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 8df7b875d4 -s ours am: e689237a80 -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 ab4abcf073 is already in history

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

Change-Id: I2a22974515aa4a66cdc7a479540276c823acb30b
2021-05-20 09:10:18 +00:00
Paul Hu
32086d3e2e [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: d166cae0b8 -s ours am: 595e0afb00 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 fac3fc8ff5 is already in history

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

Change-Id: Ia7084a9812ecb1686a83237a375bd09aeb1176cf
2021-05-20 09:10:10 +00:00
Wei Sheng Shih
0240a384c3 Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev am: 9a535ee8dd am: 80f7d1d88c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271582

Change-Id: I8a706cfa5db74fdcbd30c4a2c3d7a9753cf9a6c2
2021-05-20 09:09:42 +00:00
Wei Sheng Shih
16fd9ea023 Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev am: 9a535ee8dd am: 60b5e400ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271582

Change-Id: Id53f0de596051a03bf92925d985f0053a1a8e929
2021-05-20 09:07:58 +00:00
Les Lee
e689237a80 [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 8df7b875d4 -s ours
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 ab4abcf073 is already in history

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

Change-Id: If1a3eeb5077d7b078a3be260e01c4cf3f6790437
2021-05-20 09:06:38 +00:00
Paul Hu
595e0afb00 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: d166cae0b8 -s ours
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 fac3fc8ff5 is already in history

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

Change-Id: I2b1a734003cf71be772550bfef68f3c057d1f22f
2021-05-20 09:06:24 +00:00
Les Lee
8df7b875d4 Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev 2021-05-20 08:55:59 +00:00
Paul Hu
d166cae0b8 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev 2021-05-20 08:45:35 +00:00
Wei Sheng Shih
60b5e400ef Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev am: 9a535ee8dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271582

Change-Id: I72b060a1432e4c1b0aeaa4bb4a22f02dc5519186
2021-05-20 08:40:03 +00:00
Wei Sheng Shih
80f7d1d88c Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev am: 9a535ee8dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271582

Change-Id: Iaf01cd5ec6b075cb6aae524412f4b6326fb7d0e3
2021-05-20 08:36:57 +00:00
Ming-Shin Lu
62ff750b87 Merge "Fix lockscreen can't get IME insets when split-screen activated" into sc-dev am: fb127be77f am: 92fcaa77fe am: 85de8697d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551405

Change-Id: Ic9e90a6785a8f9329612a5c98b22b18f4ae445d2
2021-05-20 08:32:19 +00:00
Ming-Shin Lu
ae918b040c Merge "Fix lockscreen can't get IME insets when split-screen activated" into sc-dev am: fb127be77f am: f714666760 am: 04e9a6da67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551405

Change-Id: I0b766f9584fec115d8ea862840dc552ae3929612
2021-05-20 08:31:00 +00:00
Wei Sheng Shih
9a535ee8dd Merge "Fix ActivityOption#setTaskOverlay can be covered by other activity." into sc-dev 2021-05-20 08:26:56 +00:00
Ming-Shin Lu
85de8697d1 Merge "Fix lockscreen can't get IME insets when split-screen activated" into sc-dev am: fb127be77f am: 92fcaa77fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551405

Change-Id: I7b078e8770ef16171d6a93325e7cbb3b2760a9d1
2021-05-20 08:15:28 +00:00
Ming-Shin Lu
04e9a6da67 Merge "Fix lockscreen can't get IME insets when split-screen activated" into sc-dev am: fb127be77f am: f714666760
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551405

Change-Id: I3d5523fe2750a585143cae2dd6e56a6217558a02
2021-05-20 08:08:11 +00:00
Ocean Chen
0d02112ea4 Revert "Create non-bypassable op restrictions"
This reverts commit a023924afd.

Reason for revert: Test Monitor triggers the test build

Bug: 188708756
Bug: 188733943
Change-Id: I2d17d4f77287020953fb559cf98ff8475f32ed1b
2021-05-20 07:47:51 +00:00
Ming-Shin Lu
f714666760 Merge "Fix lockscreen can't get IME insets when split-screen activated" into sc-dev am: fb127be77f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551405

Change-Id: I3215fa7f37c4889abc702400593af3fe1eda1649
2021-05-20 07:40:47 +00:00
Ming-Shin Lu
92fcaa77fe Merge "Fix lockscreen can't get IME insets when split-screen activated" into sc-dev am: fb127be77f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551405

Change-Id: I8ce1fb9e8873dd51bd7ed45311ecb4e923faaf89
2021-05-20 07:38:55 +00:00
Ming-Shin Lu
fb127be77f Merge "Fix lockscreen can't get IME insets when split-screen activated" into sc-dev 2021-05-20 07:18:58 +00:00
Joanne Chung
f5c16a60af Merge "Translate TextView content description if exist" into sc-dev am: 86d3f3deae am: 22d97033df am: fde6511972
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543285

Change-Id: If44e8db646ce68ca3f0dbe50c5f81ba0991dc698
2021-05-20 06:38:47 +00:00
Paul Hu
862bc60575 [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 3a706a1771 -s ours am: 216e1f8ce7 -s ours am: a316ba0465 -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 893d544f36 is already in history

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

Change-Id: I9aac6918c0c4ab139021c063212888f048c8a783
2021-05-20 06:38:38 +00:00
Riddle Hsu
0b542ff0c5 Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev am: c63b6d1b2a am: 72abf71e2c am: 84169567c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640274

Change-Id: Ie2857b186d61927f95a50fe2b930457a308b0fc5
2021-05-20 06:38:24 +00:00
Joanne Chung
7fafecc477 Merge "Translate TextView content description if exist" into sc-dev am: 86d3f3deae am: 15676878d8 am: cbccbd1cd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543285

Change-Id: Ifca78d32251c4cfee704aac6b86c11bc9d24b956
2021-05-20 06:37:58 +00:00
Paul Hu
76eb14e4e3 [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 3a706a1771 am: a55ddcc81f -s ours am: fc0926e77c -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 08295d2feb is already in history

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

Change-Id: I9463d961c02eed29feb4170fcc6fddb632e0dd18
2021-05-20 06:37:47 +00:00
Riddle Hsu
80cbbea9fd Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev am: c63b6d1b2a am: c1a188ef19 am: e34b1d06a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640274

Change-Id: I6444cb75ed32ff104c2502202f82a1bae17f80e7
2021-05-20 06:36:44 +00:00
Joanne Chung
fde6511972 Merge "Translate TextView content description if exist" into sc-dev am: 86d3f3deae am: 22d97033df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543285

Change-Id: I1ba1999d7e2911f24cc9359b6cbe5d75765d4ef2
2021-05-20 06:20:56 +00:00
Paul Hu
a316ba0465 [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 3a706a1771 -s ours am: 216e1f8ce7 -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 893d544f36 is already in history

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

Change-Id: I749d7beefd63cd99538ddd61f8abff52d7704323
2021-05-20 06:20:51 +00:00
Riddle Hsu
84169567c4 Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev am: c63b6d1b2a am: 72abf71e2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640274

Change-Id: I0f340ef1054942811aed4abecf86272fec7f074d
2021-05-20 06:20:06 +00:00
Joanne Chung
cbccbd1cd9 Merge "Translate TextView content description if exist" into sc-dev am: 86d3f3deae am: 15676878d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543285

Change-Id: I17534dd22bbc42fdcd9f7e7740b03943d9e73d23
2021-05-20 06:18:50 +00:00
Paul Hu
fc0926e77c [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 3a706a1771 am: a55ddcc81f -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 08295d2feb is already in history

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

Change-Id: I0dad8c143355a20370b36fc06e9bc6a12f4a858c
2021-05-20 06:18:39 +00:00
Riddle Hsu
e34b1d06a0 Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev am: c63b6d1b2a am: c1a188ef19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640274

Change-Id: I8b0358fe4736183229f39b33ddc84389e2c0e2c0
2021-05-20 06:18:26 +00:00
Joanne Chung
15676878d8 Merge "Translate TextView content description if exist" into sc-dev am: 86d3f3deae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543285

Change-Id: I89669c1cbdffdc76ed6d0ded76167607c5590ef5
2021-05-20 06:04:31 +00:00
Paul Hu
a55ddcc81f Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 3a706a1771
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622492

Change-Id: I5a402f666c66f19e849b3bf2e1a7034cbfd97734
2021-05-20 06:04:22 +00:00
Riddle Hsu
c1a188ef19 Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev am: c63b6d1b2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640274

Change-Id: I0ea7f7177fbbf231b65d8bff0bcb3e64467f193d
2021-05-20 06:03:59 +00:00
Joanne Chung
22d97033df Merge "Translate TextView content description if exist" into sc-dev am: 86d3f3deae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543285

Change-Id: I36b4459cb4cfd25a8cdd36e8bb7ca905e2035941
2021-05-20 06:02:51 +00:00
Paul Hu
216e1f8ce7 [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: 3a706a1771 -s ours
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 08295d2feb is already in history

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

Change-Id: Idd31246804a7374929545c7a4c021058a33a9758
2021-05-20 06:02:38 +00:00