Merge remote-tracking branch 'github/cm-11.0' into HEAD (b54b4844) · Commits · e / os / android_frameworks_base

Android.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,8 @@ LOCAL_SRC_FILES += \
		core/java/android/app/backup/IFullBackupRestoreObserver.aidl \
		core/java/android/app/backup/IRestoreObserver.aidl \
		core/java/android/app/backup/IRestoreSession.aidl \
		core/java/android/wipower/IWipower.aidl \
		core/java/android/wipower/IWipowerManagerCallback.aidl \
		core/java/android/bluetooth/IBluetooth.aidl \
		core/java/android/bluetooth/IQBluetooth.aidl \
		core/java/android/bluetooth/IBluetoothA2dp.aidl \
		@@ -187,6 +189,9 @@ LOCAL_SRC_FILES += \
		core/java/android/service/dreams/IDreamManager.aidl \
		core/java/android/service/dreams/IDreamService.aidl \
		core/java/android/service/gesture/IGestureService.aidl \
		core/java/android/service/gesture/IEdgeGestureService.aidl \
		core/java/android/service/gesture/IEdgeGestureActivationListener.aidl \
		core/java/android/service/gesture/IEdgeGestureHostCallback.aidl \
		core/java/android/service/wallpaper/IWallpaperConnection.aidl \
		core/java/android/service/wallpaper/IWallpaperEngine.aidl \
		core/java/android/service/wallpaper/IWallpaperService.aidl \

