Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 086811c0 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Refactor Broadcasts related logic out of AMS. 

This is a no-op refactor that moves the broadcasts
related code out of the AMS class. However, there is
still a portion of broadcasts related logic remaining
in AMS, which will be addressed in subsequent changes.

Bug: 361161826
Test: atest ./services/tests/mockingservicestests/src/com/android/server/am/ActivityManagerServiceTest.java
Test: atest ./services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java
Test: atest ./services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java
Flag: EXEMPT refactor
BYPASS_INCLUSIVE_LANGUAGE_REASON=Existing code

Change-Id: I1ecbbe50200cc9cf89da40bb6d9f4a4263234c07
parent 83aa0229

services/core/java/com/android/server/am/ActivityManagerService.java

+97 −2296

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/am/BroadcastController.java

0 → 100644
+2410 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/am/ActivityManagerServiceTest.java

+3 −6
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import static android.app.ActivityManager.PROCESS_STATE_SERVICE; 
import static android.app.ActivityManager.PROCESS_STATE_TOP;

import static android.app.ActivityManager.PROCESS_STATE_TRANSIENT_BACKGROUND;

import static android.app.ActivityManager.PROCESS_STATE_UNKNOWN;

import static android.os.PowerExemptionManager.REASON_DENIED;

import static android.content.ContentResolver.SCHEME_CONTENT;

import static android.os.PowerExemptionManager.REASON_DENIED;

import static android.os.UserHandle.USER_ALL;

import static android.util.DebugUtils.valueToString;
@@ -68,11 +68,9 @@ import static org.mockito.ArgumentMatchers.nullable; 
import static org.mockito.Mockito.after;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;
@@ -84,7 +82,6 @@ import android.app.AppOpsManager; 
import android.app.BackgroundStartPrivileges;

import android.app.BroadcastOptions;

import android.app.ForegroundServiceDelegationOptions;

import android.app.IApplicationThread;

import android.app.IUidObserver;

import android.app.Notification;

import android.app.NotificationChannel;
@@ -129,7 +126,7 @@ import androidx.test.platform.app.InstrumentationRegistry; 
import com.android.dx.mockito.inline.extended.ExtendedMockito;

import com.android.sdksandbox.flags.Flags;

import com.android.server.LocalServices;

import com.android.server.am.ActivityManagerService.StickyBroadcast;

import com.android.server.am.BroadcastController.StickyBroadcast;

import com.android.server.am.ProcessList.IsolatedUidRange;

import com.android.server.am.ProcessList.IsolatedUidRangeAllocator;

import com.android.server.am.UidObserverController.ChangeRecord;