Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
499,274 Commits 3 Branches 0 Tags
aa456df74ebf1428cc456a65ffc360a948854bc3
Commit Graph

499274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wenhao Wang
aa456df74e [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id295b15c1e6469ee9f50babb2f4c057d78d67e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:35:00 +00:00
Wenhao Wang
c543f70e3d [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I44b0bee5c0ba597407652dd2c1af868adcee724a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 06:11:04 +00:00
Wenhao Wang
8bb5e98ecb Revert "[conflict] Move service initialization am: 38fe45b539" 
This reverts commit 012cace2ee.

Reason for revert: This CL depends on ag/17823648, which is not merged into qt-qpr1-dev.

Change-Id: I503bcc1e979dd4db941cb7754f63a0dc35ce9682
 2022-05-30 05:30:08 +00:00
Julia Reynolds
b50f345f57 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I1f15a3a4dd6fe04321ecda11bb16dc6f2aef175c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:53:17 +00:00
Julia Reynolds
f3a82a3b59 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I094361ea2d938bd3e7ff77e66f68cf23d8e25ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:05:13 +00:00
Julia Reynolds
012cace2ee [conflict] Move service initialization am: 38fe45b539 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563202

Change-Id: If27ee7e26bcf2797a6a4a770f2a5064605cdeaa0
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 15:24:30 +00:00
Julia Reynolds
2ee5edda84 [automerger skipped] Move service initialization am: caa5a22ea0 -s ours 
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history

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

Change-Id: I9b3572694f3424ba5da6b52fe06b3c71b23b3efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:32:51 +00:00
Julia Reynolds
14d7f081c8 Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-24 23:15:56 +00:00
Julia Reynolds
caa5a22ea0 Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-24 16:14:17 -07:00
Julia Reynolds
38fe45b539 Move service initialization 
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
 2022-05-23 16:03:12 -07:00
Lucas Lin
1f68b323f3 Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994

Change-Id: I302b84b9b7fd6bd62dbac6eec2eb37b389a431eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 00:10:36 +00:00
Lucas Lin
7ba3a378c5 Merge "Clear mInterface before calling resetIkeState()" into rvc-dev 2022-05-19 23:46:09 +00:00
TreeHugger Robot
a4bbe303ff [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356706

Change-Id: Ie110b8cfd17e441789f225ca8743d60a65365a92
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 00:33:45 +00:00
TreeHugger Robot
a70add46f3 Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev 2022-05-17 23:37:35 +00:00
Hui Yu
023509e487 Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 
This is to stop spoofed packageName to pretend to be allowListed
packageName so it can bypass the BG-FGS restriction. This applies to
both BG-FGS while-in-use restriction and BG-FGS-start restriction
since these two restrictions are related.

Bug: 216695100
Bug: 215003903
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testSpoofPackageName
Change-Id: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
BYPASS_INCLUSIVE_LANGUAGE_REASON=Legacy API
 2022-05-17 20:16:05 +00:00
Manjeet Rulhania
7aaba89b77 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours 
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: Icad731f56b018936687104b34dec1dc6cd2afda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 21:14:01 +00:00
Manjeet Rulhania
94c1765004 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours 
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: I1889b690d52231c896cdc65983be4febdb6eb984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 20:53:20 +00:00
Manjeet Rulhania
e545a5dbbf Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18078651

Change-Id: I0e25a20970648244c2a72581478f5a09ac6c10b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-In: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
 2022-05-16 19:49:21 +00:00
Manjeet Rulhania
b22a6d7372 Merge "Fix duplicate permission privilege escalation" into qt-dev 2022-05-16 16:13:01 +00:00
Manjeet Rulhania
31bd425bb6 Fix duplicate permission privilege escalation 
Duplicate permissions definition with different group allows
privilege permission escalation to a different permission group.

Android studio and gradle plugin does not allow duplicate
permissions with different attributes, these tools only allow
if duplicate permissions are exact copies.

Also platform stores permissions in map at multiple places with
permission name as key. This suggests that we can disallow
duplicate permissions during package install/update.

Bug: 213323615
Test: manual
Change-Id: I6f44e740897305e7a0553c1cf6c3af37faf02a2e
Merged-In: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-In: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
 2022-05-16 02:06:24 +00:00
Manjeet Rulhania
f689ec94c6 Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083515

Change-Id: I64289b97a4277cde614e132aa19a971fd065db97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-15 17:35:31 +00:00
Manjeet Rulhania
3624b53d39 Merge "Fix duplicate permission privilege escalation" into rvc-dev 2022-05-15 16:45:22 +00:00
Manjeet Rulhania
f9a9dc720c Fix duplicate permission privilege escalation 
Duplicate permissions definition with different group allows
privilege permission escalation to a different permission group.

Android studio and gradle plugin does not allow duplicate
permissions with different attributes, these tools only allow
if duplicate permissions are exact copies.

Also platform stores permissions in map at multiple places with
permission name as key. This suggests that we can disallow
duplicate permissions during package install/update

Bug: 213323615
Test: AppSecurityTests
Change-Id: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-Id: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
 2022-05-14 03:55:04 +00:00
TreeHugger Robot
dc535c71d1 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f5ca43565f031130ea9b50017ff97fcd5a76301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:31 +00:00
Julia Reynolds
c822f7cd66 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0515b68504ea8211a27595c6f2e415df11e033d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:27 +00:00
TreeHugger Robot
d5d87d85f3 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1574511d068f56b8f83f3fda26057ae810fa05fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:01:07 +00:00
Julia Reynolds
cec8c138ed [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb3ad174c4cf360df25d1ec78dc1d237acf07981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:00:58 +00:00
TreeHugger Robot
496cbf106c Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: Ica995d8951592fa4361a2b5cc617b9ebec076d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 20:23:49 +00:00
Julia Reynolds
bf6983a9ea DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I57b968cab49f7d3eef8028ea92d571d5b68489e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 20:23:46 +00:00
TreeHugger Robot
afc2de4708 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I6b1808d2494f9b37f60a7fd53af3e5a89af10939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 20:14:09 +00:00
TreeHugger Robot
e7da6dd26e Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev 2022-05-12 19:50:55 +00:00
TreeHugger Robot
e91ae52a85 Merge "Crash invalid FGS notifications" into rvc-qpr-dev 2022-05-12 19:48:54 +00:00
TreeHugger Robot
97fc7b179e Merge "Crash invalid FGS notifications" into rvc-dev 2022-05-12 19:47:14 +00:00
lucaslin
65d44b93bb Clear mInterface before calling resetIkeState() 
Clear mInterface before calling resetIkeState() in
onDefaultNetworkChanged().
resetIkeState() will trigger interfaceRemoved() to be called.
If mInterface is set, interfaceRemoved() will clear
Ikev2VpnRunner which makes VPN disconnect.

This issue can be reproduced when device establishes VPN
connection with mobile data first then connects to wifi.
In this case, onLost() for mobile data will not be called
because there is a new network(wifi) can satisfy the request,
so only onAvailable() for wifi will be called.
Which means onSessionLost() will not be called and only
onDefaultNetworkChanged() will be called, which makes that
mInterface is not cleared before interfaceRemoved() is called.

Bug: 219546241
Test: Check if VPN is still there when establishing VPN with
      mobile data first, then connect to wifi and disconnect
      wifi.
Change-Id: I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc
(cherry picked from commit 520cc2fde3)
Merged-In: I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc
 2022-05-10 10:18:56 +00:00
Victor Berchet
83b4fadcb7 [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours am: 938c647b7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31a2312fc7520654a27fe3736c55650746c744d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:19 +00:00
Victor Berchet
3020cc3897 [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08f7f5a2b91a7c1a096913f4a083c46e997543e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:37:13 +00:00
Victor Berchet
938c647b7a [automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev am: f44dc5cee3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3201f14b5a79528eec09c5eb5d6d4647d32597d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:13:11 +00:00
Victor Berchet
d93fd9dd8e [automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86c387fdcbbc16923d096af5795c168c1a853a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:13:01 +00:00
Victor Berchet
f44dc5cee3 Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6"" into qt-qpr1-dev 2022-05-02 21:52:05 +00:00
Victor Berchet
a492c2f2d9 Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" 
This reverts commit 1ca6f8ddb8.

Reason for revert: DroidMonitor: Potential culprit for Bug 231171562 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Ib5819de2ce4e60deae5676eed9947cbbb759be10
 2022-05-02 20:29:01 +00:00
Wenhao Wang
203de0f0bc [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours am: 548bf8cc64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I944d361c3735abbc19f881e73c5ec9723f9f1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:06:38 +00:00
Wenhao Wang
583031670c [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours am: 764c1ec926 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I986f71ba31b73494acd5bccf7f2e74013ce0c8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 18:06:28 +00:00
Wenhao Wang
548bf8cc64 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours am: 7f401aa888 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe987f2aeb4c39d9f7d9db395b22215e4f017b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:51:04 +00:00
Wenhao Wang
7f401aa888 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev am: 248bbf2dca -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 85c00b98a6 is already in history

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

Change-Id: I196db203b04b4c90b7907759f523f1e18aa12f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:44:48 +00:00
Wenhao Wang
764c1ec926 [automerger skipped] [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 am: 1ca6f8ddb8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4a62bdee1f85343228bb6179e3a16433b7c1f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 17:43:50 +00:00
Wenhao Wang
1ca6f8ddb8 [conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17823648

Change-Id: I248486e7eb6210ba54b30276cfce15a18dc5f9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 21:00:00 +00:00
Wenhao Wang
a78e5a9d05 [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd0c -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 52bd9bb597 is already in history

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

Change-Id: I4399a5293675798602da8aedbbd63ddfc1d1dafc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:59 +00:00
Wenhao Wang
15810f6001 [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6b2 -s ours 
am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 52bd9bb597 is already in history

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

Change-Id: I27d80aec2d2600c0dc4ea53e22c7424593405263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:39:56 +00:00
Wenhao Wang
4228c9bd0c Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev 2022-04-28 19:45:04 +00:00
Wenhao Wang
248bbf2dca Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into qt-dev 2022-04-28 19:44:46 +00:00