Snap for 6964419 from 59b852c4078eb0ecdc953cc89dc9e0d765b0779f to rvc-qpr2-release (39c90ea9) · Commits · e / os / android_frameworks_base

core/java/android/companion/AssociationRequest.java

+22 −7

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ public final class AssociationRequest implements Parcelable {

		private final boolean mSingleDevice;
		private final List<DeviceFilter<?>> mDeviceFilters;
		private String mCallingPackage;

		private AssociationRequest(
		boolean singleDevice, @Nullable List<DeviceFilter<?>> deviceFilters) {
		@@ -57,6 +58,7 @@ public final class AssociationRequest implements Parcelable {
		this(
		in.readByte() != 0,
		in.readParcelableList(new ArrayList<>(), AssociationRequest.class.getClassLoader()));
		setCallingPackage(in.readString());
		}

		/** @hide */
		@@ -72,32 +74,45 @@ public final class AssociationRequest implements Parcelable {
		return mDeviceFilters;
		}

		/** @hide */
		public String getCallingPackage() {
		return mCallingPackage;
		}

		/** @hide */
		public void setCallingPackage(String pkg) {
		mCallingPackage = pkg;
		}

		@Override
		public boolean equals(Object o) {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		AssociationRequest that = (AssociationRequest) o;
		return mSingleDevice == that.mSingleDevice &&
		Objects.equals(mDeviceFilters, that.mDeviceFilters);
		return mSingleDevice == that.mSingleDevice
		&& Objects.equals(mDeviceFilters, that.mDeviceFilters)
		&& Objects.equals(mCallingPackage, that.mCallingPackage);
		}

		@Override
		public int hashCode() {
		return Objects.hash(mSingleDevice, mDeviceFilters);
		return Objects.hash(mSingleDevice, mDeviceFilters, mCallingPackage);
		}

		@Override
		public String toString() {
		return "AssociationRequest{" +
		"mSingleDevice=" + mSingleDevice +
		", mDeviceFilters=" + mDeviceFilters +
		'}';
		return "AssociationRequest{"
		+ "mSingleDevice=" + mSingleDevice
		+ ", mDeviceFilters=" + mDeviceFilters
		+ ", mCallingPackage=" + mCallingPackage
		+ '}';
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeByte((byte) (mSingleDevice ? 1 : 0));
		dest.writeParcelableList(mDeviceFilters, flags);
		dest.writeString(mCallingPackage);
		}

		@Override

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package com.android.companiondevicemanager;

		import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;

		import static java.util.Objects.requireNonNull;

		import android.app.Activity;
		import android.companion.CompanionDeviceManager;
		import android.content.Intent;
		@@ -116,6 +118,11 @@ public class DeviceChooserActivity extends Activity {
		}
		}

		@Override
		public String getCallingPackage() {
		return requireNonNull(getService().mRequest.getCallingPackage());
		}

		@Override
		public void setTitle(CharSequence title) {
		final TextView titleView = findViewById(R.id.title);

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -300,6 +300,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		mFindDeviceCallback = callback;
		mRequest = request;
		mCallingPackage = callingPackage;
		request.setCallingPackage(callingPackage);
		callback.asBinder().linkToDeath(CompanionDeviceManagerService.this /* recipient */, 0);

		final long callingIdentity = Binder.clearCallingIdentity();
		@@ -308,7 +309,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		AndroidFuture<Association> future = new AndroidFuture<>();
		service.startDiscovery(request, callingPackage, callback, future);
		return future;
		}).whenComplete(uncheckExceptions((association, err) -> {
		}).cancelTimeout().whenComplete(uncheckExceptions((association, err) -> {
		if (err == null) {
		addAssociation(association);
		} else {

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -791,7 +791,10 @@ public final class BroadcastQueue {
		mService.updateOomAdjLocked(r.curApp, true,
		OomAdjuster.OOM_ADJ_REASON_START_RECEIVER);
		}
		} else if (filter.receiverList.app != null) {
		mService.mOomAdjuster.mCachedAppOptimizer.unfreezeTemporarily(filter.receiverList.app);
		}

		try {
		if (DEBUG_BROADCAST_LIGHT) Slog.i(TAG_BROADCAST,
		"Delivering to " + filter + " : " + r);
		@@ -1121,6 +1124,10 @@ public final class BroadcastQueue {
		}
		}
		if (sendResult) {
		if (r.callerApp != null) {
		mService.mOomAdjuster.mCachedAppOptimizer.unfreezeTemporarily(
		r.callerApp);
		}
		try {
		if (DEBUG_BROADCAST) {
		Slog.i(TAG_BROADCAST, "Finishing broadcast [" + mQueueName + "] "

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -720,6 +720,16 @@ public final class CachedAppOptimizer {
		}
		}

		// This will ensure app will be out of the freezer for at least FREEZE_TIMEOUT_MS
		void unfreezeTemporarily(ProcessRecord app) {
		synchronized (mAm) {
		if (app.frozen) {
		unfreezeAppLocked(app);
		freezeAppAsync(app);
		}
		}
		}

		@GuardedBy("mAm")
		void freezeAppAsync(ProcessRecord app) {
		mFreezeHandler.removeMessages(SET_FROZEN_PROCESS_MSG, app);