Minor code clean-ups with no behavior change
As another preparation CL to work on Bug 7254002, this CL cleans up
miscellaneous minor coding style issues that do not cause any
user-visible problems.
- Add final keyboard to classes that are not intended to be extended.
- Add static keyboard to nested classes if possible.
- Fix a typo in log message.
- Remove a redundant synchronized keyword in method signature.
- Remove unused class fields.
Test: checkbuild
Bug: 7254002
Change-Id: I3b54179116a74cafc99a3dfd3f2a429a7111c12e
diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java
index 729eb8d..2e2056c 100644
--- a/core/java/android/view/textservice/SpellCheckerSession.java
+++ b/core/java/android/view/textservice/SpellCheckerSession.java
@@ -97,7 +97,6 @@
private final SpellCheckerInfo mSpellCheckerInfo;
private final SpellCheckerSessionListener mSpellCheckerSessionListener;
private final SpellCheckerSessionListenerImpl mSpellCheckerSessionListenerImpl;
- private final SpellCheckerSubtype mSubtype;
private boolean mIsUsed;
@@ -121,8 +120,7 @@
* @hide
*/
public SpellCheckerSession(
- SpellCheckerInfo info, ITextServicesManager tsm, SpellCheckerSessionListener listener,
- SpellCheckerSubtype subtype) {
+ SpellCheckerInfo info, ITextServicesManager tsm, SpellCheckerSessionListener listener) {
if (info == null || listener == null || tsm == null) {
throw new NullPointerException();
}
@@ -132,7 +130,6 @@
mTextServicesManager = tsm;
mIsUsed = true;
mSpellCheckerSessionListener = listener;
- mSubtype = subtype;
}
/**
@@ -218,7 +215,8 @@
mSpellCheckerSessionListener.onGetSentenceSuggestions(suggestionInfos);
}
- private static class SpellCheckerSessionListenerImpl extends ISpellCheckerSessionListener.Stub {
+ private static final class SpellCheckerSessionListenerImpl
+ extends ISpellCheckerSessionListener.Stub {
private static final int TASK_CANCEL = 1;
private static final int TASK_GET_SUGGESTIONS_MULTIPLE = 2;
private static final int TASK_CLOSE = 3;
@@ -366,7 +364,7 @@
}
}
- public synchronized void onServiceConnected(ISpellCheckerSession session) {
+ public void onServiceConnected(ISpellCheckerSession session) {
synchronized (this) {
switch (mState) {
case STATE_WAIT_CONNECTION:
@@ -408,9 +406,9 @@
+ Integer.toHexString(mISpellCheckerSession.hashCode())
+ " mPendingTasks.size()=" + mPendingTasks.size());
}
- }
- while (!mPendingTasks.isEmpty()) {
- processTask(session, mPendingTasks.poll(), false);
+ while (!mPendingTasks.isEmpty()) {
+ processTask(session, mPendingTasks.poll(), false);
+ }
}
}
@@ -529,7 +527,7 @@
public void onGetSentenceSuggestions(SentenceSuggestionsInfo[] results);
}
- private static class InternalListener extends ITextServicesSessionListener.Stub {
+ private static final class InternalListener extends ITextServicesSessionListener.Stub {
private final SpellCheckerSessionListenerImpl mParentSpellCheckerSessionListenerImpl;
public InternalListener(SpellCheckerSessionListenerImpl spellCheckerSessionListenerImpl) {
@@ -547,7 +545,7 @@
super.finalize();
if (mIsUsed) {
Log.e(TAG, "SpellCheckerSession was not finished properly." +
- "You should call finishShession() when you finished to use a spell checker.");
+ "You should call finishSession() when you finished to use a spell checker.");
close();
}
}
diff --git a/core/java/android/view/textservice/TextServicesManager.java b/core/java/android/view/textservice/TextServicesManager.java
index 0f168f3..b4e6c56 100644
--- a/core/java/android/view/textservice/TextServicesManager.java
+++ b/core/java/android/view/textservice/TextServicesManager.java
@@ -171,8 +171,7 @@
if (subtypeInUse == null) {
return null;
}
- final SpellCheckerSession session = new SpellCheckerSession(
- sci, mService, listener, subtypeInUse);
+ final SpellCheckerSession session = new SpellCheckerSession(sci, mService, listener);
try {
mService.getSpellCheckerService(sci.getId(), subtypeInUse.getLocale(),
session.getTextServicesSessionListener(),
diff --git a/services/core/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java
index cbd7be7..2b5166e 100644
--- a/services/core/java/com/android/server/TextServicesManagerService.java
+++ b/services/core/java/com/android/server/TextServicesManagerService.java
@@ -198,7 +198,7 @@
mUserManager.getProfileIdsWithDisabled(mSettings.getCurrentUserId()));
}
- private class TextServicesMonitor extends PackageMonitor {
+ private final class TextServicesMonitor extends PackageMonitor {
private boolean isChangingPackagesOfCurrentUser() {
final int userId = getChangingUserId();
final boolean retval = userId == mSettings.getCurrentUserId();
@@ -236,7 +236,7 @@
}
}
- class TextServicesBroadcastReceiver extends BroadcastReceiver {
+ private final class TextServicesBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
@@ -618,8 +618,7 @@
Slog.w(TAG, "Start spell checker session inner locked.");
}
final String sciId = info.getId();
- final InternalServiceConnection connection = new InternalServiceConnection(
- sciId, locale, bundle);
+ final InternalServiceConnection connection = new InternalServiceConnection(sciId);
final Intent serviceIntent = new Intent(SpellCheckerService.SERVICE_INTERFACE);
serviceIntent.setComponent(info.getComponent());
if (DBG) {
@@ -836,7 +835,7 @@
// SpellCheckerBindGroup contains active text service session listeners.
// If there are no listeners anymore, the SpellCheckerBindGroup instance will be removed from
// mSpellCheckerBindGroups
- private class SpellCheckerBindGroup {
+ private final class SpellCheckerBindGroup {
private final String TAG = SpellCheckerBindGroup.class.getSimpleName();
private final InternalServiceConnection mInternalConnection;
private final CopyOnWriteArrayList<InternalDeathRecipient> mListeners =
@@ -972,15 +971,10 @@
}
}
- private class InternalServiceConnection implements ServiceConnection {
+ private final class InternalServiceConnection implements ServiceConnection {
private final String mSciId;
- private final String mLocale;
- private final Bundle mBundle;
- public InternalServiceConnection(
- String id, String locale, Bundle bundle) {
+ public InternalServiceConnection(String id) {
mSciId = id;
- mLocale = locale;
- mBundle = bundle;
}
@Override
@@ -1013,7 +1007,7 @@
}
}
- private class InternalDeathRecipient implements IBinder.DeathRecipient {
+ private static final class InternalDeathRecipient implements IBinder.DeathRecipient {
public final ITextServicesSessionListener mTsListener;
public final ISpellCheckerSessionListener mScListener;
public final String mScLocale;
@@ -1041,7 +1035,7 @@
}
}
- private static class TextServicesSettings {
+ private static final class TextServicesSettings {
private final ContentResolver mResolver;
@UserIdInt
private int mCurrentUserId;