Remove use of synchronized method attribute
Bug: 236488480
Test: Ran test suite for EncryptedFile class
Change-Id: I5ae1175a2c1fa6eaff5fcc2528f87684e83d7d06
diff --git a/security/security-crypto/lint-baseline.xml b/security/security-crypto/lint-baseline.xml
deleted file mode 100644
index e23c350..0000000
--- a/security/security-crypto/lint-baseline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha08" type="baseline" client="cli" dependencies="false" name="AGP (7.4.0-alpha08)" variant="all" version="7.4.0-alpha08">
-
- <issue
- id="BanSynchronizedMethods"
- message="Use of synchronized methods is not recommended"
- errorLine1=" @Override"
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/security/crypto/EncryptedFile.java"/>
- </issue>
-
- <issue
- id="BanSynchronizedMethods"
- message="Use of synchronized methods is not recommended"
- errorLine1=" @Override"
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/security/crypto/EncryptedFile.java"/>
- </issue>
-
-</issues>
diff --git a/security/security-crypto/src/main/java/androidx/security/crypto/EncryptedFile.java b/security/security-crypto/src/main/java/androidx/security/crypto/EncryptedFile.java
index 1699c64..f8396ad 100644
--- a/security/security-crypto/src/main/java/androidx/security/crypto/EncryptedFile.java
+++ b/security/security-crypto/src/main/java/androidx/security/crypto/EncryptedFile.java
@@ -307,6 +307,8 @@
private final InputStream mEncryptedInputStream;
+ private final Object mLock = new Object();
+
EncryptedFileInputStream(FileDescriptor descriptor,
InputStream encryptedInputStream) {
super(descriptor);
@@ -350,13 +352,17 @@
}
@Override
- public synchronized void mark(int readlimit) {
- mEncryptedInputStream.mark(readlimit);
+ public void mark(int readLimit) {
+ synchronized (mLock) {
+ mEncryptedInputStream.mark(readLimit);
+ }
}
@Override
- public synchronized void reset() throws IOException {
- mEncryptedInputStream.reset();
+ public void reset() throws IOException {
+ synchronized (mLock) {
+ mEncryptedInputStream.reset();
+ }
}
@Override
