OSDN Git Service

Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into...
authorChris Tate <ctate@android.com>
Tue, 6 Apr 2021 16:22:21 +0000 (16:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Apr 2021 16:22:21 +0000 (16:22 +0000)
commitced44641d934c5f87e82589934f63eb5a5986f07
tree1d9cc7b91e8b82c38e022bb7e6bfe0f48b62a6a2
parent1c08e32233fef339af2cfdcd1b801af42bd49615
parent2a33098b6c5a1e6094786a8c1ed64ce00bc87245
Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into rvc-qpr-dev
core/java/android/app/ActivityManagerInternal.java
services/core/java/com/android/server/am/ActiveServices.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/notification/NotificationManagerService.java
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java