diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-05-09 17:01:12 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2013-05-09 17:07:08 -0700 |
| commit | ecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4 (patch) | |
| tree | 66a1d61588c842837f1bc4b8d81675f3aa33d90f /packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java | |
| parent | 2d4edcf2e1ef94ef83e02ec2ad075b3603282812 (diff) | |
| parent | 069d7e9b81e17d31238e4d60420c3e31bb5e3b2f (diff) | |
| download | frameworks_base-ecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4.zip frameworks_base-ecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4.tar.gz frameworks_base-ecd5afe1ef4aa2a5d11ad4fa356fb6d5f461efb4.tar.bz2 | |
resolved conflicts for merge of 069d7e9b to master
Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java index d3a582f..30b43f5 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java @@ -107,6 +107,11 @@ class KeyguardUpdateMonitorCallback { void onUserRemoved(int userId) { } /** + * Called when the user's info changed. + */ + void onUserInfoChanged(int userId) { } + + /** * Called when boot completed. * * Note, this callback will only be received if boot complete occurs after registering with |