Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." (56c4c442) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/cat/CatService.java

+22 −18

Original line number	Diff line number	Diff line
		@@ -118,6 +118,8 @@ public class CatService extends Handler implements AppInterface {
		private static IccRecords mIccRecords;

		// Service members.
		// Protects singleton instance lazy initialization.
		private static final Object sInstanceLock = new Object();
		private static CatService sInstance;
		private CommandsInterface mCmdIf;
		private Context mContext;
		@@ -515,6 +517,7 @@ public class CatService extends Handler implements AppInterface {
		*/
		public static CatService getInstance(CommandsInterface ci, IccRecords ir,
		Context context, IccFileHandler fh, IccCard ic) {
		synchronized (sInstanceLock) {
		if (sInstance == null) {
		if (ci == null \|\| ir == null \|\| context == null \|\| fh == null
		\|\| ic == null) {
		@@ -536,6 +539,7 @@ public class CatService extends Handler implements AppInterface {
		}
		return sInstance;
		}
		}

		/**
		* Used by application to get an AppInterface object.