Commit 323d4a41 authored by Narcis Beleuzu's avatar Narcis Beleuzu
Browse files

Backed out 3 changesets (Bug 1433968) for causing Bug 1459349. a=backout 

Backed out changeset 82b765c5a02f (bug 1433968)
Backed out changeset 73ec9bb3e17e (bug 1433968)
Backed out changeset 0812ac0376da (bug 1433968)

--HG--
extra : amend_source : 2748b297418eea9b7d3c2be11a8e7e300f8d709c
extra : histedit_source : 6428453bbe80ad044661d01e5127d924fffed1a3%2Cd2e712ac6c597784343ff08f75199851c07be4e7
parent f666a32b

mobile/android/app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ android { 
                }



                if (!mozconfig.substs.MOZ_CRASHREPORTER) {

                    exclude 'org/mozilla/gecko/CrashReporterActivity.java'

                    exclude 'org/mozilla/gecko/CrashReporter.java'

                }



                if (!mozconfig.substs.MOZ_NATIVE_DEVICES) {

mobile/android/app/lint.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
    </issue>



    <!-- We fixed all "Registered" lint errors. However the current gradle plugin has a bug where

         it ignores @SuppressLint annotations for this check. See CrashReporterActivity class and

         it ignores @SuppressLint annotations for this check. See CrashReporter class and

         https://code.google.com/p/android/issues/detail?id=204846 -->

    <issue id="Registered" severity="warning" />

mobile/android/base/AndroidManifest.xml.in

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ 
#include ../services/manifests/FxAccountAndroidManifest_activities.xml.in



#ifdef MOZ_CRASHREPORTER

  <activity android:name="org.mozilla.gecko.CrashReporterActivity"

  <activity android:name="org.mozilla.gecko.CrashReporter"

            android:process="@ANDROID_PACKAGE_NAME@.CrashReporter"

            android:label="@string/crash_reporter_title"

            android:icon="@drawable/crash_reporter"

mobile/android/base/java/org/mozilla/gecko/CrashReporterActivity.java→mobile/android/base/java/org/mozilla/gecko/CrashReporter.java

+5 −4
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import java.security.MessageDigest; 
import java.util.zip.GZIPOutputStream;



import org.mozilla.gecko.AppConstants.Versions;

import org.mozilla.gecko.GeckoProfile;

import org.mozilla.gecko.mozglue.GeckoLoader;

import org.mozilla.gecko.mozglue.MinidumpAnalyzer;

import org.mozilla.gecko.telemetry.pingbuilders.TelemetryCrashPingBuilder;
@@ -56,7 +57,7 @@ import android.widget.EditText; 
// Registered: This activity is only registered in the manifest if MOZ_CRASHREPORTER is set.

// CutPasteId: This lint is not worth fixing.  To fix it, cache all the findViewById results.

@SuppressLint("Registered,CutPasteId")

public class CrashReporterActivity extends AppCompatActivity

public class CrashReporter extends AppCompatActivity

{

    private static final String LOGTAG = "GeckoCrashReporter";
@@ -209,7 +210,7 @@ public class CrashReporterActivity extends AppCompatActivity 
        final EditText commentsEditText = (EditText) findViewById(R.id.comment);

        final EditText emailEditText = (EditText) findViewById(R.id.email);



        // Load CrashReporterActivity preferences to avoid redundant user input.

        // Load CrashReporter preferences to avoid redundant user input.

        SharedPreferences prefs = GeckoSharedPrefs.forCrashReporter(this);

        final boolean sendReport   = prefs.getBoolean(PREFS_SEND_REPORT, true);

        final boolean includeUrl   = prefs.getBoolean(PREFS_INCLUDE_URL, false);
@@ -270,7 +271,7 @@ public class CrashReporterActivity extends AppCompatActivity 
        builder.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() {

            @Override

            public void onClick(DialogInterface dialog, int which) {

                CrashReporterActivity.this.finish();

                CrashReporter.this.finish();

            }

        });

        builder.show();
@@ -292,7 +293,7 @@ public class CrashReporterActivity extends AppCompatActivity 
            public void run() {

                sendReport(mPendingMinidumpFile, mExtrasStringMap, mPendingExtrasFile);

            }

        }, "CrashReporterActivity Thread").start();

        }, "CrashReporter Thread").start();

    }



    private void savePrefs() {

mobile/android/geckoview/build.gradle

+0 −4
Original line number Diff line number Diff line
@@ -135,10 +135,6 @@ android { 
                    exclude 'org/mozilla/gecko/media/Utils.java'

                }



                if (!mozconfig.substs.MOZ_CRASHREPORTER) {

                    exclude 'org/mozilla/gecko/CrashReporterService.java'

                }



                if (mozconfig.substs.MOZ_WEBRTC) {

                    srcDir "${topsrcdir}/media/webrtc/trunk/webrtc/base/java/src"

                    srcDir "${topsrcdir}/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src"