Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo (18e57caf) · Commits · e / os / android_frameworks_base

core/java/android/view/InputChannel.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,13 @@ public final class InputChannel implements Parcelable {
		return name != null ? name : "uninitialized";
		}

		/**
		* @hide
		*/
		public boolean isValid() {
		return mPtr != 0;
		}

		/**
		* Disposes the input channel.
		* Explicitly releases the reference this object is holding on the input channel.

+2 −5

Original line number	Diff line number	Diff line
		@@ -713,10 +713,7 @@ public final class ViewRootImpl implements ViewParent,
		// manager, to make sure we do the relayout before receiving
		// any other events from the system.
		requestLayout();
		if ((mWindowAttributes.inputFeatures
		& WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL) == 0) {
		mInputChannel = new InputChannel();
		}
		mForceDecorViewVisibility = (mWindowAttributes.privateFlags
		& PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY) != 0;
		try {
		@@ -805,7 +802,7 @@ public final class ViewRootImpl implements ViewParent,
		mInputQueueCallback =
		((RootViewSurfaceTaker)view).willYouTakeTheInputQueue();
		}
		if (mInputChannel != null) {
		if (mInputChannel.isValid()) {
		if (mInputQueueCallback != null) {
		mInputQueue = new InputQueue();
		mInputQueueCallback.onInputQueueCreated(mInputQueue);

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
		<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
		<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
		<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>

		<application
		android:allowClearUserData="true"

+4 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.companiondevicemanager;

		import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

		import android.app.Activity;
		import android.companion.CompanionDeviceManager;
		@@ -55,6 +56,8 @@ public class DeviceChooserActivity extends Activity {
		Log.e(LOG_TAG, "About to show UI, but no devices to show");
		}

		getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

		if (getService().mRequest.isSingleDevice()) {
		setContentView(R.layout.device_confirmation);
		final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);

+3 −0

Original line number	Diff line number	Diff line
		@@ -1084,6 +1084,9 @@ public class GnssLocationProvider implements LocationProviderInterface {
		}

		private void handleUpdateLocation(Location location) {
		if (location.isFromMockProvider()) {
		return;
		}
		if (location.hasAccuracy()) {
		native_inject_location(location.getLatitude(), location.getLongitude(),
		location.getAccuracy());