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

Android.mk

+6 −0

cmds/bootanimation/BootAnimation.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -159,8 +159,8 @@ status_t BootAnimation::initTexture(void* buffer, size_t len)
	SkBitmap bitmap;		SkBitmap bitmap;
	SkMemoryStream stream(buffer, len);		SkMemoryStream stream(buffer, len);
	SkImageDecoder* codec = SkImageDecoder::Factory(&stream);		SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
	codec->setDitherImage(false);
	if (codec) {		if (codec) {
			codec->setDitherImage(false);
	codec->decode(&stream, &bitmap,		codec->decode(&stream, &bitmap,
	#ifdef USE_565		#ifdef USE_565
	SkBitmap::kRGB_565_Config,		SkBitmap::kRGB_565_Config,

cmds/svc/src/com/android/commands/svc/WifiCommand.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ public class WifiCommand extends Svc.Command {
	IWifiManager wifiMgr		IWifiManager wifiMgr
	= IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));		= IWifiManager.Stub.asInterface(ServiceManager.getService(Context.WIFI_SERVICE));
	try {		try {
	wifiMgr.setWifiEnabled(flag);		wifiMgr.setWifiEnabled("com.android.commands.svc", flag);
	}		}
	catch (RemoteException e) {		catch (RemoteException e) {
	System.err.println("Wi-Fi operation failed: " + e);		System.err.println("Wi-Fi operation failed: " + e);

core/java/android/accounts/AccountManager.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1439,7 +1439,9 @@ public class AccountManager {
	handler.post(new Runnable() {		handler.post(new Runnable() {
	public void run() {		public void run() {
	try {		try {
			if (mAccountsUpdatedListeners.containsKey(listener)) {
	listener.onAccountsUpdated(accountsCopy);		listener.onAccountsUpdated(accountsCopy);
			}
	} catch (SQLException e) {		} catch (SQLException e) {
	// Better luck next time. If the problem was disk-full,		// Better luck next time. If the problem was disk-full,
	// the STORAGE_OK intent will re-trigger the update.		// the STORAGE_OK intent will re-trigger the update.

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -267,6 +267,10 @@ public class ChooseTypeAndAccountActivity extends Activity
	outState.putParcelableArray(KEY_INSTANCE_STATE_EXISTING_ACCOUNTS, mExistingAccounts);		outState.putParcelableArray(KEY_INSTANCE_STATE_EXISTING_ACCOUNTS, mExistingAccounts);
	}		}
	if (mSelectedItemIndex != SELECTED_ITEM_NONE) {		if (mSelectedItemIndex != SELECTED_ITEM_NONE) {
			if (mAccounts == null) {
			final AccountManager accountManager = AccountManager.get(this);
			mAccounts = getAcceptableAccountChoices(accountManager);
			}
	if (mSelectedItemIndex == mAccounts.size()) {		if (mSelectedItemIndex == mAccounts.size()) {
	outState.putBoolean(KEY_INSTANCE_STATE_SELECTED_ADD_ACCOUNT, true);		outState.putBoolean(KEY_INSTANCE_STATE_SELECTED_ADD_ACCOUNT, true);
	} else {		} else {
	@@ -308,6 +312,10 @@ public class ChooseTypeAndAccountActivity extends Activity
	mPendingRequest = REQUEST_NULL;		mPendingRequest = REQUEST_NULL;

	if (resultCode == RESULT_CANCELED) {		if (resultCode == RESULT_CANCELED) {
			if (mAccounts == null) {
			final AccountManager accountManager = AccountManager.get(this);
			mAccounts = getAcceptableAccountChoices(accountManager);
			}
	// if canceling out of addAccount and the original state caused us to skip this,		// if canceling out of addAccount and the original state caused us to skip this,
	// finish this activity		// finish this activity
	if (mAccounts.isEmpty()) {		if (mAccounts.isEmpty()) {

Original line number	Original line	Diff line number	Diff line
	@@ -86,8 +86,10 @@ LOCAL_SRC_FILES += \
	core/java/android/app/backup/IRestoreObserver.aidl \		core/java/android/app/backup/IRestoreObserver.aidl \
	core/java/android/app/backup/IRestoreSession.aidl \		core/java/android/app/backup/IRestoreSession.aidl \
	core/java/android/bluetooth/IBluetooth.aidl \		core/java/android/bluetooth/IBluetooth.aidl \
			core/java/android/bluetooth/IQBluetooth.aidl \
	core/java/android/bluetooth/IBluetoothA2dp.aidl \		core/java/android/bluetooth/IBluetoothA2dp.aidl \
	core/java/android/bluetooth/IBluetoothCallback.aidl \		core/java/android/bluetooth/IBluetoothCallback.aidl \
			core/java/android/bluetooth/IQBluetoothAdapterCallback.aidl \
	core/java/android/bluetooth/IBluetoothHeadset.aidl \		core/java/android/bluetooth/IBluetoothHeadset.aidl \
	core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \		core/java/android/bluetooth/IBluetoothHeadsetPhone.aidl \
	core/java/android/bluetooth/IBluetoothHealth.aidl \		core/java/android/bluetooth/IBluetoothHealth.aidl \
	@@ -96,10 +98,13 @@ LOCAL_SRC_FILES += \
	core/java/android/bluetooth/IBluetoothPan.aidl \		core/java/android/bluetooth/IBluetoothPan.aidl \
	core/java/android/bluetooth/IBluetoothManager.aidl \		core/java/android/bluetooth/IBluetoothManager.aidl \
	core/java/android/bluetooth/IBluetoothManagerCallback.aidl \		core/java/android/bluetooth/IBluetoothManagerCallback.aidl \
			core/java/android/bluetooth/IQBluetoothManagerCallback.aidl \
	core/java/android/bluetooth/IBluetoothPbap.aidl \		core/java/android/bluetooth/IBluetoothPbap.aidl \
	core/java/android/bluetooth/IBluetoothMap.aidl \		core/java/android/bluetooth/IBluetoothMap.aidl \
	core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \		core/java/android/bluetooth/IBluetoothStateChangeCallback.aidl \
	core/java/android/bluetooth/IBluetoothHandsfreeClient.aidl \		core/java/android/bluetooth/IBluetoothHandsfreeClient.aidl \
			core/java/android/bluetooth/IBluetoothHidDevice.aidl \
			core/java/android/bluetooth/IBluetoothHidDeviceCallback.aidl \
	core/java/android/bluetooth/IBluetoothGatt.aidl \		core/java/android/bluetooth/IBluetoothGatt.aidl \
	core/java/android/bluetooth/IBluetoothGattCallback.aidl \		core/java/android/bluetooth/IBluetoothGattCallback.aidl \
	core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \		core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \
	@@ -397,6 +402,7 @@ aidl_files := \
	frameworks/base/core/java/com/android/internal/view/IInputMethodClient.aidl \		frameworks/base/core/java/com/android/internal/view/IInputMethodClient.aidl \
	frameworks/base/core/java/com/android/internal/view/IInputMethodManager.aidl \		frameworks/base/core/java/com/android/internal/view/IInputMethodManager.aidl \
	frameworks/base/core/java/com/android/internal/view/IInputMethodSession.aidl \		frameworks/base/core/java/com/android/internal/view/IInputMethodSession.aidl \
			frameworks/base/core/java/android/bluetooth/BluetoothLEServiceUuid.aidl \
	frameworks/base/graphics/java/android/graphics/Bitmap.aidl \		frameworks/base/graphics/java/android/graphics/Bitmap.aidl \
	frameworks/base/graphics/java/android/graphics/Rect.aidl \		frameworks/base/graphics/java/android/graphics/Rect.aidl \
	frameworks/base/graphics/java/android/graphics/Region.aidl \		frameworks/base/graphics/java/android/graphics/Region.aidl \