Merge "Make screen events internal instead of AIDL" into udc-dev (a9d7a0f0) · Commits · e / os / android_frameworks_base

core/java/android/app/IWallpaperManager.aidl

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -219,20 +219,6 @@ interface IWallpaperManager {
	*/		*/
	void notifyGoingToSleep(int x, int y, in Bundle extras);		void notifyGoingToSleep(int x, int y, in Bundle extras);

	/**
	* Called when the screen has been fully turned on and is visible.
	*
	* @hide
	*/
	void notifyScreenTurnedOn(int displayId);

	/**
	* Called when the screen starts turning on.
	*
	* @hide
	*/
	void notifyScreenTurningOn(int displayId);

	/**		/**
	* Sets the wallpaper dim amount between [0f, 1f] which would be blended with the system default		* Sets the wallpaper dim amount between [0f, 1f] which would be blended with the system default
	* dimming. 0f doesn't add any additional dimming and 1f makes the wallpaper fully black.		* dimming. 0f doesn't add any additional dimming and 1f makes the wallpaper fully black.

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -2585,8 +2585,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	/**		/**
	* Propagates screen turned on event to wallpaper engine(s).		* Propagates screen turned on event to wallpaper engine(s).
	*/		*/
	@Override		private void notifyScreenTurnedOn(int displayId) {
	public void notifyScreenTurnedOn(int displayId) {
	synchronized (mLock) {		synchronized (mLock) {
	if (mIsLockscreenLiveWallpaperEnabled) {		if (mIsLockscreenLiveWallpaperEnabled) {
	for (WallpaperData data : getActiveWallpapers()) {		for (WallpaperData data : getActiveWallpapers()) {
	@@ -2621,13 +2620,10 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	}		}
	}		}



	/**		/**
	* Propagate screen turning on event to wallpaper engine(s).		* Propagate screen turning on event to wallpaper engine(s).
	*/		*/
	@Override		private void notifyScreenTurningOn(int displayId) {
	public void notifyScreenTurningOn(int displayId) {
	synchronized (mLock) {		synchronized (mLock) {
	if (mIsLockscreenLiveWallpaperEnabled) {		if (mIsLockscreenLiveWallpaperEnabled) {
	for (WallpaperData data : getActiveWallpapers()) {		for (WallpaperData data : getActiveWallpapers()) {