Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve service docs around user unlocking.

Browse Source 
Also delete some @removed methods that never shipped to reduce
confusion.

Test: builds, boots
Bug: 30434803
Change-Id: I18773182f62f0f62bd4e36c9c3098372483a374f
This commit is contained in:
Jeff Sharkey
2017-02-23 17:31:39 -07:00
parent 830d4b422d
commit bb4988ad7d
5 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/removed.txt
View File

@@ -169,10 +169,6 @@ package android.os {
method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
method public deprecated boolean isUserRunningAndLocked();
method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
method public deprecated boolean isUserRunningAndUnlocked();
method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
}
}

4
api/system-removed.txt
View File

@@ -163,10 +163,6 @@ package android.os {
method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
method public deprecated boolean isUserRunningAndLocked();
method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
method public deprecated boolean isUserRunningAndUnlocked();
method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
}
}

4
api/test-removed.txt
View File

@@ -169,10 +169,6 @@ package android.os {
method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
method public deprecated boolean isUserRunningAndLocked();
method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
method public deprecated boolean isUserRunningAndUnlocked();
method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
}
}

34
core/java/android/os/UserManager.java
View File

@@ -1097,40 +1097,6 @@ public class UserManager {
}
}
/** @removed */
@Deprecated
public boolean isUserRunningAndLocked() {
return isUserRunningAndLocked(Process.myUserHandle());
}
/** @removed */
@Deprecated
public boolean isUserRunningAndLocked(UserHandle user) {
try {
return ActivityManager.getService().isUserRunning(
user.getIdentifier(), ActivityManager.FLAG_AND_LOCKED);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
/** @removed */
@Deprecated
public boolean isUserRunningAndUnlocked() {
return isUserRunningAndUnlocked(Process.myUserHandle());
}
/** @removed */
@Deprecated
public boolean isUserRunningAndUnlocked(UserHandle user) {
try {
return ActivityManager.getService().isUserRunning(
user.getIdentifier(), ActivityManager.FLAG_AND_UNLOCKED);
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
}
/**
* Return whether the calling user is running in an "unlocked" state.
* <p>

14
services/core/java/com/android/server/SystemService.java
View File

@@ -19,6 +19,7 @@ package com.android.server;
import android.content.Context;
import android.os.IBinder;
import android.os.ServiceManager;
import android.os.UserManager;
/**
* The base class for services running in the system process. Override and implement
@@ -133,9 +134,16 @@ public abstract class SystemService {
public void onStartUser(int userHandle) {}
/**
* Called when an existing user is unlocked. This means the
* credential-encrypted storage for that user is now available, and
* encryption-aware component filtering is no longer in effect.
* Called when an existing user is in the process of being unlocked. This
* means the credential-encrypted storage for that user is now available,
* and encryption-aware component filtering is no longer in effect.
* <p>
* While dispatching this event to services, the user is in the
* {@code STATE_RUNNING_UNLOCKING} state, and once dispatching is finished
* the user will transition into the {@code STATE_RUNNING_UNLOCKED} state.
* Code written inside system services should use
* {@link UserManager#isUserUnlockingOrUnlocked(int)} to handle both of
* these states.
*
* @param userHandle The identifier of the user.
*/