Merge tag 'android-6.0.1_r30' into HEAD (303cef4c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -6444,6 +6444,18 @@ public final class Settings {
		*/
		public static final String BLUETOOTH_DISABLED_PROFILES = "bluetooth_disabled_profiles";

		/**
		* A semi-colon separated list of Bluetooth interoperability workarounds.
		* Each entry is a partial Bluetooth device address string and an integer representing
		* the feature to be disabled, separated by a comma. The integer must correspond
		* to a interoperability feature as defined in "interop.h" in /system/bt.
		* <p>
		* Example: <br/>
		* "00:11:22,0;01:02:03:04,2"
		* @hide
		*/
		public static final String BLUETOOTH_INTEROPERABILITY_LIST = "bluetooth_interoperability_list";

		/**
		* The policy for deciding when Wi-Fi should go to sleep (which will in
		* turn switch to using the mobile data as an Internet connection).

+6 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,12 @@ public class PhoneStatusBarPolicy implements Callback {
		@Override
		public void onUserSwitching(int newUserId, IRemoteCallback reply) {
		mUserInfoController.reloadUserInfo();
		if (reply != null) {
		try {
		reply.sendResult(null);
		} catch (RemoteException e) {
		}
		}
		}

		@Override

+23 −2

Original line number	Diff line number	Diff line
		@@ -4003,8 +4003,29 @@ public class AudioService extends IAudioService.Stub {
		int index;
		if (mIsMuted) {
		index = 0;
		} else if (((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported)
		\|\| ((device & mFullVolumeDevices) != 0)) {
		} else if ((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported) {
		/* Special handling for Bluetooth Absolute Volume scenario
		* If we send full audio gain, some accessories are too loud even at its lowest
		* volume. We are not able to enumerate all such accessories, so here is the
		* workaround from phone side.
		* For the lowest volume steps 1 and 2, restrict audio gain to 50% and 75%.
		* For volume step 0, set audio gain to 0 as some accessories won't mute on their end.
		*/
		int i = (getIndex(device) + 5)/10;
		if (i == 0) {
		// 0% for volume 0
		index = 0;
		} else if (i == 1) {
		// 50% for volume 1
		index = (int)(mIndexMax * 0.5) /10;
		} else if (i == 2) {
		// 75% for volume 2
		index = (int)(mIndexMax * 0.75) /10;
		} else {
		// otherwise, full gain
		index = (mIndexMax + 5)/10;
		}
		} else if ((device & mFullVolumeDevices) != 0) {
		index = (mIndexMax + 5)/10;
		} else {
		index = (getIndex(device) + 5)/10;

+6 −0

Original line number	Diff line number	Diff line
		@@ -1157,6 +1157,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
		public void onUserSwitching(int newUserId, IRemoteCallback reply) {
		mHandler.obtainMessage(MSG_USER_SWITCHING, newUserId, 0 /* unused */)
		.sendToTarget();
		if (reply != null) {
		try {
		reply.sendResult(null);
		} catch (RemoteException e) {
		}
		}
		}
		@Override
		public void onUserSwitchComplete(int newUserId) throws RemoteException {

+1 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@ public class UsageStatsService extends SystemService implements
		Context.DISPLAY_SERVICE);
		mPowerManager = getContext().getSystemService(PowerManager.class);

		mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);
		mDisplayManager.registerDisplayListener(mDisplayListener, null);
		synchronized (this) {
		updateDisplayLocked();
		}