Frameworks: Annotate trivial @GuardedBy in packages
Add @GuardedBy for simple functions that require locks and have a name in
one of the frameworks naming styles for locks ("^.*(Locked|LPw|LPr|L[a-zA-Z]|UL|AL|NL)$").
Derived by errorprone.
Bug: 73000847
Test: m
Change-Id: Id14322b0a6206152cd2933c968e0a6f470fcee09
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java b/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java
index 3e6c3f2..044ec86 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/GenerationRegistry.java
@@ -111,6 +111,7 @@
}
}
+ @GuardedBy("mLock")
private MemoryIntArray getBackingStoreLocked() {
if (mBackingStore == null) {
// One for the global table, two for system and secure tables for a
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 500199f..290a4f8 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -722,6 +722,7 @@
}
}
+ @GuardedBy("mLock")
private void dumpForUserLocked(int userId, PrintWriter pw) {
if (userId == UserHandle.USER_SYSTEM) {
pw.println("GLOBAL SETTINGS (user " + userId + ")");
@@ -1179,6 +1180,7 @@
&& UserHandle.getAppId(Binder.getCallingUid()) >= Process.FIRST_APPLICATION_UID;
}
+ @GuardedBy("mLock")
private Setting getSsaidSettingLocked(PackageInfo callingPkg, int owningUserId) {
// Get uid of caller (key) used to store ssaid value
String name = Integer.toString(
@@ -1709,6 +1711,7 @@
}
}
+ @GuardedBy("mLock")
private List<String> getSettingsNamesLocked(int settingsType, int userId) {
// Don't enforce the instant app whitelist for now -- its too prone to unintended breakage
// in the current form.
@@ -1801,6 +1804,7 @@
*
* @returns whether the enabled location providers changed.
*/
+ @GuardedBy("mLock")
private boolean updateLocationProvidersAllowedLocked(String value, String tag,
int owningUserId, boolean makeDefault, boolean forceNotify) {
if (TextUtils.isEmpty(value)) {
@@ -2718,6 +2722,7 @@
}
}
+ @GuardedBy("secureSettings.mLock")
private void ensureSecureSettingAndroidIdSetLocked(SettingsState secureSettings) {
Setting value = secureSettings.getSettingLocked(Settings.Secure.ANDROID_ID);
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
index e57483a..389d627 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
@@ -274,6 +274,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public int getVersionLocked() {
return mVersion;
}
@@ -283,6 +284,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public void setVersionLocked(int version) {
if (version == mVersion) {
return;
@@ -293,6 +295,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public void removeSettingsForPackageLocked(String packageName) {
boolean removedSomething = false;
@@ -317,6 +320,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public List<String> getSettingNamesLocked() {
ArrayList<String> names = new ArrayList<>();
final int settingsCount = mSettings.size();
@@ -328,6 +332,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public Setting getSettingLocked(String name) {
if (TextUtils.isEmpty(name)) {
return mNullSetting;
@@ -350,6 +355,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public void resetSettingDefaultValueLocked(String name) {
Setting oldSetting = getSettingLocked(name);
if (oldSetting != null && !oldSetting.isNull() && oldSetting.getDefaultValue() != null) {
@@ -366,6 +372,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public boolean insertSettingLocked(String name, String value, String tag,
boolean makeDefault, String packageName) {
if (TextUtils.isEmpty(name)) {
@@ -407,6 +414,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public boolean deleteSettingLocked(String name) {
if (TextUtils.isEmpty(name) || !hasSettingLocked(name)) {
return false;
@@ -429,6 +437,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public boolean resetSettingLocked(String name) {
if (TextUtils.isEmpty(name) || !hasSettingLocked(name)) {
return false;
@@ -458,6 +467,7 @@
}
// The settings provider must hold its lock when calling here.
+ @GuardedBy("mLock")
public void destroyLocked(Runnable callback) {
mHandler.removeMessages(MyHandler.MSG_PERSIST_SETTINGS);
if (callback != null) {
@@ -471,6 +481,7 @@
}
}
+ @GuardedBy("mLock")
private void addHistoricalOperationLocked(String type, Setting setting) {
if (mHistoricalOperations == null) {
return;
@@ -553,6 +564,7 @@
}
}
+ @GuardedBy("mLock")
private void updateMemoryUsagePerPackageLocked(String packageName, String oldValue,
String newValue, String oldDefaultValue, String newDefaultValue) {
if (mMaxBytesPerAppPackage == MAX_BYTES_PER_APP_PACKAGE_UNLIMITED) {
@@ -588,10 +600,12 @@
mPackageToMemoryUsage.put(packageName, newSize);
}
+ @GuardedBy("mLock")
private boolean hasSettingLocked(String name) {
return mSettings.indexOfKey(name) >= 0;
}
+ @GuardedBy("mLock")
private void scheduleWriteIfNeededLocked() {
// If dirty then we have a write already scheduled.
if (!mDirty) {
@@ -600,6 +614,7 @@
}
}
+ @GuardedBy("mLock")
private void writeStateAsyncLocked() {
final long currentTimeMillis = SystemClock.uptimeMillis();
@@ -771,6 +786,7 @@
}
}
+ @GuardedBy("mLock")
private void readStateSyncLocked() {
FileInputStream in;
try {
@@ -820,6 +836,7 @@
}
}
+ @GuardedBy("mLock")
private void parseSettingsLocked(XmlPullParser parser)
throws IOException, XmlPullParserException {