Merge "Possibly fix deadlock." into nyc-dev

                final ConditionRecord r = getRecordLocked(c.id, info.component, true /*create*/);

                r.info = info;

                r.condition = c;

            }

        }

        final int N = conditions.length;

        for (int i = 0; i < N; i++) {

            final Condition c = conditions[i];

            if (mCallback != null) {

                mCallback.onConditionChanged(c.id, c);

            }

        }

    }

    }

    public IConditionProvider findConditionProvider(ComponentName component) {

        if (component == null) return null;