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

Commit c1cbb24c authored Dec 06, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Dec 06, 2018

Merge "Moved plumbing classes to its own package."

parents eea208b1 1e3de57b

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,10 +70,10 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.os.IResultReceiver;
		import com.android.internal.util.DumpUtils;
		import com.android.internal.util.Preconditions;
		import com.android.server.AbstractMasterSystemService;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		import com.android.server.autofill.ui.AutoFillUI;
		import com.android.server.infra.AbstractMasterSystemService;
		import com.android.server.intelligence.IntelligenceManagerInternal;

		import java.io.FileDescriptor;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,11 +70,11 @@ import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.server.AbstractPerUserSystemService;
		import com.android.server.LocalServices;
		import com.android.server.autofill.AutofillManagerService.AutofillCompatState;
		import com.android.server.autofill.AutofillManagerService.SmartSuggestionMode;
		import com.android.server.autofill.ui.AutoFillUI;
		import com.android.server.infra.AbstractPerUserSystemService;

		import java.io.PrintWriter;
		import java.util.ArrayList;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ import android.service.autofill.SaveRequest;
		import android.text.format.DateUtils;
		import android.util.Slog;

		import com.android.server.AbstractSinglePendingRequestRemoteService;
		import com.android.server.infra.AbstractSinglePendingRequestRemoteService;

		final class RemoteFillService extends AbstractSinglePendingRequestRemoteService<RemoteFillService> {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,10 +95,10 @@ import com.android.internal.annotations.GuardedBy;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.util.ArrayUtils;
		import com.android.server.AbstractRemoteService;
		import com.android.server.autofill.AutofillManagerService.SmartSuggestionMode;
		import com.android.server.autofill.ui.AutoFillUI;
		import com.android.server.autofill.ui.PendingUi;
		import com.android.server.infra.AbstractRemoteService;
		import com.android.server.intelligence.IntelligenceManagerInternal;
		import com.android.server.intelligence.IntelligenceManagerInternal.AugmentedAutofillCallback;

services/core/java/com/android/server/AbstractMasterSystemService.java→services/core/java/com/android/server/infra/AbstractMasterSystemService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.server;
		package com.android.server.infra;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -40,6 +40,8 @@ import com.android.internal.annotations.GuardedBy;
		import com.android.internal.content.PackageMonitor;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.util.Preconditions;
		import com.android.server.LocalServices;
		import com.android.server.SystemService;

		import java.io.PrintWriter;
		import java.util.List;