Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4de7ab1d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to... 

Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7ac am: 25bdce7f am: aa4391ae

Change-Id: If515f6d5f72f62ec9dc359c213684ba114781693
parents 873b5542 aa4391ae

api/system-current.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -12704,9 +12704,6 @@ package android.view.contentcapture { 
















  public final class ContentCaptureManager {







  public final class ContentCaptureManager {











    method public boolean isContentCaptureFeatureEnabled();







    method public boolean isContentCaptureFeatureEnabled();











  }



























  public abstract class ContentCaptureSession implements java.lang.AutoCloseable {














    field public static final int NO_SESSION_ID = 0; // 0x0







    field public static final int NO_SESSION_ID = 0; // 0x0











  }







  }









































core/java/android/service/contentcapture/ContentCaptureService.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -18,7 +18,7 @@ package android.service.contentcapture;









import static android.view.contentcapture.ContentCaptureHelper.sDebug;







import static android.view.contentcapture.ContentCaptureHelper.sDebug;











import static android.view.contentcapture.ContentCaptureHelper.sVerbose;







import static android.view.contentcapture.ContentCaptureHelper.sVerbose;











import static android.view.contentcapture.ContentCaptureHelper.toList;







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;







import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;





















































core/java/android/view/contentcapture/ContentCaptureContext.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -15,7 +15,7 @@









 */







 */











package android.view.contentcapture;







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.IntDef;











import android.annotation.NonNull;







import android.annotation.NonNull;

































core/java/android/view/contentcapture/ContentCaptureEvent.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -16,7 +16,7 @@









package android.view.contentcapture;







package android.view.contentcapture;































import static android.view.contentcapture.ContentCaptureHelper.getSanitizedString;







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.IntDef;











import android.annotation.NonNull;







import android.annotation.NonNull;

































core/java/android/view/contentcapture/ContentCaptureManager.java



+7
−0




























Original line number
Original line
Diff line number
Diff line








@@ -234,6 +234,13 @@ public final class ContentCaptureManager {









    /** @hide */







    /** @hide */











    public static final int RESULT_CODE_SECURITY_EXCEPTION = -1;







    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.







     * Timeout for calls to system_server.











     */







     */