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

Commit 6bdca178 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0. 

Conflicts:
	core/res/res/values-zh-rCN/cm_strings.xml

Change-Id: Ib885c2b25a7260b1f6837a9031f0d2a5794c86b7
parents 56cfe1d6 3dfb5ec9

core/java/android/app/AppOpsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ public class AppOpsManager { 
            null,

            null,

            null,

            null,

            OPSTR_MONITOR_LOCATION,

            OPSTR_MONITOR_HIGH_POWER_LOCATION,

            OPSTR_GET_USAGE_STATS,
@@ -509,6 +508,7 @@ public class AppOpsManager { 
            null,

            null,

            null,

            null,

    };



    /**

core/java/android/os/Environment.java

+7 −0
Original line number Diff line number Diff line
@@ -722,6 +722,13 @@ public class Environment { 
     */

    public static final String MEDIA_UNMOUNTABLE = "unmountable";



     /**

     * Storage state if the media is present and in formatting state.

     *

     * @hide

     */

    public static final String MEDIA_FORMATTING = "formatting";



    /**

     * Returns the current state of the primary "external" storage device.

     *

core/java/android/os/storage/StorageVolume.java

+9 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class StorageVolume implements Parcelable { 
    private String mUuid;

    private String mUserLabel;

    private String mState;

    private boolean mIsFormatting;



    // StorageVolume extra for ACTION_MEDIA_REMOVED, ACTION_MEDIA_UNMOUNTED, ACTION_MEDIA_CHECKING,

    // ACTION_MEDIA_NOFS, ACTION_MEDIA_MOUNTED, ACTION_MEDIA_SHARED, ACTION_MEDIA_UNSHARED,
@@ -238,6 +239,14 @@ public class StorageVolume implements Parcelable { 
        return mState;

    }



    public void setIsFormatting(boolean isFormatting) {

        mIsFormatting = isFormatting;

    }



    public boolean getIsFormatting() {

        return mIsFormatting;

    }



    @Override

    public boolean equals(Object obj) {

        if (obj instanceof StorageVolume && mPath != null) {

core/java/android/provider/CallLog.java

+3 −1
Original line number Diff line number Diff line
@@ -537,7 +537,9 @@ public class CallLog { 
                values.put(DATA_USAGE, dataUsage);

            }

            values.put(PHONE_ACCOUNT_COMPONENT_NAME, accountComponentString);

            if (accountId != null) {

                values.put(PHONE_ACCOUNT_ID, accountId);

            }

            values.put(NEW, Integer.valueOf(1));

            if (callType == MISSED_TYPE) {

                values.put(IS_READ, Integer.valueOf(0));

core/java/android/widget/QuickContactBadge.java

+5 −2
Original line number Diff line number Diff line
@@ -340,8 +340,11 @@ public class QuickContactBadge extends ImageView implements OnClickListener { 
            try {

                switch(token) {

                    case TOKEN_PHONE_LOOKUP_AND_TRIGGER:

                        String contactExtra = extras.getString(EXTRA_URI_CONTENT);

                        if (contactExtra != null) {

                            trigger = true;

                        createUri = Uri.fromParts("tel", extras.getString(EXTRA_URI_CONTENT), null);

                            createUri = Uri.fromParts("tel", contactExtra, null);

                        }



                        //$FALL-THROUGH$

                    case TOKEN_PHONE_LOOKUP: {