Merge "More multi-user stuff." into jb-mr1-dev (d65afc65) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ LOCAL_SRC_FILES += \
		core/java/android/app/IThumbnailRetriever.aidl \
		core/java/android/app/ITransientNotification.aidl \
		core/java/android/app/IUiModeManager.aidl \
		core/java/android/app/IUserSwitchObserver.aidl \
		core/java/android/app/IWallpaperManager.aidl \
		core/java/android/app/IWallpaperManagerCallback.aidl \
		core/java/android/app/admin/IDevicePolicyManager.aidl \

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -4169,6 +4169,7 @@ package android.app {
		method public android.graphics.drawable.Drawable getFastDrawable();
		method public static android.app.WallpaperManager getInstance(android.content.Context);
		method public android.app.WallpaperInfo getWallpaperInfo();
		method public boolean hasResourceWallpaper(int);
		method public android.graphics.drawable.Drawable peekDrawable();
		method public android.graphics.drawable.Drawable peekFastDrawable();
		method public void sendWallpaperCommand(android.os.IBinder, java.lang.String, int, int, int, android.os.Bundle);
		@@ -5843,6 +5844,9 @@ package android.content {
		field public static final deprecated java.lang.String ACTION_UMS_CONNECTED = "android.intent.action.UMS_CONNECTED";
		field public static final deprecated java.lang.String ACTION_UMS_DISCONNECTED = "android.intent.action.UMS_DISCONNECTED";
		field public static final java.lang.String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE";
		field public static final java.lang.String ACTION_USER_BACKGROUND = "android.intent.action.USER_BACKGROUND";
		field public static final java.lang.String ACTION_USER_FOREGROUND = "android.intent.action.USER_FOREGROUND";
		field public static final java.lang.String ACTION_USER_INITIALIZE = "android.intent.action.USER_INITIALIZE";
		field public static final java.lang.String ACTION_USER_PRESENT = "android.intent.action.USER_PRESENT";
		field public static final java.lang.String ACTION_VIEW = "android.intent.action.VIEW";
		field public static final java.lang.String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";

core/java/android/app/ActivityManagerNative.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -1734,6 +1734,22 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		return true;
		}

		case REGISTER_USER_SWITCH_OBSERVER_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IUserSwitchObserver observer = IUserSwitchObserver.Stub.asInterface(
		data.readStrongBinder());
		registerUserSwitchObserver(observer);
		return true;
		}

		case UNREGISTER_USER_SWITCH_OBSERVER_TRANSACTION: {
		data.enforceInterface(IActivityManager.descriptor);
		IUserSwitchObserver observer = IUserSwitchObserver.Stub.asInterface(
		data.readStrongBinder());
		unregisterUserSwitchObserver(observer);
		return true;
		}

		}

		return super.onTransact(code, data, reply, flags);
		@@ -3955,5 +3971,27 @@ class ActivityManagerProxy implements IActivityManager
		return result;
		}

		public void registerUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeStrongBinder(observer != null ? observer.asBinder() : null);
		mRemote.transact(REGISTER_USER_SWITCH_OBSERVER_TRANSACTION, data, reply, 0);
		reply.readException();
		data.recycle();
		reply.recycle();
		}

		public void unregisterUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeStrongBinder(observer != null ? observer.asBinder() : null);
		mRemote.transact(UNREGISTER_USER_SWITCH_OBSERVER_TRANSACTION, data, reply, 0);
		reply.readException();
		data.recycle();
		reply.recycle();
		}

		private IBinder mRemote;
		}

core/java/android/app/IActivityManager.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -360,6 +360,9 @@ public interface IActivityManager extends IInterface {
		// manage your activity to make sure it is always the uid you expect.
		public int getLaunchedFromUid(IBinder activityToken) throws RemoteException;

		public void registerUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException;
		public void unregisterUserSwitchObserver(IUserSwitchObserver observer) throws RemoteException;

		/*
		* Private non-Binder interfaces
		*/
		@@ -609,4 +612,6 @@ public interface IActivityManager extends IInterface {
		int IS_INTENT_SENDER_AN_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+151;
		int START_ACTIVITY_AS_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+152;
		int STOP_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+153;
		int REGISTER_USER_SWITCH_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+154;
		int UNREGISTER_USER_SWITCH_OBSERVER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+155;
		}

core/java/android/app/IUserSwitchObserver.aidl

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app;

		import android.os.IRemoteCallback;

		/** {@hide} */
		oneway interface IUserSwitchObserver {
		void onUserSwitching(int newUserId, IRemoteCallback reply);
		void onUserSwitchComplete(int newUserId);
		}