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

Commit 64779bc9 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Refactor Broadcasts related logic out of AMS." into main

parents 590d2642 086811c0

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;