Snap for 5885124 from 51cf32b4f34404de712e30baec137e353463c018 to qt-qpr1-release (68bdbf2a) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothPan.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -118,6 +118,8 @@ public final class BluetoothPan implements BluetoothProfile {
		*/
		public static final int PAN_OPERATION_SUCCESS = 1004;

		private final Context mContext;

		private BluetoothAdapter mAdapter;
		private final BluetoothProfileConnector<IBluetoothPan> mProfileConnector =
		new BluetoothProfileConnector(this, BluetoothProfile.PAN,
		@@ -136,6 +138,7 @@ public final class BluetoothPan implements BluetoothProfile {
		@UnsupportedAppUsage
		/package/ BluetoothPan(Context context, ServiceListener listener) {
		mAdapter = BluetoothAdapter.getDefaultAdapter();
		mContext = context;
		mProfileConnector.connect(context, listener);
		}

		@@ -287,11 +290,12 @@ public final class BluetoothPan implements BluetoothProfile {

		@UnsupportedAppUsage
		public void setBluetoothTethering(boolean value) {
		if (DBG) log("setBluetoothTethering(" + value + ")");
		String pkgName = mContext.getOpPackageName();
		if (DBG) log("setBluetoothTethering(" + value + "), calling package:" + pkgName);
		final IBluetoothPan service = getService();
		if (service != null && isEnabled()) {
		try {
		service.setBluetoothTethering(value);
		service.setBluetoothTethering(value, pkgName);
		} catch (RemoteException e) {
		Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -2338,6 +2338,12 @@ public class CameraDeviceImpl extends CameraDevice
		final CaptureCallbackHolder holder =
		CameraDeviceImpl.this.mCaptureCallbackMap.get(requestId);

		if (holder == null) {
		Log.e(TAG, String.format("Receive capture error on unknown request ID %d",
		requestId));
		return;
		}

		final CaptureRequest request = holder.getRequest(subsequenceId);

		Runnable failureDispatch = null;

+5 −2

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import com.android.systemui.Gefingerpoken
		import com.android.systemui.Interpolators
		import com.android.systemui.R
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
		import com.android.systemui.statusbar.notification.row.ExpandableView
		@@ -56,7 +57,8 @@ constructor(
		private val wakeUpCoordinator: NotificationWakeUpCoordinator,
		private val bypassController: KeyguardBypassController,
		private val headsUpManager: HeadsUpManagerPhone,
		private val roundnessManager: NotificationRoundnessManager
		private val roundnessManager: NotificationRoundnessManager,
		private val statusBarStateController: StatusBarStateController
		) : Gefingerpoken {
		companion object {
		private val RUBBERBAND_FACTOR_STATIC = 0.25f
		@@ -188,7 +190,8 @@ constructor(
		MotionEvent.ACTION_MOVE -> updateExpansionHeight(moveDistance)
		MotionEvent.ACTION_UP -> {
		velocityTracker!!.computeCurrentVelocity(1000 /* units */)
		val canExpand = moveDistance > 0 && velocityTracker!!.getYVelocity() > -1000
		val canExpand = moveDistance > 0 && velocityTracker!!.getYVelocity() > -1000 &&
		statusBarStateController.state != StatusBarState.SHADE
		if (!mFalsingManager.isUnlockingDisabled && !isFalseTouch && canExpand) {
		finishExpansion()
		} else {

+6 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.text.format.DateFormat;
		import android.util.FloatProperty;
		import android.util.Log;
		import android.view.View;
		import android.view.animation.Interpolator;

		@@ -136,6 +137,11 @@ public class StatusBarStateControllerImpl implements SysuiStatusBarStateControll
		// Record the to-be mState and mLastState
		recordHistoricalState(state, mState);

		// b/139259891
		if (mState == StatusBarState.SHADE && state == StatusBarState.SHADE_LOCKED) {
		Log.e(TAG, "Invalid state transition: SHADE -> SHADE_LOCKED", new Throwable());
		}

		synchronized (mListeners) {
		for (RankedListener rl : new ArrayList<>(mListeners)) {
		rl.mListener.onStatePreChange(mState, state);

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class NotificationPanelViewTest extends SysuiTestCase {
		mKeyguardBypassController);
		PulseExpansionHandler expansionHandler = new PulseExpansionHandler(mContext, coordinator,
		mKeyguardBypassController, mHeadsUpManager,
		mock(NotificationRoundnessManager.class));
		mock(NotificationRoundnessManager.class), mStatusBarStateController);
		mNotificationPanelView = new TestableNotificationPanelView(coordinator, expansionHandler,
		mKeyguardBypassController);
		mNotificationPanelView.setHeadsUpManager(mHeadsUpManager);