Projects >> android-frameworks-base-with-remote-control-service >>d1c3ea6a2116156629a1a3eaee64d0181e4f52c8

Chunk
Conflicting content 
                    Settings.Secure.THROTTLE_MAX_NTP_CACHE_AGE_SEC, MAX_NTP_CACHE_AGE_SEC);

            Slog.d(TAG, "onPolicyChanged testing=" + testing +", period=" + mPolicyPollPeriodSec +
<<<<<<< HEAD
                    ", threshold=" + mPolicyThreshold.get() + ", value=" +
                    mPolicyThrottleValue.get() + ", resetDay=" + mPolicyResetDay + ", noteType=" +
                    mPolicyNotificationsAllowedMask);
=======
                    ", threshold=" + mPolicyThreshold + ", value=" + mPolicyThrottleValue +
                    ", resetDay=" + mPolicyResetDay + ", noteType=" +
                    mPolicyNotificationsAllowedMask + ", maxNtpCacheAge=" + mMaxNtpCacheAgeSec);
>>>>>>> 3cd6a3e35322d293848cf9f998ffa301b60b9b2d

            // force updates
            mThrottleIndex.set(THROTTLE_INDEX_UNINITIALIZED);
Solution content 
                    Settings.Secure.THROTTLE_MAX_NTP_CACHE_AGE_SEC, MAX_NTP_CACHE_AGE_SEC);

            Slog.d(TAG, "onPolicyChanged testing=" + testing +", period=" + mPolicyPollPeriodSec +
                    ", threshold=" + mPolicyThreshold.get() + ", value=" +
                    mPolicyThrottleValue.get() + ", resetDay=" + mPolicyResetDay + ", noteType=" +
                    mPolicyNotificationsAllowedMask + ", maxNtpCacheAge=" + mMaxNtpCacheAgeSec);

            // force updates
            mThrottleIndex.set(THROTTLE_INDEX_UNINITIALIZED);
File
ThrottleService.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        getBestTime(false);
    }

<<<<<<< HEAD
    private static final int MAX_NTP_CACHE_AGE = 60 * 1000;
    private static final int MAX_NTP_FETCH_WAIT = 20 * 1000;
=======
    private static final int MAX_NTP_CACHE_AGE_SEC = 60 * 60 * 24; // 1 day
    private static final int MAX_NTP_FETCH_WAIT = 10 * 1000;
    private int mMaxNtpCacheAgeSec = MAX_NTP_CACHE_AGE_SEC;
>>>>>>> 3cd6a3e35322d293848cf9f998ffa301b60b9b2d
    private long cachedNtp;
    private long cachedNtpTimestamp;
Solution content 
        getBestTime(false);
    }

    private static final int MAX_NTP_CACHE_AGE_SEC = 60 * 60 * 24; // 1 day
    private static final int MAX_NTP_FETCH_WAIT = 20 * 1000;
    private int mMaxNtpCacheAgeSec = MAX_NTP_CACHE_AGE_SEC;
    private long cachedNtp;
    private long cachedNtpTimestamp;
File
ThrottleService.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
        if (mNtpServer != null) {
            if (mNtpActive) {
                long ntpAge = SystemClock.elapsedRealtime() - cachedNtpTimestamp;
<<<<<<< HEAD
                if (ntpAge < MAX_NTP_CACHE_AGE || fast) {
=======
                if (ntpAge < mMaxNtpCacheAgeSec * 1000) {
>>>>>>> 3cd6a3e35322d293848cf9f998ffa301b60b9b2d
                    if (VDBG) Slog.v(TAG, "using cached time");
                    return cachedNtp + ntpAge;
                }
Solution content 
        if (mNtpServer != null) {
            if (mNtpActive) {
                long ntpAge = SystemClock.elapsedRealtime() - cachedNtpTimestamp;
                if (ntpAge < mMaxNtpCacheAgeSec * 1000 || fast) {
                    if (VDBG) Slog.v(TAG, "using cached time");
                    return cachedNtp + ntpAge;
                }
File
ThrottleService.java
Developer's decision
Manual
Kind of conflict
If statement
Chunk
Conflicting content 
                "and ends in " + (getResetTime(mIface) - System.currentTimeMillis()) / 1000 +
                " seconds.");
        pw.println("Polling every " + mPolicyPollPeriodSec + " seconds");
<<<<<<< HEAD
        pw.println("Current Throttle Index is " + mThrottleIndex.get());
=======
        pw.println("Current Throttle Index is " + mThrottleIndex);
        pw.println("Max NTP Cache Age is " + mMaxNtpCacheAgeSec);
>>>>>>> 3cd6a3e35322d293848cf9f998ffa301b60b9b2d

        for (int i = 0; i < mRecorder.getPeriodCount(); i++) {
            pw.println(" Period[" + i + "] - read:" + mRecorder.getPeriodRx(i) + ", written:" +
Solution content 
                "and ends in " + (getResetTime(mIface) - System.currentTimeMillis()) / 1000 +
                " seconds.");
        pw.println("Polling every " + mPolicyPollPeriodSec + " seconds");
        pw.println("Current Throttle Index is " + mThrottleIndex.get());
        pw.println("Max NTP Cache Age is " + mMaxNtpCacheAgeSec);

        for (int i = 0; i < mRecorder.getPeriodCount(); i++) {
            pw.println(" Period[" + i + "] - read:" + mRecorder.getPeriodRx(i) + ", written:" +
File
ThrottleService.java
Developer's decision
Combination
Kind of conflict
Method invocation