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

Improved ContentCaptureManagerSession state.

Browse Source 
Test: atest CtsContentCaptureServiceTestCases
Bug: 111276913

Change-Id: I8b1f36174582d89913d5d170abb65789a16818ec
This commit is contained in:
Felipe Leme
2019-01-15 13:26:52 -08:00
parent 6079d151e4
commit 01b8749b40
5 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/service/contentcapture/ContentCaptureService.java
View File

@@ -323,20 +323,21 @@ public abstract class ContentCaptureService extends Service {
mSessionUids.put(sessionId, uid);
onCreateContentCaptureSession(context, new ContentCaptureSessionId(sessionId));
final int flags = context.getFlags();
if ((flags & ContentCaptureContext.FLAG_DISABLED_BY_FLAG_SECURE) != 0) {
setClientState(clientReceiver, ContentCaptureSession.STATE_DISABLED_BY_FLAG_SECURE,
mClientInterface.asBinder());
return;
final int clientFlags = context.getFlags();
int stateFlags = 0;
if ((clientFlags & ContentCaptureContext.FLAG_DISABLED_BY_FLAG_SECURE) != 0) {
stateFlags |= ContentCaptureSession.STATE_FLAG_SECURE;
}
if ((flags & ContentCaptureContext.FLAG_DISABLED_BY_APP) != 0) {
setClientState(clientReceiver, ContentCaptureSession.STATE_DISABLED_BY_APP,
mClientInterface.asBinder());
return;
if ((clientFlags & ContentCaptureContext.FLAG_DISABLED_BY_APP) != 0) {
stateFlags |= ContentCaptureSession.STATE_BY_APP;
}
if (stateFlags == 0) {
stateFlags = ContentCaptureSession.STATE_ACTIVE;
} else {
stateFlags |= ContentCaptureSession.STATE_DISABLED;
setClientState(clientReceiver, ContentCaptureSession.STATE_ACTIVE,
mClientInterface.asBinder());
}
setClientState(clientReceiver, stateFlags, mClientInterface.asBinder());
}
private void handleSendEvents(int uid,

3
core/java/android/view/contentcapture/ContentCaptureManager.java
View File

@@ -35,7 +35,6 @@ import com.android.internal.util.Preconditions;
import com.android.internal.util.SyncResultReceiver;
import java.io.PrintWriter;
import java.util.concurrent.atomic.AtomicBoolean;
/*
* NOTE: all methods in this class should return right away, or do the real work in a handler
@@ -125,7 +124,7 @@ public final class ContentCaptureManager {
synchronized (mLock) {
if (mMainSession == null) {
mMainSession = new MainContentCaptureSession(mContext, mHandler, mService,
new AtomicBoolean(mDisabled));
mDisabled);
if (VERBOSE) {
Log.v(TAG, "getDefaultContentCaptureSession(): created " + mMainSession);
}

46
core/java/android/view/contentcapture/ContentCaptureSession.java
View File

@@ -21,6 +21,7 @@ import static android.view.contentcapture.ContentCaptureManager.VERBOSE;
import android.annotation.CallSuper;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.util.DebugUtils;
import android.util.Log;
import android.view.View;
import android.view.ViewStructure;
@@ -56,49 +57,58 @@ public abstract class ContentCaptureSession implements AutoCloseable {
*
* @hide
*/
public static final int STATE_UNKNOWN = 0;
// NOTE: not prefixed by STATE_ so it's not printed on getStateAsString()
public static final int UNKNWON_STATE = 0x0;
/**
* Service's startSession() was called, but server didn't confirm it was created yet.
*
* @hide
*/
public static final int STATE_WAITING_FOR_SERVER = 1;
public static final int STATE_WAITING_FOR_SERVER = 0x1;
/**
* Session is active.
*
* @hide
*/
public static final int STATE_ACTIVE = 2;
public static final int STATE_ACTIVE = 0x2;
/**
* Session is disabled because there is no service for this user.
*
* @hide
*/
public static final int STATE_DISABLED_NO_SERVICE = 3;
public static final int STATE_DISABLED = 0x4;
/**
* Session is disabled because its id already existed on server.
*
* @hide
*/
public static final int STATE_DISABLED_DUPLICATED_ID = 4;
public static final int STATE_DUPLICATED_ID = 0x8;
/**
* Session is disabled because service is not set for user.
*
* @hide
*/
public static final int STATE_NO_SERVICE = 0x10;
/**
* Session is disabled by FLAG_SECURE
*
* @hide
*/
public static final int STATE_DISABLED_BY_FLAG_SECURE = 5;
public static final int STATE_FLAG_SECURE = 0x20;
/**
* Session is disabled manually by the specific app.
*
* @hide
*/
public static final int STATE_DISABLED_BY_APP = 6;
public static final int STATE_BY_APP = 0x40;
private static final int INITIAL_CHILDREN_CAPACITY = 5;
@@ -117,7 +127,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {
@Nullable
protected final String mId;
private int mState = STATE_UNKNOWN;
private int mState = UNKNWON_STATE;
// Lazily created on demand.
private ContentCaptureSessionId mContentCaptureSessionId;
@@ -389,23 +399,7 @@ public abstract class ContentCaptureSession implements AutoCloseable {
*/
@NonNull
protected static String getStateAsString(int state) {
switch (state) {
case STATE_UNKNOWN:
return "UNKNOWN";
case STATE_WAITING_FOR_SERVER:
return "WAITING_FOR_SERVER";
case STATE_ACTIVE:
return "ACTIVE";
case STATE_DISABLED_NO_SERVICE:
return "DISABLED_NO_SERVICE";
case STATE_DISABLED_DUPLICATED_ID:
return "DISABLED_DUPLICATED_ID";
case STATE_DISABLED_BY_FLAG_SECURE:
return "DISABLED_FLAG_SECURE";
case STATE_DISABLED_BY_APP:
return "DISABLED_BY_APP";
default:
return "INVALID:" + state;
}
return state + " (" + (state == UNKNWON_STATE ? "UNKNOWN"
: DebugUtils.flagsToString(ContentCaptureSession.class, "STATE_", state)) + ")";
}
}

22
core/java/android/view/contentcapture/MainContentCaptureSession.java
View File

@@ -88,6 +88,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
*/
public static final String EXTRA_BINDER = "binder";
// TODO(b/111276913): make sure disabled state is in sync with manager's disabled
@NonNull
private final AtomicBoolean mDisabled;
@@ -113,7 +114,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
@Nullable
private DeathRecipient mDirectServiceVulture;
private int mState = STATE_UNKNOWN;
private int mState = UNKNWON_STATE;
@Nullable
private IBinder mApplicationToken;
@@ -133,11 +134,11 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
/** @hide */
protected MainContentCaptureSession(@NonNull Context context, @NonNull Handler handler,
@Nullable IContentCaptureManager systemServerInterface,
@NonNull AtomicBoolean disabled) {
@NonNull boolean disabled) {
mContext = context;
mHandler = handler;
mSystemServerInterface = systemServerInterface;
mDisabled = disabled;
mDisabled = new AtomicBoolean(disabled);
}
@Override
@@ -184,7 +185,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
private void handleStartSession(@NonNull IBinder token, @NonNull ComponentName componentName,
int flags) {
if (mState != STATE_UNKNOWN) {
if (mState != UNKNWON_STATE) {
// TODO(b/111276913): revisit this scenario
Log.w(TAG, "ignoring handleStartSession(" + token + ") while on state "
+ getStateAsString(mState));
@@ -247,18 +248,14 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
}
}
// TODO(b/111276913): change the resultCode to use flags so there's just one flag for
// disabled stuff
if (resultCode == STATE_DISABLED_NO_SERVICE || resultCode == STATE_DISABLED_DUPLICATED_ID
|| resultCode == STATE_DISABLED_BY_FLAG_SECURE
|| resultCode == STATE_DISABLED_BY_APP) {
if ((mState & STATE_DISABLED) != 0) {
mDisabled.set(true);
handleResetSession(/* resetState= */ false);
} else {
mDisabled.set(false);
}
if (VERBOSE) {
Log.v(TAG, "handleSessionStarted() result: code=" + resultCode + ", id=" + mId
Log.v(TAG, "handleSessionStarted() result: id=" + mId
+ ", state=" + getStateAsString(mState) + ", disabled=" + mDisabled.get()
+ ", binder=" + binder + ", events=" + (mEvents == null ? 0 : mEvents.size()));
}
@@ -408,7 +405,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
// clearings out.
private void handleResetSession(boolean resetState) {
if (resetState) {
mState = STATE_UNKNOWN;
mState = UNKNWON_STATE;
}
// TODO(b/122454205): must reset children (which currently is owned by superclass)
@@ -497,8 +494,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession {
}
pw.print(prefix); pw.print("mDisabled: "); pw.println(mDisabled.get());
pw.print(prefix); pw.print("isEnabled(): "); pw.println(isContentCaptureEnabled());
pw.print(prefix); pw.print("state: "); pw.print(mState); pw.print(" (");
pw.print(getStateAsString(mState)); pw.println(")");
pw.print(prefix); pw.print("state: "); pw.println(getStateAsString(mState));
if (mApplicationToken != null) {
pw.print(prefix); pw.print("app token: "); pw.println(mApplicationToken);
}