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

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

resolved conflicts for merge of ca48433a to master 

Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
parents bd7599ff ca48433a

core/java/android/os/Debug.java

+9 −8
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ public final class Debug 
    /**

     * Default trace file path and file

     */

    private static final String DEFAULT_TRACE_PATH_PREFIX = "/sdcard/";

    private static final String DEFAULT_TRACE_PATH_PREFIX =

        Environment.getExternalStorageDirectory().getPath() + "/";

    private static final String DEFAULT_TRACE_BODY = "dmtrace";

    private static final String DEFAULT_TRACE_EXTENSION = ".trace";

    private static final String DEFAULT_TRACE_FILE_PATH =

core/java/android/provider/Telephony.java

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Intent; 
import android.database.Cursor;

import android.database.sqlite.SqliteWrapper;

import android.net.Uri;

import android.os.Environment;

import android.telephony.SmsMessage;

import android.text.TextUtils;

import android.util.Config;
@@ -1526,7 +1527,8 @@ public final class Telephony { 
             * which streams the captured image to the uri. Internally we write the media content

             * to this file. It's named '.temp.jpg' so Gallery won't pick it up.

             */

            public static final String SCRAP_FILE_PATH = "/sdcard/mms/scrapSpace/.temp.jpg";

            public static final String SCRAP_FILE_PATH =

                Environment.getExternalStorageDirectory().getPath() + "/mms/scrapSpace/.temp.jpg";

        }



        public static final class Intents {