core/java/android/app/ActivityManager.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -458,8 +458,16 @@ public class ActivityManager {
		* @hide
		*/
		static public boolean isHighEndGfx() {
		return !isLowRamDeviceStatic() &&
		!Resources.getSystem().getBoolean(com.android.internal.R.bool.config_avoidGfxAccel);
		return (!isLowRamDeviceStatic() &&
		!Resources.getSystem().getBoolean(com.android.internal.R.bool.config_avoidGfxAccel))
		\|\| isForcedHighEndGfx();
		}

		/**
		* @hide
		*/
		public static boolean isForcedHighEndGfx() {
		return SystemProperties.getBoolean("persist.sys.force_highendgfx", false);
		}

		/**

core/java/android/app/Profile.java

+42 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ import android.media.AudioManager;
		import android.os.Parcel;
		import android.os.ParcelUuid;
		import android.os.Parcelable;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.text.TextUtils;
		import android.util.Log;

		@@ -77,6 +79,8 @@ public final class Profile implements Parcelable, Comparable {

		private int mScreenLockMode = LockMode.DEFAULT;

		private int mExpandedDesktopMode = ExpandedDesktopMode.DEFAULT;

		/** @hide */
		public static class LockMode {
		public static final int DEFAULT = 0;
		@@ -84,6 +88,13 @@ public final class Profile implements Parcelable, Comparable {
		public static final int DISABLE = 2;
		}

		/** @hide */
		public static class ExpandedDesktopMode {
		public static final int DEFAULT = 0;
		public static final int ENABLE = 1;
		public static final int DISABLE = 2;
		}

		/** @hide */
		public static class TriggerType {
		public static final int WIFI = 0;
		@@ -346,6 +357,7 @@ public final class Profile implements Parcelable, Comparable {
		dest.writeParcelable(mAirplaneMode, flags);
		dest.writeInt(mScreenLockMode);
		dest.writeMap(mTriggers);
		dest.writeInt(mExpandedDesktopMode);
		}

		/** @hide */
		@@ -379,6 +391,7 @@ public final class Profile implements Parcelable, Comparable {
		mAirplaneMode = (AirplaneModeSettings) in.readParcelable(null);
		mScreenLockMode = in.readInt();
		in.readMap(mTriggers, null);
		mExpandedDesktopMode = in.readInt();
		}

		public String getName() {
		@@ -466,6 +479,20 @@ public final class Profile implements Parcelable, Comparable {
		mDirty = true;
		}

		public int getExpandedDesktopMode() {
		return mExpandedDesktopMode;
		}

		public void setExpandedDesktopMode(int expandedDesktopMode) {
		if (expandedDesktopMode < ExpandedDesktopMode.DEFAULT
		\|\| expandedDesktopMode > ExpandedDesktopMode.DISABLE) {
		mExpandedDesktopMode = ExpandedDesktopMode.DEFAULT;
		} else {
		mExpandedDesktopMode = expandedDesktopMode;
		}
		mDirty = true;
		}

		public AirplaneModeSettings getAirplaneMode() {
		return mAirplaneMode;
		}
		@@ -538,6 +565,10 @@ public final class Profile implements Parcelable, Comparable {
		builder.append(mScreenLockMode);
		builder.append("</screen-lock-mode>\n");

		builder.append("<expanded-desktop-mode>");
		builder.append(mExpandedDesktopMode);
		builder.append("</expanded-desktop-mode>\n");

		mAirplaneMode.getXmlString(builder, context);

		mRingMode.getXmlString(builder, context);
		@@ -669,6 +700,9 @@ public final class Profile implements Parcelable, Comparable {
		if (name.equals("screen-lock-mode")) {
		profile.setScreenLockMode(Integer.valueOf(xpp.nextText()));
		}
		if (name.equals("expanded-desktop-mode")) {
		profile.setExpandedDesktopMode(Integer.valueOf(xpp.nextText()));
		}
		if (name.equals("profileGroup")) {
		ProfileGroup pg = ProfileGroup.fromXml(xpp, context);
		profile.addProfileGroup(pg);
		@@ -713,6 +747,14 @@ public final class Profile implements Parcelable, Comparable {
		mRingMode.processOverride(context);
		// Set airplane mode
		mAirplaneMode.processOverride(context);

		// Set expanded desktop
		if (mExpandedDesktopMode != ExpandedDesktopMode.DEFAULT) {
		Settings.System.putIntForUser(context.getContentResolver(),
		Settings.System.EXPANDED_DESKTOP_STATE,
		mExpandedDesktopMode == ExpandedDesktopMode.ENABLE ? 1 : 0,
		UserHandle.USER_CURRENT);
		}
		}

		/** @hide */

core/java/android/bluetooth/BluetoothSocket.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -478,9 +478,15 @@ public final class BluetoothSocket implements Closeable {
		}

		/package/ int read(byte[] b, int offset, int length) throws IOException {

		int ret = -1;
		if (VDBG) Log.d(TAG, "read in: " + mSocketIS + " len: " + length);
		int ret = mSocketIS.read(b, offset, length);
		if(mSocketIS != null) {
		try {
		ret = mSocketIS.read(b, offset, length);
		} catch (IOException e) {
		Log.e(TAG, "IOException while reading the InputStream");
		}
		}
		if(ret < 0)
		throw new IOException("bt socket closed, read return: " + ret);
		if (VDBG) Log.d(TAG, "read out: " + mSocketIS + " ret: " + ret);

core/java/android/bluetooth/IQBluetooth.aidl

100644 → 100755

+7 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,13 @@ import android.os.ParcelFileDescriptor;
		*/
		interface IQBluetooth
		{
		int getLEAdvMode();
		boolean setLEAdvParams(int min_int, int max_int, String address, int ad_type);
		boolean setLEAdvMode(int mode);
		boolean setLEManuData(in byte[] manuData);
		boolean setLEServiceData(in byte[] serviceData);
		boolean setLEAdvMask(boolean bLocalName, boolean bServices, boolean bTxPower,boolean bManuData, boolean ServiceData);
		boolean setLEScanRespMask(boolean bLocalName, boolean bServices, boolean bTxPower,boolean bManuData );
		int startLeScanEx(in BluetoothLEServiceUuid[] services, in IQBluetoothAdapterCallback callback);
		void stopLeScanEx(in int token);
		boolean registerLeLppRssiMonitorClient(in String address, in IQBluetoothAdapterCallback client, in boolean add);