Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f389f282 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 7749a1c5 to jb-mr1-dev 

Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
parents 5575e97c 7749a1c5

core/java/android/content/SyncStorageEngine.java

+6 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import org.xmlpull.v1.XmlSerializer; 


import android.accounts.Account;

import android.accounts.AccountAndUser;

import android.content.res.Resources;

import android.database.Cursor;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteException;
@@ -336,6 +337,7 @@ public class SyncStorageEngine extends Handler { 


    private int mNextHistoryId = 0;

    private SparseArray<Boolean> mMasterSyncAutomatically = new SparseArray<Boolean>();

    private boolean mDefaultMasterSyncAutomatically;



    private OnSyncRequestListener mSyncRequestListener;
@@ -345,6 +347,9 @@ public class SyncStorageEngine extends Handler { 


        mCal = Calendar.getInstance(TimeZone.getTimeZone("GMT+0"));



        mDefaultMasterSyncAutomatically = mContext.getResources().getBoolean(

               com.android.internal.R.bool.config_syncstorageengine_masterSyncAutomatically);



        File systemDir = new File(dataDir, "system");

        File syncDir = new File(systemDir, "sync");

        syncDir.mkdirs();
@@ -780,7 +785,7 @@ public class SyncStorageEngine extends Handler { 
    public boolean getMasterSyncAutomatically(int userId) {

        synchronized (mAuthorities) {

            Boolean auto = mMasterSyncAutomatically.get(userId);

            return auto == null ? true : auto;

            return auto == null ? mDefaultMasterSyncAutomatically : auto;

        }

    }

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -919,6 +919,9 @@ 
    <!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->

    <bool name="config_cellBroadcastAppLinks">false</bool>



    <!-- The default value if the SyncStorageEngine should sync automatically or not -->

    <bool name="config_syncstorageengine_masterSyncAutomatically">true</bool>



    <!--  Maximum number of supported users -->

    <integer name="config_multiuserMaximumUsers">10</integer>

</resources>

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ 
  <java-symbol type="bool" name="config_sms_capable" />

  <java-symbol type="bool" name="config_sms_utf8_support" />

  <java-symbol type="bool" name="config_swipeDisambiguation" />

  <java-symbol type="bool" name="config_syncstorageengine_masterSyncAutomatically" />

  <java-symbol type="bool" name="config_telephony_use_own_number_for_voicemail" />

  <java-symbol type="bool" name="config_ui_enableFadingMarquee" />

  <java-symbol type="bool" name="config_use_strict_phone_number_comparation" />