Merge branch 'eclair' into eclair-release (57630fe4) · Commits · e / os / android_frameworks_base

api/6.xml

+70 −0

Original line number	Diff line number	Diff line
		@@ -6389,6 +6389,72 @@
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleSmallWindowLarge"
		type="int"
		transient="false"
		volatile="false"
		value="16843443"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleSmallWindowMedium"
		type="int"
		transient="false"
		volatile="false"
		value="16843442"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleSmallWindowSmall"
		type="int"
		transient="false"
		volatile="false"
		value="16843441"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleWindowLarge"
		type="int"
		transient="false"
		volatile="false"
		value="16843440"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleWindowMedium"
		type="int"
		transient="false"
		volatile="false"
		value="16843439"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="quickContactBadgeStyleWindowSmall"
		type="int"
		transient="false"
		volatile="false"
		value="16843438"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="radioButtonStyle"
		type="int"
		transient="false"
		@@ -13804,6 +13870,8 @@
		</parameter>
		<parameter name="options" type="android.os.Bundle">
		</parameter>
		<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
		</exception>
		</method>
		<method name="editProperties"
		return="android.os.Bundle"
		@@ -13919,6 +13987,8 @@
		</parameter>
		<parameter name="loginOptions" type="android.os.Bundle">
		</parameter>
		<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
		</exception>
		</method>
		</class>
		<class name="Account"

core/java/android/server/BluetoothEventLoop.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -292,9 +292,9 @@ class BluetoothEventLoop {
		mBluetoothService.setProperty(name, propValues[1]);
		} else if (name.equals("Pairable") \|\| name.equals("Discoverable")) {
		String pairable = name.equals("Pairable") ? propValues[1] :
		mBluetoothService.getProperty("Pairable");
		mBluetoothService.getPropertyInternal("Pairable");
		String discoverable = name.equals("Discoverable") ? propValues[1] :
		mBluetoothService.getProperty("Discoverable");
		mBluetoothService.getPropertyInternal("Discoverable");

		// This shouldn't happen, unless Adapter Properties are null.
		if (pairable == null \|\| discoverable == null)

core/java/android/server/BluetoothService.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -531,7 +531,7 @@ public class BluetoothService extends IBluetooth.Stub {
		return;
		}
		String []bonds = null;
		String val = getProperty("Devices");
		String val = getPropertyInternal("Devices");
		if (val != null) {
		bonds = val.split(",");
		}
		@@ -681,7 +681,6 @@ public class BluetoothService extends IBluetooth.Stub {
		/package/synchronized void getAllProperties() {

		mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
		if (!isEnabledInternal()) return;
		mAdapterProperties.clear();

		String properties[] = (String [])getAdapterPropertiesNative();
		@@ -807,6 +806,11 @@ public class BluetoothService extends IBluetooth.Stub {
		}

		/package/ synchronized String getProperty(String name) {
		if (!isEnabledInternal()) return null;
		return getPropertyInternal(name);
		}

		/package/ synchronized String getPropertyInternal(String name) {
		if (!mAdapterProperties.isEmpty())
		return mAdapterProperties.get(name);
		getAllProperties();
		@@ -1639,7 +1643,7 @@ public class BluetoothService extends IBluetooth.Stub {
		}

		/package/ String getAddressFromObjectPath(String objectPath) {
		String adapterObjectPath = getProperty("ObjectPath");
		String adapterObjectPath = getPropertyInternal("ObjectPath");
		if (adapterObjectPath == null \|\| objectPath == null) {
		Log.e(TAG, "getAddressFromObjectPath: AdpaterObjectPath:" + adapterObjectPath +
		" or deviceObjectPath:" + objectPath + " is null");
		@@ -1659,7 +1663,7 @@ public class BluetoothService extends IBluetooth.Stub {
		}

		/package/ String getObjectPathFromAddress(String address) {
		String path = getProperty("ObjectPath");
		String path = getPropertyInternal("ObjectPath");
		if (path == null) {
		Log.e(TAG, "Error: Object Path is null");
		return null;

core/java/android/service/wallpaper/WallpaperService.java

+28 −2

Original line number	Diff line number	Diff line
		@@ -44,6 +44,8 @@ import android.view.ViewRoot;
		import android.view.WindowManager;
		import android.view.WindowManagerImpl;

		import java.util.ArrayList;

		/**
		* A wallpaper service is responsible for showing a live wallpaper behind
		* applications that would like to sit on top of it. This service object
		@@ -83,6 +85,8 @@ public abstract class WallpaperService extends Service {
		private static final int MSG_TOUCH_EVENT = 10040;

		private Looper mCallbackLooper;
		private final ArrayList<Engine> mActiveEngines
		= new ArrayList<Engine>();

		static final class WallpaperCommand {
		String action;
		@@ -596,9 +600,11 @@ public abstract class WallpaperService extends Service {
		}

		void doVisibilityChanged(boolean visible) {
		if (!mDestroyed) {
		mVisible = visible;
		reportVisibility();
		}
		}

		void reportVisibility() {
		if (!mDestroyed) {
		@@ -666,6 +672,10 @@ public abstract class WallpaperService extends Service {
		}

		void detach() {
		if (mDestroyed) {
		return;
		}

		mDestroyed = true;

		if (mVisible) {
		@@ -773,10 +783,12 @@ public abstract class WallpaperService extends Service {
		}
		Engine engine = onCreateEngine();
		mEngine = engine;
		mActiveEngines.add(engine);
		engine.attach(this);
		return;
		}
		case DO_DETACH: {
		mActiveEngines.remove(mEngine);
		mEngine.detach();
		return;
		}
		@@ -844,6 +856,20 @@ public abstract class WallpaperService extends Service {
		}
		}

		@Override
		public void onCreate() {
		super.onCreate();
		}

		@Override
		public void onDestroy() {
		super.onDestroy();
		for (int i=0; i<mActiveEngines.size(); i++) {
		mActiveEngines.get(i).detach();
		}
		mActiveEngines.clear();
		}

		/**
		* Implement to return the implementation of the internal accessibility
		* service interface. Subclasses should not override.

core/java/com/android/internal/widget/DigitalClock.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,13 @@ public class DigitalClock extends LinearLayout {
		Intent.ACTION_TIMEZONE_CHANGED)) {
		mCalendar = Calendar.getInstance();
		}
		// Post a runnable to avoid blocking the broadcast.
		mHandler.post(new Runnable() {
		public void run() {
		updateTime();
		}
		});
		}
		};

		static class AmPm {
		@@ -133,7 +138,7 @@ public class DigitalClock extends LinearLayout {
		filter.addAction(Intent.ACTION_TIME_TICK);
		filter.addAction(Intent.ACTION_TIME_CHANGED);
		filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
		mContext.registerReceiver(mIntentReceiver, filter, null, mHandler);
		mContext.registerReceiver(mIntentReceiver, filter);
		}

		/* monitor 12/24-hour display preference */