Merge "Introduced WindowProcessController/Listener (10/n)" (1248d0db) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.view.RemoteAnimationAdapter;

		import com.android.internal.app.IVoiceInteractor;

		import java.util.ArrayList;
		import java.util.List;

		/**
		@@ -204,4 +205,12 @@ public abstract class ActivityManagerInternal {

		/** Closes all system dialogs. */
		public abstract void closeSystemDialogs(String reason);

		/** Kill the processes in the list due to their tasks been removed. */
		public abstract void killProcessesForRemovedTask(ArrayList<Object> procsToKill);

		/**
		* Returns {@code true} if {@code uid} is running an activity from {@code packageName}.
		*/
		public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);
		}

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY
		import static android.view.accessibility.AccessibilityEvent.WINDOWS_CHANGE_ACCESSIBILITY_FOCUSED;
		import static android.view.accessibility.AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS;
		import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS;

		import static com.android.internal.util.FunctionalUtils.ignoreRemoteException;
		import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

		@@ -30,8 +29,6 @@ import android.accessibilityservice.AccessibilityServiceInfo;
		import android.accessibilityservice.IAccessibilityServiceClient;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.ActivityManagerInternal;
		import android.app.ActivityTaskManagerInternal;
		import android.app.AlertDialog;
		import android.app.AppOpsManager;
		import android.app.PendingIntent;
		@@ -112,10 +109,9 @@ import com.android.internal.util.DumpUtils;
		import com.android.internal.util.IntPair;
		import com.android.internal.util.function.pooled.PooledLambda;
		import com.android.server.LocalServices;
		import com.android.server.wm.ActivityTaskManagerInternal;
		import com.android.server.wm.WindowManagerInternal;

		import libcore.util.EmptyArray;

		import org.xmlpull.v1.XmlPullParserException;

		import java.io.FileDescriptor;
		@@ -134,6 +130,8 @@ import java.util.Set;
		import java.util.function.Consumer;
		import java.util.function.IntSupplier;

		import libcore.util.EmptyArray;

		/**
		* This class is instantiated by the system as a system level service and can be
		* accessed only by the system. The task of this service is to be a centralized

services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.annotation.Nullable;
		import android.app.ActivityManager;
		import android.app.ActivityTaskManager;
		import android.app.ActivityManagerInternal;
		import android.app.ActivityTaskManagerInternal;
		import android.app.AppGlobals;
		import android.app.IActivityManager;
		import android.app.IActivityTaskManager;
		@@ -83,6 +82,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.server.LocalServices;
		import com.android.server.autofill.AutofillManagerService.AutofillCompatState;
		import com.android.server.autofill.ui.AutoFillUI;
		import com.android.server.wm.ActivityTaskManagerInternal;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -534,7 +534,7 @@ final class AutofillManagerServiceImpl {
		} catch (NameNotFoundException e) {
		throw new SecurityException("Could not verify UID for " + componentName);
		}
		if (callingUid != packageUid && !LocalServices.getService(ActivityTaskManagerInternal.class)
		if (callingUid != packageUid && !LocalServices.getService(ActivityManagerInternal.class)
		.hasRunningActivity(callingUid, packageName)) {
		final String[] packages = pm.getPackagesForUid(callingUid);
		final String callingPackage = packages != null ? packages[0] : "uid-" + callingUid;

services/autofill/java/com/android/server/autofill/Session.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package com.android.server.autofill;

		import static android.app.ActivityTaskManagerInternal.ASSIST_KEY_RECEIVER_EXTRAS;
		import static android.app.ActivityTaskManagerInternal.ASSIST_KEY_STRUCTURE;
		import static android.service.autofill.AutofillFieldClassificationService.EXTRA_SCORES;
		import static android.service.autofill.FillRequest.FLAG_MANUAL_REQUEST;
		import static android.service.autofill.FillRequest.INVALID_REQUEST_ID;
		@@ -33,6 +31,8 @@ import static com.android.server.autofill.Helper.sPartitionMaxCount;
		import static com.android.server.autofill.Helper.sVerbose;
		import static com.android.server.autofill.Helper.toArray;
		import static com.android.server.autofill.ViewState.STATE_RESTARTED_SESSION;
		import static com.android.server.wm.ActivityTaskManagerInternal.ASSIST_KEY_RECEIVER_EXTRAS;
		import static com.android.server.wm.ActivityTaskManagerInternal.ASSIST_KEY_STRUCTURE;

		import android.annotation.NonNull;
		import android.annotation.Nullable;

services/core/java/com/android/server/DeviceIdleController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.server;
		import android.Manifest;
		import android.app.ActivityManager;
		import android.app.ActivityManagerInternal;
		import android.app.ActivityTaskManagerInternal;
		import android.app.AlarmManager;
		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		@@ -31,15 +30,15 @@ import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.NameNotFoundException;
		import android.database.ContentObserver;
		import android.hardware.Sensor;
		import android.hardware.SensorManager;
		import android.hardware.SensorEvent;
		import android.hardware.SensorEventListener;
		import android.hardware.SensorManager;
		import android.hardware.TriggerEvent;
		import android.hardware.TriggerEventListener;
		import android.location.LocationRequest;
		import android.location.Location;
		import android.location.LocationListener;
		import android.location.LocationManager;
		import android.location.LocationRequest;
		import android.net.ConnectivityManager;
		import android.net.INetworkPolicyManager;
		import android.net.NetworkInfo;
		@@ -86,6 +85,7 @@ import com.android.internal.util.FastXmlSerializer;
		import com.android.internal.util.XmlUtils;
		import com.android.server.am.BatteryStatsService;
		import com.android.server.net.NetworkPolicyManagerInternal;
		import com.android.server.wm.ActivityTaskManagerInternal;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;