diff options
6 files changed, 0 insertions, 41 deletions
diff --git a/core/java/android/app/IUserSwitchObserver.aidl b/core/java/android/app/IUserSwitchObserver.aidl index caee14fa5d1e..845897b7827e 100644 --- a/core/java/android/app/IUserSwitchObserver.aidl +++ b/core/java/android/app/IUserSwitchObserver.aidl @@ -22,5 +22,4 @@ import android.os.IRemoteCallback; oneway interface IUserSwitchObserver { void onUserSwitching(int newUserId, IRemoteCallback reply); void onUserSwitchComplete(int newUserId); - void onForegroundProfileSwitch(int newProfileId); } diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 147ac19e4659..18615d95a429 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -763,10 +763,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { mSwitchingUser = false; startListeningForFingerprint(); } - @Override - public void onForegroundProfileSwitch(int newProfileId) { - // Ignore. - } }); } catch (RemoteException e) { // TODO Auto-generated catch block diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 0f9090d6680b..d92a89f976cd 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -797,11 +797,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub @Override public void onUserSwitchComplete(int newUserId) throws RemoteException { } - - @Override - public void onForegroundProfileSwitch(int newProfileId) { - // Ignore. - } }); userId = ActivityManagerNative.getDefault().getCurrentUser().id; } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java index 9a6f6964f082..5add88eaa63c 100644 --- a/services/core/java/com/android/server/TextServicesManagerService.java +++ b/services/core/java/com/android/server/TextServicesManagerService.java @@ -116,11 +116,6 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { @Override public void onUserSwitchComplete(int newUserId) throws RemoteException { } - - @Override - public void onForegroundProfileSwitch(int newProfileId) { - // Ignore. - } }); userId = ActivityManagerNative.getDefault().getCurrentUser().id; } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 634180757412..c2af765bc1c8 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -1284,7 +1284,6 @@ public final class ActivityManagerService extends ActivityManagerNative static final int NOTIFY_CLEARTEXT_NETWORK_MSG = 50; static final int POST_DUMP_HEAP_NOTIFICATION_MSG = 51; static final int DELETE_DUMPHEAP_MSG = 52; - static final int FOREGROUND_PROFILE_CHANGED_MSG = 53; static final int FIRST_ACTIVITY_STACK_MSG = 100; static final int FIRST_BROADCAST_QUEUE_MSG = 200; @@ -1923,9 +1922,6 @@ public final class ActivityManagerService extends ActivityManagerNative mMemWatchDumpUid = -1; } } break; - case FOREGROUND_PROFILE_CHANGED_MSG: { - dispatchForegroundProfileChanged(msg.arg1); - } break; } } }; @@ -2527,11 +2523,6 @@ public final class ActivityManagerService extends ActivityManagerNative mWindowManager.setFocusedApp(r.appToken, true); } applyUpdateLockStateLocked(r); - if (last != null && last.userId != mFocusedActivity.userId) { - mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG); - mHandler.sendMessage(mHandler.obtainMessage(FOREGROUND_PROFILE_CHANGED_MSG, - mFocusedActivity.userId, 0)); - } } EventLog.writeEvent(EventLogTags.AM_FOCUSED_ACTIVITY, mCurrentUserId, mFocusedActivity == null ? "NULL" : mFocusedActivity.shortComponentName); @@ -19081,18 +19072,6 @@ public final class ActivityManagerService extends ActivityManagerNative return true; } - void dispatchForegroundProfileChanged(int userId) { - final int N = mUserSwitchObservers.beginBroadcast(); - for (int i = 0; i < N; i++) { - try { - mUserSwitchObservers.getBroadcastItem(i).onForegroundProfileSwitch(userId); - } catch (RemoteException e) { - // Ignore - } - } - mUserSwitchObservers.finishBroadcast(); - } - void sendUserSwitchBroadcastsLocked(int oldUserId, int newUserId) { long ident = Binder.clearCallingIdentity(); try { diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 54be38073f7f..99cf8df21509 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -538,11 +538,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { @Override public void onUserSwitchComplete(int newUserId) throws RemoteException { } - - @Override - public void onForegroundProfileSwitch(int newProfileId) { - // Ignore. - } }); } catch (RemoteException e) { // TODO Auto-generated catch block |