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

Merge "Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7acaf am: 25bdce7fcf am: aa4391ae70" into rvc-qpr-dev-plus-aosp am: 415d437fc2

Browse Source 
Change-Id: Ide81ce96c1eb37860ed44ff724bb48ec215fbc1c
This commit is contained in:
Automerger Merge Worker
2020-03-27 19:31:00 +00:00
parent bae5ff1768 415d437fc2
commit 5d8c7cd302
8 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -12712,9 +12712,6 @@ package android.view.contentcapture {
public final class ContentCaptureManager {
method public boolean isContentCaptureFeatureEnabled();
}
public abstract class ContentCaptureSession implements java.lang.AutoCloseable {
field public static final int NO_SESSION_ID = 0; // 0x0
}

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

@@ -18,7 +18,7 @@ package android.service.contentcapture;
import static android.view.contentcapture.ContentCaptureHelper.sDebug;
import static android.view.contentcapture.ContentCaptureHelper.sVerbose;
import static android.view.contentcapture.ContentCaptureHelper.toList;
import static android.view.contentcapture.ContentCaptureSession.NO_SESSION_ID;
import static android.view.contentcapture.ContentCaptureManager.NO_SESSION_ID;
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;

2
core/java/android/view/contentcapture/ContentCaptureContext.java
View File

@@ -15,7 +15,7 @@
*/
package android.view.contentcapture;
import static android.view.contentcapture.ContentCaptureSession.NO_SESSION_ID;
import static android.view.contentcapture.ContentCaptureManager.NO_SESSION_ID;
import android.annotation.IntDef;
import android.annotation.NonNull;

2
core/java/android/view/contentcapture/ContentCaptureEvent.java
View File

@@ -16,7 +16,7 @@
package android.view.contentcapture;
import static android.view.contentcapture.ContentCaptureHelper.getSanitizedString;
import static android.view.contentcapture.ContentCaptureSession.NO_SESSION_ID;
import static android.view.contentcapture.ContentCaptureManager.NO_SESSION_ID;
import android.annotation.IntDef;
import android.annotation.NonNull;

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

@@ -234,6 +234,13 @@ public final class ContentCaptureManager {
/** @hide */
public static final int RESULT_CODE_SECURITY_EXCEPTION = -1;
/**
* ID used to indicate that a session does not exist
* @hide
*/
@SystemApi
public static final int NO_SESSION_ID = 0;
/**
* Timeout for calls to system_server.
*/

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

@@ -17,12 +17,12 @@ package android.view.contentcapture;
import static android.view.contentcapture.ContentCaptureHelper.sDebug;
import static android.view.contentcapture.ContentCaptureHelper.sVerbose;
import static android.view.contentcapture.ContentCaptureManager.NO_SESSION_ID;
import android.annotation.CallSuper;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.graphics.Insets;
import android.util.DebugUtils;
import android.util.Log;
@@ -52,13 +52,6 @@ public abstract class ContentCaptureSession implements AutoCloseable {
private static final Random sIdGenerator = new Random();
/**
* ID used to indicate that a session does not exist
* @hide
*/
@SystemApi
public static final int NO_SESSION_ID = 0;
/**
* Initial state, when there is no session.
*

2
services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
View File

@@ -17,7 +17,7 @@
package com.android.server.contentcapture;
import static android.service.contentcapture.ContentCaptureService.setClientState;
import static android.view.contentcapture.ContentCaptureSession.NO_SESSION_ID;
import static android.view.contentcapture.ContentCaptureManager.NO_SESSION_ID;
import static android.view.contentcapture.ContentCaptureSession.STATE_DISABLED;
import static android.view.contentcapture.ContentCaptureSession.STATE_DUPLICATED_ID;
import static android.view.contentcapture.ContentCaptureSession.STATE_INTERNAL_ERROR;

2
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureServerSession.java
View File

@@ -16,9 +16,9 @@
package com.android.server.contentcapture;
import static android.service.contentcapture.ContentCaptureService.setClientState;
import static android.view.contentcapture.ContentCaptureManager.NO_SESSION_ID;
import static android.view.contentcapture.ContentCaptureManager.RESULT_CODE_FALSE;
import static android.view.contentcapture.ContentCaptureManager.RESULT_CODE_TRUE;
import static android.view.contentcapture.ContentCaptureSession.NO_SESSION_ID;
import static android.view.contentcapture.ContentCaptureSession.STATE_ACTIVE;
import static android.view.contentcapture.ContentCaptureSession.STATE_DISABLED;
import static android.view.contentcapture.ContentCaptureSession.STATE_SERVICE_RESURRECTED;