--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -66,16 +66,17 @@ android {
         }
     }
 
     sourceSets {
         main {
             manifest.srcFile "${project.buildDir}/generated/source/preprocessed_manifest/AndroidManifest.xml"
 
             java {
+                srcDir "${topsrcdir}/mobile/android/geckoview/src/main/java"
                 srcDir "${topsrcdir}/mobile/android/base/java"
                 srcDir "${topsrcdir}/mobile/android/search/java"
                 srcDir "${topsrcdir}/mobile/android/javaaddons/java"
                 srcDir "${topsrcdir}/mobile/android/services/src/main/java"
 
                 if (mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) {
                     srcDir "${topsrcdir}/mobile/android/stumbler/java"
                 }

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/ANRReporter.java
+++ /dev/null
@@ -1,596 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.util.Locale;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
-import org.json.JSONObject;
-import org.mozilla.gecko.annotation.WrapForJNI;
-import org.mozilla.gecko.AppConstants.Versions;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-
-public final class ANRReporter extends BroadcastReceiver
-{
-    private static final boolean DEBUG = false;
-    private static final String LOGTAG = "GeckoANRReporter";
-
-    private static final String ANR_ACTION = "android.intent.action.ANR";
-    // Number of lines to search traces.txt to decide whether it's a Gecko ANR
-    private static final int LINES_TO_IDENTIFY_TRACES = 10;
-    // ANRs may happen because of memory pressure,
-    //  so don't use up too much memory here
-    // Size of buffer to hold one line of text
-    private static final int TRACES_LINE_SIZE = 100;
-    // Size of block to use when processing traces.txt
-    private static final int TRACES_BLOCK_SIZE = 2000;
-    private static final String TRACES_CHARSET = "utf-8";
-    private static final String PING_CHARSET = "utf-8";
-
-    private static final ANRReporter sInstance = new ANRReporter();
-    private static int sRegisteredCount;
-    private Handler mHandler;
-    private volatile boolean mPendingANR;
-
-    @WrapForJNI
-    private static native boolean requestNativeStack(boolean unwind);
-    @WrapForJNI
-    private static native String getNativeStack();
-    @WrapForJNI
-    private static native void releaseNativeStack();
-
-    public static void register(Context context) {
-        if (sRegisteredCount++ != 0) {
-            // Already registered
-            return;
-        }
-        sInstance.start(context);
-    }
-
-    public static void unregister() {
-        if (sRegisteredCount == 0) {
-            Log.w(LOGTAG, "register/unregister mismatch");
-            return;
-        }
-        if (--sRegisteredCount != 0) {
-            // Should still be registered
-            return;
-        }
-        sInstance.stop();
-    }
-
-    private void start(final Context context) {
-
-        Thread receiverThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                Looper.prepare();
-                synchronized (ANRReporter.this) {
-                    mHandler = new Handler();
-                    ANRReporter.this.notify();
-                }
-                if (DEBUG) {
-                    Log.d(LOGTAG, "registering receiver");
-                }
-                context.registerReceiver(ANRReporter.this,
-                                         new IntentFilter(ANR_ACTION),
-                                         null,
-                                         mHandler);
-                Looper.loop();
-
-                if (DEBUG) {
-                    Log.d(LOGTAG, "unregistering receiver");
-                }
-                context.unregisterReceiver(ANRReporter.this);
-                mHandler = null;
-            }
-        }, LOGTAG);
-
-        receiverThread.setDaemon(true);
-        receiverThread.start();
-    }
-
-    private void stop() {
-        synchronized (this) {
-            while (mHandler == null) {
-                try {
-                    wait(1000);
-                    if (mHandler == null) {
-                        // We timed out; just give up. The process is probably
-                        // quitting anyways, so we let the OS do the clean up
-                        Log.w(LOGTAG, "timed out waiting for handler");
-                        return;
-                    }
-                } catch (InterruptedException e) {
-                }
-            }
-        }
-        Looper looper = mHandler.getLooper();
-        looper.quit();
-        try {
-            looper.getThread().join();
-        } catch (InterruptedException e) {
-        }
-    }
-
-    private ANRReporter() {
-    }
-
-    // Return the "traces.txt" file, or null if there is no such file
-    private static File getTracesFile() {
-        // Check most common location first.
-        File tracesFile = new File("/data/anr/traces.txt");
-        if (tracesFile.isFile() && tracesFile.canRead()) {
-            return tracesFile;
-        }
-
-        // Find the traces file name if we can.
-        try {
-            // getprop [prop-name [default-value]]
-            Process propProc = (new ProcessBuilder())
-                .command("/system/bin/getprop", "dalvik.vm.stack-trace-file")
-                .redirectErrorStream(true)
-                .start();
-            try {
-                BufferedReader buf = new BufferedReader(
-                    new InputStreamReader(propProc.getInputStream()), TRACES_LINE_SIZE);
-                String propVal = buf.readLine();
-                if (DEBUG) {
-                    Log.d(LOGTAG, "getprop returned " + String.valueOf(propVal));
-                }
-                // getprop can return empty string when the prop value is empty
-                // or prop is undefined, treat both cases the same way
-                if (propVal != null && propVal.length() != 0) {
-                    tracesFile = new File(propVal);
-                    if (tracesFile.isFile() && tracesFile.canRead()) {
-                        return tracesFile;
-                    } else if (DEBUG) {
-                        Log.d(LOGTAG, "cannot access traces file");
-                    }
-                } else if (DEBUG) {
-                    Log.d(LOGTAG, "empty getprop result");
-                }
-            } finally {
-                propProc.destroy();
-            }
-        } catch (IOException e) {
-            Log.w(LOGTAG, e);
-        } catch (ClassCastException e) {
-            Log.w(LOGTAG, e); // Bug 975436
-        }
-        return null;
-    }
-
-    private static File getPingFile() {
-        if (GeckoAppShell.getContext() == null) {
-            return null;
-        }
-        GeckoProfile profile = GeckoAppShell.getGeckoInterface().getProfile();
-        if (profile == null) {
-            return null;
-        }
-        File profDir = profile.getDir();
-        if (profDir == null) {
-            return null;
-        }
-        File pingDir = new File(profDir, "saved-telemetry-pings");
-        pingDir.mkdirs();
-        if (!(pingDir.exists() && pingDir.isDirectory())) {
-            return null;
-        }
-        return new File(pingDir, UUID.randomUUID().toString());
-    }
-
-    // Return true if the traces file corresponds to a Gecko ANR
-    private static boolean isGeckoTraces(String pkgName, File tracesFile) {
-        try {
-            final String END_OF_PACKAGE_NAME = "([^a-zA-Z0-9_]|$)";
-            // Regex for finding our package name in the traces file
-            Pattern pkgPattern = Pattern.compile(Pattern.quote(pkgName) + END_OF_PACKAGE_NAME);
-            Pattern mangledPattern = null;
-            if (!AppConstants.MANGLED_ANDROID_PACKAGE_NAME.equals(pkgName)) {
-                mangledPattern = Pattern.compile(Pattern.quote(
-                    AppConstants.MANGLED_ANDROID_PACKAGE_NAME) + END_OF_PACKAGE_NAME);
-            }
-            if (DEBUG) {
-                Log.d(LOGTAG, "trying to match package: " + pkgName);
-            }
-            BufferedReader traces = new BufferedReader(
-                new FileReader(tracesFile), TRACES_BLOCK_SIZE);
-            try {
-                for (int count = 0; count < LINES_TO_IDENTIFY_TRACES; count++) {
-                    String line = traces.readLine();
-                    if (DEBUG) {
-                        Log.d(LOGTAG, "identifying line: " + String.valueOf(line));
-                    }
-                    if (line == null) {
-                        if (DEBUG) {
-                            Log.d(LOGTAG, "reached end of traces file");
-                        }
-                        return false;
-                    }
-                    if (pkgPattern.matcher(line).find()) {
-                        // traces.txt file contains our package
-                        return true;
-                    }
-                    if (mangledPattern != null && mangledPattern.matcher(line).find()) {
-                        // traces.txt file contains our alternate package
-                        return true;
-                    }
-                }
-            } finally {
-                traces.close();
-            }
-        } catch (IOException e) {
-            // meh, can't even read from it right. just return false
-        }
-        return false;
-    }
-
-    private static long getUptimeMins() {
-
-        long uptimeMins = (new File("/proc/self/stat")).lastModified();
-        if (uptimeMins != 0L) {
-            uptimeMins = (System.currentTimeMillis() - uptimeMins) / 1000L / 60L;
-            if (DEBUG) {
-                Log.d(LOGTAG, "uptime " + String.valueOf(uptimeMins));
-            }
-            return uptimeMins;
-        }
-        if (DEBUG) {
-            Log.d(LOGTAG, "could not get uptime");
-        }
-        return 0L;
-    }
-
-    /*
-        a saved telemetry ping file consists of JSON in the following format,
-            {
-                "reason": "android-anr-report",
-                "slug": "<uuid-string>",
-                "payload": <json-object>
-            }
-        for Android ANR, our JSON payload should look like,
-            {
-                "ver": 1,
-                "simpleMeasurements": {
-                    "uptime": <uptime>
-                },
-                "info": {
-                    "reason": "android-anr-report",
-                    "OS": "Android",
-                    ...
-                },
-                "androidANR": "...",
-                "androidLogcat": "..."
-            }
-    */
-
-    private static int writePingPayload(OutputStream ping,
-                                        String payload) throws IOException {
-        byte [] data = payload.getBytes(PING_CHARSET);
-        ping.write(data);
-        return data.length;
-    }
-
-    private static void fillPingHeader(OutputStream ping, String slug)
-            throws IOException {
-
-        // ping file header
-        byte [] data = ("{" +
-            "\"reason\":\"android-anr-report\"," +
-            "\"slug\":" + JSONObject.quote(slug) + "," +
-            "\"payload\":").getBytes(PING_CHARSET);
-        ping.write(data);
-        if (DEBUG) {
-            Log.d(LOGTAG, "wrote ping header, size = " + String.valueOf(data.length));
-        }
-
-        // payload start
-        int size = writePingPayload(ping, ("{" +
-            "\"ver\":1," +
-            "\"simpleMeasurements\":{" +
-                "\"uptime\":" + String.valueOf(getUptimeMins()) +
-            "}," +
-            "\"info\":{" +
-                "\"reason\":\"android-anr-report\"," +
-                "\"OS\":" + JSONObject.quote(SysInfo.getName()) + "," +
-                "\"version\":\"" + String.valueOf(SysInfo.getVersion()) + "\"," +
-                "\"appID\":" + JSONObject.quote(AppConstants.MOZ_APP_ID) + "," +
-                "\"appVersion\":" + JSONObject.quote(AppConstants.MOZ_APP_VERSION) + "," +
-                "\"appName\":" + JSONObject.quote(AppConstants.MOZ_APP_BASENAME) + "," +
-                "\"appBuildID\":" + JSONObject.quote(AppConstants.MOZ_APP_BUILDID) + "," +
-                "\"appUpdateChannel\":" + JSONObject.quote(AppConstants.MOZ_UPDATE_CHANNEL) + "," +
-                // Technically the platform build ID may be different, but we'll never know
-                "\"platformBuildID\":" + JSONObject.quote(AppConstants.MOZ_APP_BUILDID) + "," +
-                "\"locale\":" + JSONObject.quote(Locales.getLanguageTag(Locale.getDefault())) + "," +
-                "\"cpucount\":" + String.valueOf(SysInfo.getCPUCount()) + "," +
-                "\"memsize\":" + String.valueOf(SysInfo.getMemSize()) + "," +
-                "\"arch\":" + JSONObject.quote(SysInfo.getArchABI()) + "," +
-                "\"kernel_version\":" + JSONObject.quote(SysInfo.getKernelVersion()) + "," +
-                "\"device\":" + JSONObject.quote(SysInfo.getDevice()) + "," +
-                "\"manufacturer\":" + JSONObject.quote(SysInfo.getManufacturer()) + "," +
-                "\"hardware\":" + JSONObject.quote(SysInfo.getHardware()) +
-            "}," +
-            "\"androidANR\":\""));
-        if (DEBUG) {
-            Log.d(LOGTAG, "wrote metadata, size = " + String.valueOf(size));
-        }
-
-        // We are at the start of ANR data
-    }
-
-    // Block is a section of the larger input stream, and we want to find pattern within
-    // the stream. This is straightforward if the entire pattern is within one block;
-    // however, if the pattern spans across two blocks, we have to match both the start of
-    // the pattern in the first block and the end of the pattern in the second block.
-    // * If pattern is found in block, this method returns the index at the end of the
-    //   found pattern, which must always be > 0.
-    // * If pattern is not found, it returns 0.
-    // * If the start of the pattern matches the end of the block, it returns a number
-    //   < 0, which equals the negated value of how many characters in pattern are already
-    //   matched; when processing the next block, this number is passed in through
-    //   prevIndex, and the rest of the characters in pattern are matched against the
-    //   start of this second block. The method returns value > 0 if the rest of the
-    //   characters match, or 0 if they do not.
-    private static int getEndPatternIndex(String block, String pattern, int prevIndex) {
-        if (pattern == null || block.length() < pattern.length()) {
-            // Nothing to do
-            return 0;
-        }
-        if (prevIndex < 0) {
-            // Last block ended with a partial start; now match start of block to rest of pattern
-            if (block.startsWith(pattern.substring(-prevIndex, pattern.length()))) {
-                // Rest of pattern matches; return index at end of pattern
-                return pattern.length() + prevIndex;
-            }
-            // Not a match; continue with normal search
-        }
-        // Did not find pattern in last block; see if entire pattern is inside this block
-        int index = block.indexOf(pattern);
-        if (index >= 0) {
-            // Found pattern; return index at end of the pattern
-            return index + pattern.length();
-        }
-        // Block does not contain the entire pattern, but see if the end of the block
-        // contains the start of pattern. To do that, we see if block ends with the
-        // first n-1 characters of pattern, the first n-2 characters of pattern, etc.
-        for (index = block.length() - pattern.length() + 1; index < block.length(); index++) {
-            // Using index as a start, see if the rest of block contains the start of pattern
-            if (block.charAt(index) == pattern.charAt(0) &&
-                block.endsWith(pattern.substring(0, block.length() - index))) {
-                // Found partial match; return -(number of characters matched),
-                // i.e. -1 for 1 character matched, -2 for 2 characters matched, etc.
-                return index - block.length();
-            }
-        }
-        return 0;
-    }
-
-    // Copy the content of reader to ping;
-    // copying stops when endPattern is found in the input stream
-    private static int fillPingBlock(OutputStream ping,
-                                     Reader reader, String endPattern)
-            throws IOException {
-
-        int total = 0;
-        int endIndex = 0;
-        char [] block = new char[TRACES_BLOCK_SIZE];
-        for (int size = reader.read(block); size >= 0; size = reader.read(block)) {
-            String stringBlock = new String(block, 0, size);
-            endIndex = getEndPatternIndex(stringBlock, endPattern, endIndex);
-            if (endIndex > 0) {
-                // Found end pattern; clip the string
-                stringBlock = stringBlock.substring(0, endIndex);
-            }
-            String quoted = JSONObject.quote(stringBlock);
-            total += writePingPayload(ping, quoted.substring(1, quoted.length() - 1));
-            if (endIndex > 0) {
-                // End pattern already found; return now
-                break;
-            }
-        }
-        return total;
-    }
-
-    private static void fillLogcat(final OutputStream ping) {
-        if (Versions.preJB) {
-            // Logcat retrieval is not supported on pre-JB devices.
-            return;
-        }
-
-        try {
-            // get the last 200 lines of logcat
-            Process proc = (new ProcessBuilder())
-                .command("/system/bin/logcat", "-v", "threadtime", "-t", "200", "-d", "*:D")
-                .redirectErrorStream(true)
-                .start();
-            try {
-                Reader procOut = new InputStreamReader(proc.getInputStream(), TRACES_CHARSET);
-                int size = fillPingBlock(ping, procOut, null);
-                if (DEBUG) {
-                    Log.d(LOGTAG, "wrote logcat, size = " + String.valueOf(size));
-                }
-            } finally {
-                proc.destroy();
-            }
-        } catch (IOException e) {
-            // ignore because logcat is not essential
-            Log.w(LOGTAG, e);
-        }
-    }
-
-    private static void fillPingFooter(OutputStream ping,
-                                       boolean haveNativeStack)
-            throws IOException {
-
-        // We are at the end of ANR data
-
-        int total = writePingPayload(ping, ("\"," +
-                "\"androidLogcat\":\""));
-        fillLogcat(ping);
-
-        if (haveNativeStack) {
-            total += writePingPayload(ping, ("\"," +
-                    "\"androidNativeStack\":"));
-
-            String nativeStack = String.valueOf(getNativeStack());
-            int size = writePingPayload(ping, nativeStack);
-            if (DEBUG) {
-                Log.d(LOGTAG, "wrote native stack, size = " + String.valueOf(size));
-            }
-            total += size + writePingPayload(ping, "}");
-        } else {
-            total += writePingPayload(ping, "\"}");
-        }
-
-        byte [] data = (
-            "}").getBytes(PING_CHARSET);
-        ping.write(data);
-        if (DEBUG) {
-            Log.d(LOGTAG, "wrote ping footer, size = " + String.valueOf(data.length + total));
-        }
-    }
-
-    private static void processTraces(Reader traces, File pingFile) {
-
-        // Only get native stack if Gecko is running.
-        // Also, unwinding is memory intensive, so only unwind if we have enough memory.
-        final boolean haveNativeStack =
-            GeckoThread.isRunning() ?
-            requestNativeStack(/* unwind */ SysInfo.getMemSize() >= 640) : false;
-
-        try {
-            OutputStream ping = new BufferedOutputStream(
-                new FileOutputStream(pingFile), TRACES_BLOCK_SIZE);
-            try {
-                fillPingHeader(ping, pingFile.getName());
-                // Traces file has the format
-                //    ----- pid xxx at xxx -----
-                //    Cmd line: org.mozilla.xxx
-                //    * stack trace *
-                //    ----- end xxx -----
-                //    ----- pid xxx at xxx -----
-                //    Cmd line: com.android.xxx
-                //    * stack trace *
-                //    ...
-                // If we end the stack dump at the first end marker,
-                // only Fennec stacks will be dumped
-                int size = fillPingBlock(ping, traces, "\n----- end");
-                if (DEBUG) {
-                    Log.d(LOGTAG, "wrote traces, size = " + String.valueOf(size));
-                }
-                fillPingFooter(ping, haveNativeStack);
-                if (DEBUG) {
-                    Log.d(LOGTAG, "finished creating ping file");
-                }
-                return;
-            } finally {
-                ping.close();
-                if (haveNativeStack) {
-                    releaseNativeStack();
-                }
-            }
-        } catch (IOException e) {
-            Log.w(LOGTAG, e);
-        }
-        // exception; delete ping file
-        if (pingFile.exists()) {
-            pingFile.delete();
-        }
-    }
-
-    private static void processTraces(File tracesFile, File pingFile) {
-        try {
-            Reader traces = new InputStreamReader(
-                new FileInputStream(tracesFile), TRACES_CHARSET);
-            try {
-                processTraces(traces, pingFile);
-            } finally {
-                traces.close();
-            }
-        } catch (IOException e) {
-            Log.w(LOGTAG, e);
-        }
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if (mPendingANR) {
-            // we already processed an ANR without getting unstuck; skip this one
-            if (DEBUG) {
-                Log.d(LOGTAG, "skipping duplicate ANR");
-            }
-            return;
-        }
-        if (ThreadUtils.getUiHandler() != null) {
-            mPendingANR = true;
-            // detect when the main thread gets unstuck
-            ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    // okay to reset mPendingANR on main thread
-                    mPendingANR = false;
-                    if (DEBUG) {
-                        Log.d(LOGTAG, "yay we got unstuck!");
-                    }
-                }
-            });
-        }
-        if (DEBUG) {
-            Log.d(LOGTAG, "receiving " + String.valueOf(intent));
-        }
-        if (!ANR_ACTION.equals(intent.getAction())) {
-            return;
-        }
-
-        // make sure we have a good save location first
-        File pingFile = getPingFile();
-        if (DEBUG) {
-            Log.d(LOGTAG, "using ping file: " + String.valueOf(pingFile));
-        }
-        if (pingFile == null) {
-            return;
-        }
-
-        File tracesFile = getTracesFile();
-        if (DEBUG) {
-            Log.d(LOGTAG, "using traces file: " + String.valueOf(tracesFile));
-        }
-        if (tracesFile == null) {
-            return;
-        }
-
-        // We get ANR intents from all ANRs in the system, but we only want Gecko ANRs
-        if (!isGeckoTraces(context.getPackageName(), tracesFile)) {
-            if (DEBUG) {
-                Log.d(LOGTAG, "traces is not Gecko ANR");
-            }
-            return;
-        }
-        Log.i(LOGTAG, "processing Gecko ANR");
-        processTraces(tracesFile, pingFile);
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/AlarmReceiver.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.annotation.WrapForJNI;
-
-import android.app.IntentService;
-import android.content.Context;
-import android.content.Intent;
-import android.content.BroadcastReceiver;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.util.Log;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-public class AlarmReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        PowerManager powerManager = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
-        final WakeLock wakeLock = powerManager.newWakeLock(PowerManager.SCREEN_DIM_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "GeckoAlarm");
-        wakeLock.acquire();
-
-        AlarmReceiver.notifyAlarmFired();
-        TimerTask releaseLockTask = new TimerTask() {
-            @Override
-            public void run() {
-                wakeLock.release();
-            }
-        };
-        Timer timer = new Timer();
-        // 5 seconds ought to be enough for anybody
-        timer.schedule(releaseLockTask, 5 * 1000);
-    }
-
-    @WrapForJNI
-    private static native void notifyAlarmFired();
-}

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/AndroidGamepadManager.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.mozilla.gecko.AppConstants.Versions;
-import org.mozilla.gecko.util.GamepadUtils;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.content.Context;
-import android.hardware.input.InputManager;
-import android.util.SparseArray;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-
-public class AndroidGamepadManager {
-    // This is completely arbitrary.
-    private static final float TRIGGER_PRESSED_THRESHOLD = 0.25f;
-    private static final long POLL_TIMER_PERIOD = 1000; // milliseconds
-
-    private static enum Axis {
-        X(MotionEvent.AXIS_X),
-        Y(MotionEvent.AXIS_Y),
-        Z(MotionEvent.AXIS_Z),
-        RZ(MotionEvent.AXIS_RZ);
-
-        public final int axis;
-
-        private Axis(int axis) {
-            this.axis = axis;
-        }
-    }
-
-    // A list of gamepad button mappings. Axes are determined at
-    // runtime, as they vary by Android version.
-    private static enum Trigger {
-        Left(6),
-        Right(7);
-
-        public final int button;
-
-        private Trigger(int button) {
-            this.button = button;
-        }
-    }
-
-    private static final int FIRST_DPAD_BUTTON = 12;
-    // A list of axis number, gamepad button mappings for negative, positive.
-    // Button mappings are added to FIRST_DPAD_BUTTON.
-    private static enum DpadAxis {
-        UpDown(MotionEvent.AXIS_HAT_Y, 0, 1),
-        LeftRight(MotionEvent.AXIS_HAT_X, 2, 3);
-
-        public final int axis;
-        public final int negativeButton;
-        public final int positiveButton;
-
-        private DpadAxis(int axis, int negativeButton, int positiveButton) {
-            this.axis = axis;
-            this.negativeButton = negativeButton;
-            this.positiveButton = positiveButton;
-        }
-    }
-
-    private static enum Button {
-        A(KeyEvent.KEYCODE_BUTTON_A),
-        B(KeyEvent.KEYCODE_BUTTON_B),
-        X(KeyEvent.KEYCODE_BUTTON_X),
-        Y(KeyEvent.KEYCODE_BUTTON_Y),
-        L1(KeyEvent.KEYCODE_BUTTON_L1),
-        R1(KeyEvent.KEYCODE_BUTTON_R1),
-        L2(KeyEvent.KEYCODE_BUTTON_L2),
-        R2(KeyEvent.KEYCODE_BUTTON_R2),
-        SELECT(KeyEvent.KEYCODE_BUTTON_SELECT),
-        START(KeyEvent.KEYCODE_BUTTON_START),
-        THUMBL(KeyEvent.KEYCODE_BUTTON_THUMBL),
-        THUMBR(KeyEvent.KEYCODE_BUTTON_THUMBR),
-        DPAD_UP(KeyEvent.KEYCODE_DPAD_UP),
-        DPAD_DOWN(KeyEvent.KEYCODE_DPAD_DOWN),
-        DPAD_LEFT(KeyEvent.KEYCODE_DPAD_LEFT),
-        DPAD_RIGHT(KeyEvent.KEYCODE_DPAD_RIGHT);
-
-        public final int button;
-
-        private Button(int button) {
-            this.button = button;
-        }
-    }
-
-    private static class Gamepad {
-        // ID from GamepadService
-        public int id;
-        // Retain axis state so we can determine changes.
-        public float axes[];
-        public boolean dpad[];
-        public int triggerAxes[];
-        public float triggers[];
-
-        public Gamepad(int serviceId, int deviceId) {
-            id = serviceId;
-            axes = new float[Axis.values().length];
-            dpad = new boolean[4];
-            triggers = new float[2];
-
-            InputDevice device = InputDevice.getDevice(deviceId);
-            if (device != null) {
-                // LTRIGGER/RTRIGGER don't seem to be exposed on older
-                // versions of Android.
-                if (device.getMotionRange(MotionEvent.AXIS_LTRIGGER) != null && device.getMotionRange(MotionEvent.AXIS_RTRIGGER) != null) {
-                    triggerAxes = new int[]{MotionEvent.AXIS_LTRIGGER,
-                                            MotionEvent.AXIS_RTRIGGER};
-                } else if (device.getMotionRange(MotionEvent.AXIS_BRAKE) != null && device.getMotionRange(MotionEvent.AXIS_GAS) != null) {
-                    triggerAxes = new int[]{MotionEvent.AXIS_BRAKE,
-                                            MotionEvent.AXIS_GAS};
-                } else {
-                    triggerAxes = null;
-                }
-            }
-        }
-    }
-
-    private static boolean sStarted;
-    private static final SparseArray<Gamepad> sGamepads = new SparseArray<>();
-    private static final SparseArray<List<KeyEvent>> sPendingGamepads = new SparseArray<>();
-    private static InputManager.InputDeviceListener sListener;
-    private static Timer sPollTimer;
-
-    private AndroidGamepadManager() {
-    }
-
-    public static void startup() {
-        ThreadUtils.assertOnUiThread();
-        if (!sStarted) {
-            scanForGamepads();
-            addDeviceListener();
-            sStarted = true;
-        }
-    }
-
-    public static void shutdown() {
-        ThreadUtils.assertOnUiThread();
-        if (sStarted) {
-            removeDeviceListener();
-            sPendingGamepads.clear();
-            sGamepads.clear();
-            sStarted = false;
-        }
-    }
-
-    public static void gamepadAdded(int deviceId, int serviceId) {
-        ThreadUtils.assertOnUiThread();
-        if (!sStarted) {
-            return;
-        }
-
-        final List<KeyEvent> pending = sPendingGamepads.get(deviceId);
-        if (pending == null) {
-            removeGamepad(deviceId);
-            return;
-        }
-
-        sPendingGamepads.remove(deviceId);
-        sGamepads.put(deviceId, new Gamepad(serviceId, deviceId));
-        // Handle queued KeyEvents
-        for (KeyEvent ev : pending) {
-            handleKeyEvent(ev);
-        }
-    }
-
-    private static float deadZone(MotionEvent ev, int axis) {
-        if (GamepadUtils.isValueInDeadZone(ev, axis)) {
-            return 0.0f;
-        }
-        return ev.getAxisValue(axis);
-    }
-
-    private static void mapDpadAxis(Gamepad gamepad,
-                                    boolean pressed,
-                                    float value,
-                                    int which) {
-        if (pressed != gamepad.dpad[which]) {
-            gamepad.dpad[which] = pressed;
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createGamepadButtonEvent(gamepad.id, FIRST_DPAD_BUTTON + which, pressed, Math.abs(value)));
-        }
-    }
-
-    public static boolean handleMotionEvent(MotionEvent ev) {
-        ThreadUtils.assertOnUiThread();
-        if (!sStarted) {
-            return false;
-        }
-
-        final Gamepad gamepad = sGamepads.get(ev.getDeviceId());
-        if (gamepad == null) {
-            // Not a device we care about.
-            return false;
-        }
-
-        // First check the analog stick axes
-        boolean[] valid = new boolean[Axis.values().length];
-        float[] axes = new float[Axis.values().length];
-        boolean anyValidAxes = false;
-        for (Axis axis : Axis.values()) {
-            float value = deadZone(ev, axis.axis);
-            int i = axis.ordinal();
-            if (value != gamepad.axes[i]) {
-                axes[i] = value;
-                gamepad.axes[i] = value;
-                valid[i] = true;
-                anyValidAxes = true;
-            }
-        }
-        if (anyValidAxes) {
-            // Send an axismove event.
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createGamepadAxisEvent(gamepad.id, valid, axes));
-        }
-
-        // Map triggers to buttons.
-        if (gamepad.triggerAxes != null) {
-            for (Trigger trigger : Trigger.values()) {
-                int i = trigger.ordinal();
-                int axis = gamepad.triggerAxes[i];
-                float value = deadZone(ev, axis);
-                if (value != gamepad.triggers[i]) {
-                    gamepad.triggers[i] = value;
-                    boolean pressed = value > TRIGGER_PRESSED_THRESHOLD;
-                    GeckoAppShell.sendEventToGecko(GeckoEvent.createGamepadButtonEvent(gamepad.id, trigger.button, pressed, value));
-                }
-            }
-        }
-        // Map d-pad to buttons.
-        for (DpadAxis dpadaxis : DpadAxis.values()) {
-            float value = deadZone(ev, dpadaxis.axis);
-            mapDpadAxis(gamepad, value < 0.0f, value, dpadaxis.negativeButton);
-            mapDpadAxis(gamepad, value > 0.0f, value, dpadaxis.positiveButton);
-        }
-        return true;
-    }
-
-    public static boolean handleKeyEvent(KeyEvent ev) {
-        ThreadUtils.assertOnUiThread();
-        if (!sStarted) {
-            return false;
-        }
-
-        int deviceId = ev.getDeviceId();
-        final List<KeyEvent> pendingGamepad = sPendingGamepads.get(deviceId);
-        if (pendingGamepad != null) {
-            // Queue up key events for pending devices.
-            pendingGamepad.add(ev);
-            return true;
-        }
-
-        if (sGamepads.get(deviceId) == null) {
-            InputDevice device = ev.getDevice();
-            if (device != null &&
-                (device.getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
-                // This is a gamepad we haven't seen yet.
-                addGamepad(device);
-                sPendingGamepads.get(deviceId).add(ev);
-                return true;
-            }
-            // Not a device we care about.
-            return false;
-        }
-
-        int key = -1;
-        for (Button button : Button.values()) {
-            if (button.button == ev.getKeyCode()) {
-                key = button.ordinal();
-                break;
-            }
-        }
-        if (key == -1) {
-            // Not a key we know how to handle.
-            return false;
-        }
-        if (ev.getRepeatCount() > 0) {
-            // We would handle this key, but we're not interested in
-            // repeats. Eat it.
-            return true;
-        }
-
-        Gamepad gamepad = sGamepads.get(deviceId);
-        boolean pressed = ev.getAction() == KeyEvent.ACTION_DOWN;
-        GeckoAppShell.sendEventToGecko(GeckoEvent.createGamepadButtonEvent(gamepad.id, key, pressed, pressed ? 1.0f : 0.0f));
-        return true;
-    }
-
-    private static void scanForGamepads() {
-        int[] deviceIds = InputDevice.getDeviceIds();
-        if (deviceIds == null) {
-            return;
-        }
-        for (int i = 0; i < deviceIds.length; i++) {
-            InputDevice device = InputDevice.getDevice(deviceIds[i]);
-            if (device == null) {
-                continue;
-            }
-            if ((device.getSources() & InputDevice.SOURCE_GAMEPAD) != InputDevice.SOURCE_GAMEPAD) {
-                continue;
-            }
-            addGamepad(device);
-        }
-    }
-
-    private static void addGamepad(InputDevice device) {
-        //TODO: when we're using a newer SDK version, use these.
-        //if (Build.VERSION.SDK_INT >= 12) {
-        //int vid = device.getVendorId();
-        //int pid = device.getProductId();
-        //}
-        sPendingGamepads.put(device.getId(), new ArrayList<KeyEvent>());
-        GeckoAppShell.sendEventToGecko(GeckoEvent.createGamepadAddRemoveEvent(device.getId(), true));
-    }
-
-    private static void removeGamepad(int deviceId) {
-        Gamepad gamepad = sGamepads.get(deviceId);
-        GeckoAppShell.sendEventToGecko(GeckoEvent.createGamepadAddRemoveEvent(gamepad.id, false));
-        sGamepads.remove(deviceId);
-    }
-
-    private static void addDeviceListener() {
-        if (Versions.preJB) {
-            // Poll known gamepads to see if they've disappeared.
-            sPollTimer = new Timer();
-            sPollTimer.scheduleAtFixedRate(new TimerTask() {
-                    @Override
-                    public void run() {
-                        for (int i = 0; i < sGamepads.size(); ++i) {
-                            final int deviceId = sGamepads.keyAt(i);
-                            if (InputDevice.getDevice(deviceId) == null) {
-                                removeGamepad(deviceId);
-                            }
-                        }
-                    }
-                }, POLL_TIMER_PERIOD, POLL_TIMER_PERIOD);
-            return;
-        }
-        sListener = new InputManager.InputDeviceListener() {
-                @Override
-                public void onInputDeviceAdded(int deviceId) {
-                    InputDevice device = InputDevice.getDevice(deviceId);
-                    if (device == null) {
-                        return;
-                    }
-                    if ((device.getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
-                        addGamepad(device);
-                    }
-                }
-
-                @Override
-                public void onInputDeviceRemoved(int deviceId) {
-                    if (sPendingGamepads.get(deviceId) != null) {
-                        // Got removed before Gecko's ack reached us.
-                        // gamepadAdded will deal with it.
-                        sPendingGamepads.remove(deviceId);
-                        return;
-                    }
-                    if (sGamepads.get(deviceId) != null) {
-                        removeGamepad(deviceId);
-                    }
-                }
-
-                @Override
-                public void onInputDeviceChanged(int deviceId) {
-                }
-            };
-        ((InputManager)GeckoAppShell.getContext().getSystemService(Context.INPUT_SERVICE)).registerInputDeviceListener(sListener, ThreadUtils.getUiHandler());
-    }
-
-    private static void removeDeviceListener() {
-        if (Versions.preJB) {
-            if (sPollTimer != null) {
-                sPollTimer.cancel();
-                sPollTimer = null;
-            }
-            return;
-        }
-        ((InputManager)GeckoAppShell.getContext().getSystemService(Context.INPUT_SERVICE)).unregisterInputDeviceListener(sListener);
-        sListener = null;
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BaseGeckoInterface.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.util.ActivityUtils;
-import org.mozilla.gecko.util.HardwareUtils;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.RectF;
-import android.hardware.SensorEventListener;
-import android.location.LocationListener;
-import android.view.View;
-import android.widget.AbsoluteLayout;
-
-public class BaseGeckoInterface implements GeckoAppShell.GeckoInterface {
-    // Bug 908744: Implement GeckoEventListener
-    // Bug 908752: Implement SensorEventListener
-    // Bug 908755: Implement LocationListener
-    // Bug 908756: Implement Tabs.OnTabsChangedListener
-    // Bug 908760: Implement GeckoEventResponder
-
-    private final Context mContext;
-    private GeckoProfile mProfile;
-
-    public BaseGeckoInterface(Context context) {
-        mContext = context;
-    }
-
-    @Override
-    public GeckoProfile getProfile() {
-        // Fall back to default profile if we didn't load a specific one
-        if (mProfile == null) {
-            mProfile = GeckoProfile.get(mContext);
-        }
-        return mProfile;
-    }
-
-    @Override
-    public Activity getActivity() {
-        return (Activity)mContext;
-    }
-
-    @Override
-    public String getDefaultUAString() {
-        return HardwareUtils.isTablet() ? AppConstants.USER_AGENT_FENNEC_TABLET :
-                                          AppConstants.USER_AGENT_FENNEC_MOBILE;
-    }
-
-    // Bug 908772: Implement this
-    @Override
-    public LocationListener getLocationListener() {
-        return null;
-    }
-
-    // Bug 908773: Implement this
-    @Override
-    public SensorEventListener getSensorEventListener() {
-        return null;
-    }
-
-    // Bug 908775: Implement this
-    @Override
-    public void doRestart() {}
-
-    @Override
-    public void setFullScreen(final boolean fullscreen) {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                ActivityUtils.setFullScreen(getActivity(), fullscreen);
-            }
-        });
-    }
-
-    // Bug 908779: Implement this
-    @Override
-    public void addPluginView(final View view, final RectF rect, final boolean isFullScreen) {}
-
-    // Bug 908781: Implement this
-    @Override
-    public void removePluginView(final View view, final boolean isFullScreen) {}
-
-    // Bug 908783: Implement this
-    @Override
-    public void enableCameraView() {}
-
-    // Bug 908785: Implement this
-    @Override
-    public void disableCameraView() {}
-
-    // Bug 908786: Implement this
-    @Override
-    public void addAppStateListener(GeckoAppShell.AppStateListener listener) {}
-
-    // Bug 908787: Implement this
-    @Override
-    public void removeAppStateListener(GeckoAppShell.AppStateListener listener) {}
-
-    // Bug 908788: Implement this
-    @Override
-    public View getCameraView() {
-        return null;
-    }
-
-    // Bug 908789: Implement this
-    @Override
-    public void notifyWakeLockChanged(String topic, String state) {}
-
-    // Bug 908790: Implement this
-    @Override
-    public void onInputMethodChanged(String inputMethod) {}
-
-    @Override
-    public boolean areTabsShown() {
-        return false;
-    }
-
-    // Bug 908791: Implement this
-    @Override
-    public AbsoluteLayout getPluginContainer() {
-        return null;
-    }
-
-    @Override
-    public void notifyCheckUpdateResult(String result) {
-        GeckoAppShell.notifyObservers("Update:CheckResult", result);
-    }
-
-    // Bug 908792: Implement this
-    @Override
-    public void invalidateOptionsMenu() {}
-
-    @Override
-    public void createShortcut(String title, String URI) {
-        // By default, do nothing.
-    }
-
-    @Override
-    public void checkUriVisited(String uri) {
-        // By default, no URIs are considered visited.
-    }
-
-    @Override
-    public void markUriVisited(final String uri) {
-        // By default, no URIs are marked as visited.
-    }
-
-    @Override
-    public void setUriTitle(final String uri, final String title) {
-        // By default, no titles are associated with URIs.
-    }
-
-    @Override
-    public void setAccessibilityEnabled(boolean enabled) {
-        // By default, take no action when accessibility is toggled on or off.
-    }
-
-    @Override
-    public boolean openUriExternal(String targetURI, String mimeType, String packageName, String className, String action, String title) {
-        // By default, never open external URIs.
-        return false;
-    }
-
-    @Override
-    public String[] getHandlersForMimeType(String mimeType, String action) {
-        // By default, offer no handlers for any MIME type.
-        return new String[] {};
-    }
-
-    @Override
-    public String[] getHandlersForURL(String url, String action) {
-        // By default, offer no handlers for any URL.
-        return new String[] {};
-    }
-
-    @Override
-    public String getDefaultChromeURI() {
-        // By default, use the GeckoView-specific chrome URI.
-        return "chrome://browser/content/geckoview.xul";
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/ContextGetter.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-public interface ContextGetter {
-    Context getContext();
-    SharedPreferences getSharedPreferences();
-}
-

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/CrashHandler.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.UUID;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Process;
-import android.util.Log;
-
-public class CrashHandler implements Thread.UncaughtExceptionHandler {
-
-    private static final String LOGTAG = "GeckoCrashHandler";
-    private static final Thread MAIN_THREAD = Thread.currentThread();
-    private static final String DEFAULT_SERVER_URL =
-        "https://crash-reports.mozilla.com/submit?id=%1$s&version=%2$s&buildid=%3$s";
-
-    // Context for getting device information
-    protected final Context appContext;
-    // Thread that this handler applies to, or null for a global handler
-    protected final Thread handlerThread;
-    protected final Thread.UncaughtExceptionHandler systemUncaughtHandler;
-
-    protected boolean crashing;
-    protected boolean unregistered;
-
-    /**
-     * Get the root exception from the 'cause' chain of an exception.
-     *
-     * @param exc An exception
-     * @return The root exception
-     */
-    public static Throwable getRootException(Throwable exc) {
-        for (Throwable cause = exc; cause != null; cause = cause.getCause()) {
-            exc = cause;
-        }
-        return exc;
-    }
-
-    /**
-     * Get the standard stack trace string of an exception.
-     *
-     * @param exc An exception
-     * @return The exception stack trace.
-     */
-    public static String getExceptionStackTrace(final Throwable exc) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        exc.printStackTrace(pw);
-        pw.flush();
-        return sw.toString();
-    }
-
-    /**
-     * Terminate the current process.
-     */
-    public static void terminateProcess() {
-        Process.killProcess(Process.myPid());
-    }
-
-    /**
-     * Create and register a CrashHandler for all threads and thread groups.
-     */
-    public CrashHandler() {
-        this((Context) null);
-    }
-
-    /**
-     * Create and register a CrashHandler for all threads and thread groups.
-     *
-     * @param appContext A Context for retrieving application information.
-     */
-    public CrashHandler(final Context appContext) {
-        this.appContext = appContext;
-        this.handlerThread = null;
-        this.systemUncaughtHandler = Thread.getDefaultUncaughtExceptionHandler();
-        Thread.setDefaultUncaughtExceptionHandler(this);
-    }
-
-    /**
-     * Create and register a CrashHandler for a particular thread.
-     *
-     * @param thread A thread to register the CrashHandler
-     */
-    public CrashHandler(final Thread thread) {
-        this(thread, null);
-    }
-
-    /**
-     * Create and register a CrashHandler for a particular thread.
-     *
-     * @param thread A thread to register the CrashHandler
-     * @param appContext A Context for retrieving application information.
-     */
-    public CrashHandler(final Thread thread, final Context appContext) {
-        this.appContext = appContext;
-        this.handlerThread = thread;
-        this.systemUncaughtHandler = thread.getUncaughtExceptionHandler();
-        thread.setUncaughtExceptionHandler(this);
-    }
-
-    /**
-     * Unregister this CrashHandler for exception handling.
-     */
-    public void unregister() {
-        unregistered = true;
-
-        // Restore the previous handler if we are still the topmost handler.
-        // If not, we are part of a chain of handlers, and we cannot just restore the previous
-        // handler, because that would replace whatever handler that's above us in the chain.
-
-        if (handlerThread != null) {
-            if (handlerThread.getUncaughtExceptionHandler() == this) {
-                handlerThread.setUncaughtExceptionHandler(systemUncaughtHandler);
-            }
-        } else {
-            if (Thread.getDefaultUncaughtExceptionHandler() == this) {
-                Thread.setDefaultUncaughtExceptionHandler(systemUncaughtHandler);
-            }
-        }
-    }
-
-    /**
-     * Record an exception stack in logs.
-     *
-     * @param thread The exception thread
-     * @param exc An exception
-     */
-    public static void logException(final Thread thread, final Throwable exc) {
-        try {
-            Log.e(LOGTAG, ">>> REPORTING UNCAUGHT EXCEPTION FROM THREAD "
-                          + thread.getId() + " (\"" + thread.getName() + "\")", exc);
-
-            if (MAIN_THREAD != thread) {
-                Log.e(LOGTAG, "Main thread (" + MAIN_THREAD.getId() + ") stack:");
-                for (StackTraceElement ste : MAIN_THREAD.getStackTrace()) {
-                    Log.e(LOGTAG, "    " + ste.toString());
-                }
-            }
-        } catch (final Throwable e) {
-            // If something throws here, we want to continue to report the exception,
-            // so we catch all exceptions and ignore them.
-        }
-    }
-
-    private static long getCrashTime() {
-        return System.currentTimeMillis() / 1000;
-    }
-
-    private static long getStartupTime() {
-        // Process start time is also the proc file modified time.
-        final long uptimeMins = (new File("/proc/self/cmdline")).lastModified();
-        if (uptimeMins == 0L) {
-            return getCrashTime();
-        }
-        return uptimeMins / 1000;
-    }
-
-    private static String getJavaPackageName() {
-        return CrashHandler.class.getPackage().getName();
-    }
-
-    protected String getAppPackageName() {
-        final Context context = getAppContext();
-
-        if (context != null) {
-            return context.getPackageName();
-        }
-
-        try {
-            // Package name is also the command line string in most cases.
-            final FileReader reader = new FileReader("/proc/self/cmdline");
-            final char[] buffer = new char[64];
-            try {
-                if (reader.read(buffer) > 0) {
-                    // cmdline is delimited by '\0', and we want the first token.
-                    final int nul = Arrays.asList(buffer).indexOf('\0');
-                    return (new String(buffer, 0, nul < 0 ? buffer.length : nul)).trim();
-                }
-            } finally {
-                reader.close();
-            }
-
-        } catch (final IOException e) {
-            Log.i(LOGTAG, "Error reading package name", e);
-        }
-
-        // Fallback to using CrashHandler's package name.
-        return getJavaPackageName();
-    }
-
-    protected Context getAppContext() {
-        return appContext;
-    }
-
-    /**
-     * Get the crash "extras" to be reported.
-     *
-     * @param thread The exception thread
-     * @param exc An exception
-     * @return "Extras" in the from of a Bundle
-     */
-    protected Bundle getCrashExtras(final Thread thread, final Throwable exc) {
-        final Context context = getAppContext();
-        final Bundle extras = new Bundle();
-        final String pkgName = getAppPackageName();
-
-        extras.putString("ProductName", pkgName);
-        extras.putLong("CrashTime", getCrashTime());
-        extras.putLong("StartupTime", getStartupTime());
-
-        if (context != null) {
-            final PackageManager pkgMgr = context.getPackageManager();
-            try {
-                final PackageInfo pkgInfo = pkgMgr.getPackageInfo(pkgName, 0);
-                extras.putString("Version", pkgInfo.versionName);
-                extras.putInt("BuildID", pkgInfo.versionCode);
-                extras.putLong("InstallTime", pkgInfo.lastUpdateTime / 1000);
-            } catch (final PackageManager.NameNotFoundException e) {
-                Log.i(LOGTAG, "Error getting package info", e);
-            }
-        }
-
-        extras.putString("JavaStackTrace", getExceptionStackTrace(exc));
-        return extras;
-    }
-
-    /**
-     * Get the crash minidump content to be reported.
-     *
-     * @param thread The exception thread
-     * @param exc An exception
-     * @return Minidump content
-     */
-    protected byte[] getCrashDump(final Thread thread, final Throwable exc) {
-        return new byte[0]; // No minidump.
-    }
-
-    protected static String normalizeUrlString(final String str) {
-        if (str == null) {
-            return "";
-        }
-        return Uri.encode(str);
-    }
-
-    /**
-     * Get the server URL to send the crash report to.
-     *
-     * @param extras The crash extras Bundle
-     */
-    protected String getServerUrl(final Bundle extras) {
-        return String.format(DEFAULT_SERVER_URL,
-            normalizeUrlString(extras.getString("ProductID")),
-            normalizeUrlString(extras.getString("Version")),
-            normalizeUrlString(extras.getString("BuildID")));
-    }
-
-    /**
-     * Launch the crash reporter activity that sends the crash report to the server.
-     *
-     * @param dumpFile Path for the minidump file
-     * @param extraFile Path for the crash extra file
-     * @return Whether the crash reporter was successfully launched
-     */
-    protected boolean launchCrashReporter(final String dumpFile, final String extraFile) {
-        try {
-            final Context context = getAppContext();
-            final String javaPkg = getJavaPackageName();
-            final String pkg = getAppPackageName();
-            final String component = javaPkg + ".CrashReporter";
-            final String action = javaPkg + ".reportCrash";
-            final ProcessBuilder pb;
-
-            if (context != null) {
-                final Intent intent = new Intent(action);
-                intent.setComponent(new ComponentName(pkg, component));
-                intent.putExtra("minidumpPath", dumpFile);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intent);
-                return true;
-            }
-
-            // Avoid AppConstants dependency for SDK version constants,
-            // because CrashHandler could be used outside of Fennec code.
-            if (Build.VERSION.SDK_INT < 17) {
-                pb = new ProcessBuilder(
-                    "/system/bin/am", "start",
-                    "-a", action,
-                    "-n", pkg + '/' + component,
-                    "--es", "minidumpPath", dumpFile);
-            } else {
-                pb = new ProcessBuilder(
-                    "/system/bin/am", "start",
-                    "--user", /* USER_CURRENT_OR_SELF */ "-3",
-                    "-a", action,
-                    "-n", pkg + '/' + component,
-                    "--es", "minidumpPath", dumpFile);
-            }
-
-            pb.start().waitFor();
-
-        } catch (final IOException e) {
-            Log.e(LOGTAG, "Error launching crash reporter", e);
-            return false;
-
-        } catch (final InterruptedException e) {
-            Log.i(LOGTAG, "Interrupted while waiting to launch crash reporter", e);
-            // Fall-through
-        }
-        return true;
-    }
-
-    /**
-     * Report an exception to Socorro.
-     *
-     * @param thread The exception thread
-     * @param exc An exception
-     * @return Whether the exception was successfully reported
-     */
-    protected boolean reportException(final Thread thread, final Throwable exc) {
-        final Context context = getAppContext();
-        final String id = UUID.randomUUID().toString();
-
-        // Use the cache directory under the app directory to store crash files.
-        final File dir;
-        if (context != null) {
-            dir = context.getCacheDir();
-        } else {
-            dir = new File("/data/data/" + getAppPackageName() + "/cache");
-        }
-
-        dir.mkdirs();
-        if (!dir.exists()) {
-            return false;
-        }
-
-        final File dmpFile = new File(dir, id + ".dmp");
-        final File extraFile = new File(dir, id + ".extra");
-
-        try {
-            // Write out minidump file as binary.
-
-            final byte[] minidump = getCrashDump(thread, exc);
-            final FileOutputStream dmpStream = new FileOutputStream(dmpFile);
-            try {
-                dmpStream.write(minidump);
-            } finally {
-                dmpStream.close();
-            }
-
-        } catch (final IOException e) {
-            Log.e(LOGTAG, "Error writing minidump file", e);
-            return false;
-        }
-
-        try {
-            // Write out crash extra file as text.
-
-            final Bundle extras = getCrashExtras(thread, exc);
-            final String url = getServerUrl(extras);
-            extras.putString("ServerURL", url);
-
-            final BufferedWriter extraWriter = new BufferedWriter(new FileWriter(extraFile));
-            try {
-                for (String key : extras.keySet()) {
-                    // Each extra line is in the format, key=value, with newlines escaped.
-                    extraWriter.write(key);
-                    extraWriter.write('=');
-                    extraWriter.write(String.valueOf(extras.get(key)).replace("\n", "\\n"));
-                    extraWriter.write('\n');
-                }
-            } finally {
-                extraWriter.close();
-            }
-
-        } catch (final IOException e) {
-            Log.e(LOGTAG, "Error writing extra file", e);
-            return false;
-        }
-
-        return launchCrashReporter(dmpFile.getAbsolutePath(), extraFile.getAbsolutePath());
-    }
-
-    /**
-     * Implements the default behavior for handling uncaught exceptions.
-     *
-     * @param thread The exception thread
-     * @param exc An uncaught exception
-     */
-    @Override
-    public void uncaughtException(Thread thread, Throwable exc) {
-        if (this.crashing) {
-            // Prevent possible infinite recusions.
-            return;
-        }
-
-        if (thread == null) {
-            // Gecko may pass in null for thread to denote the current thread.
-            thread = Thread.currentThread();
-        }
-
-        try {
-            if (!this.unregistered) {
-                // Only process crash ourselves if we have not been unregistered.
-
-                this.crashing = true;
-                exc = getRootException(exc);
-                logException(thread, exc);
-
-                if (reportException(thread, exc)) {
-                    // Reporting succeeded; we can terminate our process now.
-                    return;
-                }
-            }
-
-            if (systemUncaughtHandler != null) {
-                // Follow the chain of uncaught handlers.
-                systemUncaughtHandler.uncaughtException(thread, exc);
-            }
-        } finally {
-            terminateProcess();
-        }
-    }
-
-    public static CrashHandler createDefaultCrashHandler(final Context context) {
-        return new CrashHandler(context) {
-            @Override
-            protected Bundle getCrashExtras(final Thread thread, final Throwable exc) {
-                final Bundle extras = super.getCrashExtras(thread, exc);
-
-                extras.putString("ProductName", AppConstants.MOZ_APP_BASENAME);
-                extras.putString("ProductID", AppConstants.MOZ_APP_ID);
-                extras.putString("Version", AppConstants.MOZ_APP_VERSION);
-                extras.putString("BuildID", AppConstants.MOZ_APP_BUILDID);
-                extras.putString("Vendor", AppConstants.MOZ_APP_VENDOR);
-                extras.putString("ReleaseChannel", AppConstants.MOZ_UPDATE_CHANNEL);
-                return extras;
-            }
-
-            @Override
-            public boolean reportException(final Thread thread, final Throwable exc) {
-                if (AppConstants.MOZ_CRASHREPORTER && AppConstants.MOZILLA_OFFICIAL) {
-                    // Only use Java crash reporter if enabled on official build.
-                    return super.reportException(thread, exc);
-                }
-                return false;
-            }
-        };
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/EventDispatcher.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.mozilla.gecko.annotation.RobocopTarget;
-import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.GeckoEvent;
-import org.mozilla.gecko.util.BundleEventListener;
-import org.mozilla.gecko.util.EventCallback;
-import org.mozilla.gecko.util.GeckoEventListener;
-import org.mozilla.gecko.util.NativeEventListener;
-import org.mozilla.gecko.util.NativeJSContainer;
-import org.mozilla.gecko.util.NativeJSObject;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-@RobocopTarget
-public final class EventDispatcher {
-    private static final String LOGTAG = "GeckoEventDispatcher";
-    private static final String GUID = "__guid__";
-    private static final String STATUS_ERROR = "error";
-    private static final String STATUS_SUCCESS = "success";
-
-    private static final EventDispatcher INSTANCE = new EventDispatcher();
-
-    /**
-     * The capacity of a HashMap is rounded up to the next power-of-2. Every time the size
-     * of the map goes beyond 75% of the capacity, the map is rehashed. Therefore, to
-     * empirically determine the initial capacity that avoids rehashing, we need to
-     * determine the initial size, divide it by 75%, and round up to the next power-of-2.
-     */
-    private static final int DEFAULT_GECKO_NATIVE_EVENTS_COUNT = 0; // Default for HashMap
-    private static final int DEFAULT_GECKO_JSON_EVENTS_COUNT = 256; // Empirically measured
-    private static final int DEFAULT_UI_EVENTS_COUNT = 0; // Default for HashMap
-    private static final int DEFAULT_BACKGROUND_EVENTS_COUNT = 0; // Default for HashMap
-
-    private final Map<String, List<NativeEventListener>> mGeckoThreadNativeListeners =
-        new HashMap<String, List<NativeEventListener>>(DEFAULT_GECKO_NATIVE_EVENTS_COUNT);
-    private final Map<String, List<GeckoEventListener>> mGeckoThreadJSONListeners =
-        new HashMap<String, List<GeckoEventListener>>(DEFAULT_GECKO_JSON_EVENTS_COUNT);
-    private final Map<String, List<BundleEventListener>> mUiThreadListeners =
-        new HashMap<String, List<BundleEventListener>>(DEFAULT_UI_EVENTS_COUNT);
-    private final Map<String, List<BundleEventListener>> mBackgroundThreadListeners =
-        new HashMap<String, List<BundleEventListener>>(DEFAULT_BACKGROUND_EVENTS_COUNT);
-
-    public static EventDispatcher getInstance() {
-        return INSTANCE;
-    }
-
-    private EventDispatcher() {
-    }
-
-    private <T> void registerListener(final Class<?> listType,
-                                      final Map<String, List<T>> listenersMap,
-                                      final T listener,
-                                      final String[] events) {
-        try {
-            synchronized (listenersMap) {
-                for (final String event : events) {
-                    List<T> listeners = listenersMap.get(event);
-                    if (listeners == null) {
-                        // Java doesn't let us put Class<? extends List<T>> as the type for listType.
-                        @SuppressWarnings("unchecked")
-                        final Class<? extends List<T>> type = (Class) listType;
-                        listeners = type.newInstance();
-                        listenersMap.put(event, listeners);
-                    }
-                    if (!AppConstants.RELEASE_BUILD && listeners.contains(listener)) {
-                        throw new IllegalStateException("Already registered " + event);
-                    }
-                    listeners.add(listener);
-                }
-            }
-        } catch (final IllegalAccessException | InstantiationException e) {
-            throw new IllegalArgumentException("Invalid new list type", e);
-        }
-    }
-
-    private void checkNotRegisteredElsewhere(final Map<String, ?> allowedMap,
-                                             final String[] events) {
-        if (AppConstants.RELEASE_BUILD) {
-            // for performance reasons, we only check for
-            // already-registered listeners in non-release builds.
-            return;
-        }
-        for (final Map<String, ?> listenersMap : Arrays.asList(mGeckoThreadNativeListeners,
-                                                               mGeckoThreadJSONListeners,
-                                                               mUiThreadListeners,
-                                                               mBackgroundThreadListeners)) {
-            if (listenersMap == allowedMap) {
-                continue;
-            }
-            synchronized (listenersMap) {
-                for (final String event : events) {
-                    if (listenersMap.get(event) != null) {
-                        throw new IllegalStateException(
-                            "Already registered " + event + " under a different type");
-                    }
-                }
-            }
-        }
-    }
-
-    private <T> void unregisterListener(final Map<String, List<T>> listenersMap,
-                                        final T listener,
-                                        final String[] events) {
-        synchronized (listenersMap) {
-            for (final String event : events) {
-                List<T> listeners = listenersMap.get(event);
-                if ((listeners == null ||
-                     !listeners.remove(listener)) && !AppConstants.RELEASE_BUILD) {
-                    throw new IllegalArgumentException(event + " was not registered");
-                }
-            }
-        }
-    }
-
-    public void registerGeckoThreadListener(final NativeEventListener listener,
-                                            final String... events) {
-        checkNotRegisteredElsewhere(mGeckoThreadNativeListeners, events);
-
-        // For listeners running on the Gecko thread, we want to notify the listeners
-        // outside of our synchronized block, because the listeners may take an
-        // indeterminate amount of time to run. Therefore, to ensure concurrency when
-        // iterating the list outside of the synchronized block, we use a
-        // CopyOnWriteArrayList.
-        registerListener(CopyOnWriteArrayList.class,
-                         mGeckoThreadNativeListeners, listener, events);
-    }
-
-    @Deprecated // Use NativeEventListener instead
-    public void registerGeckoThreadListener(final GeckoEventListener listener,
-                                            final String... events) {
-        checkNotRegisteredElsewhere(mGeckoThreadJSONListeners, events);
-
-        registerListener(CopyOnWriteArrayList.class,
-                         mGeckoThreadJSONListeners, listener, events);
-    }
-
-    public void registerUiThreadListener(final BundleEventListener listener,
-                                         final String... events) {
-        checkNotRegisteredElsewhere(mUiThreadListeners, events);
-
-        registerListener(ArrayList.class,
-                         mUiThreadListeners, listener, events);
-    }
-
-    public void registerBackgroundThreadListener(final BundleEventListener listener,
-                                                 final String... events) {
-        checkNotRegisteredElsewhere(mBackgroundThreadListeners, events);
-
-        registerListener(ArrayList.class,
-                         mBackgroundThreadListeners, listener, events);
-    }
-
-    public void unregisterGeckoThreadListener(final NativeEventListener listener,
-                                              final String... events) {
-        unregisterListener(mGeckoThreadNativeListeners, listener, events);
-    }
-
-    @Deprecated // Use NativeEventListener instead
-    public void unregisterGeckoThreadListener(final GeckoEventListener listener,
-                                              final String... events) {
-        unregisterListener(mGeckoThreadJSONListeners, listener, events);
-    }
-
-    public void unregisterUiThreadListener(final BundleEventListener listener,
-                                           final String... events) {
-        unregisterListener(mUiThreadListeners, listener, events);
-    }
-
-    public void unregisterBackgroundThreadListener(final BundleEventListener listener,
-                                                   final String... events) {
-        unregisterListener(mBackgroundThreadListeners, listener, events);
-    }
-
-    public void dispatchEvent(final NativeJSContainer message) {
-        // First try native listeners.
-        final String type = message.optString("type", null);
-        if (type == null) {
-            Log.e(LOGTAG, "JSON message must have a type property");
-            return;
-        }
-
-        final List<NativeEventListener> listeners;
-        synchronized (mGeckoThreadNativeListeners) {
-            listeners = mGeckoThreadNativeListeners.get(type);
-        }
-
-        final String guid = message.optString(GUID, null);
-        EventCallback callback = null;
-        if (guid != null) {
-            callback = new GeckoEventCallback(guid, type);
-        }
-
-        if (listeners != null) {
-            if (listeners.isEmpty()) {
-                Log.w(LOGTAG, "No listeners for " + type);
-
-                // There were native listeners, and they're gone.  Dispatch an error rather than
-                // looking for JSON listeners.
-                if (callback != null) {
-                    callback.sendError("No listeners for request");
-                }
-            }
-            try {
-                for (final NativeEventListener listener : listeners) {
-                    listener.handleMessage(type, message, callback);
-                }
-            } catch (final NativeJSObject.InvalidPropertyException e) {
-                Log.e(LOGTAG, "Exception occurred while handling " + type, e);
-            }
-            // If we found native listeners, we assume we don't have any other types of listeners
-            // and return early. This assumption is checked when registering listeners.
-            return;
-        }
-
-        // Check for thread event listeners before checking for JSON event listeners,
-        // because checking for thread listeners is very fast and doesn't require us to
-        // serialize into JSON and construct a JSONObject.
-        if (dispatchToThread(type, message, callback,
-                             mUiThreadListeners, ThreadUtils.getUiHandler()) ||
-            dispatchToThread(type, message, callback,
-                             mBackgroundThreadListeners, ThreadUtils.getBackgroundHandler())) {
-
-            // If we found thread listeners, we assume we don't have any other types of listeners
-            // and return early. This assumption is checked when registering listeners.
-            return;
-        }
-
-        try {
-            // If we didn't find native listeners, try JSON listeners.
-            dispatchEvent(new JSONObject(message.toString()), callback);
-        } catch (final JSONException e) {
-            Log.e(LOGTAG, "Cannot parse JSON", e);
-        } catch (final UnsupportedOperationException e) {
-            Log.e(LOGTAG, "Cannot convert message to JSON", e);
-        }
-    }
-
-    private boolean dispatchToThread(final String type,
-                                     final NativeJSObject message,
-                                     final EventCallback callback,
-                                     final Map<String, List<BundleEventListener>> listenersMap,
-                                     final Handler thread) {
-        // We need to hold the lock throughout dispatching, to ensure the listeners list
-        // is consistent, while we iterate over it. We don't have to worry about listeners
-        // running for a long time while we have the lock, because the listeners will run
-        // on a separate thread.
-        synchronized (listenersMap) {
-            final List<BundleEventListener> listeners = listenersMap.get(type);
-            if (listeners == null) {
-                return false;
-            }
-
-            if (listeners.isEmpty()) {
-                Log.w(LOGTAG, "No listeners for " + type);
-
-                // There were native listeners, and they're gone.
-                // Dispatch an error rather than looking for more listeners.
-                if (callback != null) {
-                    callback.sendError("No listeners for request");
-                }
-                return true;
-            }
-
-            final Bundle messageAsBundle;
-            try {
-                messageAsBundle = message.toBundle();
-            } catch (final NativeJSObject.InvalidPropertyException e) {
-                Log.e(LOGTAG, "Exception occurred while handling " + type, e);
-                return true;
-            }
-
-            // Event listeners will call | callback.sendError | if applicable.
-            for (final BundleEventListener listener : listeners) {
-                thread.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        listener.handleMessage(type, messageAsBundle, callback);
-                    }
-                });
-            }
-            return true;
-        }
-    }
-
-    public void dispatchEvent(final JSONObject message, final EventCallback callback) {
-        // {
-        //   "type": "value",
-        //   "event_specific": "value",
-        //   ...
-        try {
-            final String type = message.getString("type");
-
-            List<GeckoEventListener> listeners;
-            synchronized (mGeckoThreadJSONListeners) {
-                listeners = mGeckoThreadJSONListeners.get(type);
-            }
-            if (listeners == null || listeners.isEmpty()) {
-                Log.w(LOGTAG, "No listeners for " + type);
-
-                // If there are no listeners, dispatch an error.
-                if (callback != null) {
-                    callback.sendError("No listeners for request");
-                }
-                return;
-            }
-            for (final GeckoEventListener listener : listeners) {
-                listener.handleMessage(type, message);
-            }
-        } catch (final JSONException e) {
-            Log.e(LOGTAG, "handleGeckoMessage throws " + e, e);
-        }
-    }
-
-    @RobocopTarget
-    @Deprecated
-    public static void sendResponse(JSONObject message, Object response) {
-        sendResponseHelper(STATUS_SUCCESS, message, response);
-    }
-
-    @Deprecated
-    public static void sendError(JSONObject message, Object response) {
-        sendResponseHelper(STATUS_ERROR, message, response);
-    }
-
-    @Deprecated
-    private static void sendResponseHelper(String status, JSONObject message, Object response) {
-        try {
-            final String topic = message.getString("type") + ":Response";
-            final JSONObject wrapper = new JSONObject();
-            wrapper.put(GUID, message.getString(GUID));
-            wrapper.put("status", status);
-            wrapper.put("response", response);
-
-            if (ThreadUtils.isOnGeckoThread()) {
-                GeckoAppShell.syncNotifyObservers(topic, wrapper.toString());
-            } else {
-                GeckoAppShell.notifyObservers(topic, wrapper.toString(),
-                                              GeckoThread.State.PROFILE_READY);
-            }
-        } catch (final JSONException e) {
-            Log.e(LOGTAG, "Unable to send response", e);
-        }
-    }
-
-    private static class GeckoEventCallback implements EventCallback {
-        private final String guid;
-        private final String type;
-        private boolean sent;
-
-        public GeckoEventCallback(final String guid, final String type) {
-            this.guid = guid;
-            this.type = type;
-        }
-
-        @Override
-        public void sendSuccess(final Object response) {
-            sendResponse(STATUS_SUCCESS, response);
-        }
-
-        @Override
-        public void sendError(final Object response) {
-            sendResponse(STATUS_ERROR, response);
-        }
-
-        private void sendResponse(final String status, final Object response) {
-            if (sent) {
-                throw new IllegalStateException("Callback has already been executed for type=" +
-                        type + ", guid=" + guid);
-            }
-
-            sent = true;
-
-            try {
-                final String topic = type + ":Response";
-                final JSONObject wrapper = new JSONObject();
-                wrapper.put(GUID, guid);
-                wrapper.put("status", status);
-                wrapper.put("response", response);
-
-                if (ThreadUtils.isOnGeckoThread()) {
-                    GeckoAppShell.syncNotifyObservers(topic, wrapper.toString());
-                } else {
-                    GeckoAppShell.notifyObservers(topic, wrapper.toString(),
-                                                  GeckoThread.State.PROFILE_READY);
-                }
-            } catch (final JSONException e) {
-                Log.e(LOGTAG, "Unable to send response for: " + type, e);
-            }
-        }
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoAccessibility.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.mozilla.gecko.AppConstants.Versions;
-import org.mozilla.gecko.gfx.LayerView;
-import org.mozilla.gecko.util.ThreadUtils;
-import org.mozilla.gecko.util.UIAsyncTask;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.accessibility.AccessibilityNodeProvider;
-
-import com.googlecode.eyesfree.braille.selfbraille.SelfBrailleClient;
-import com.googlecode.eyesfree.braille.selfbraille.WriteData;
-
-public class GeckoAccessibility {
-    private static final String LOGTAG = "GeckoAccessibility";
-    private static final int VIRTUAL_ENTRY_POINT_BEFORE = 1;
-    private static final int VIRTUAL_CURSOR_POSITION = 2;
-    private static final int VIRTUAL_ENTRY_POINT_AFTER = 3;
-
-    private static boolean sEnabled;
-    // Used to store the JSON message and populate the event later in the code path.
-    private static JSONObject sHoverEnter;
-    private static AccessibilityNodeInfo sVirtualCursorNode;
-    private static int sCurrentNode;
-
-    // This is the number Brailleback uses to start indexing routing keys.
-    private static final int BRAILLE_CLICK_BASE_INDEX = -275000000;
-    private static SelfBrailleClient sSelfBrailleClient;
-
-    public static void updateAccessibilitySettings (final Context context) {
-        new UIAsyncTask.WithoutParams<Void>(ThreadUtils.getBackgroundHandler()) {
-                @Override
-                public Void doInBackground() {
-                    JSONObject ret = new JSONObject();
-                    sEnabled = false;
-                    AccessibilityManager accessibilityManager =
-                        (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
-                    sEnabled = accessibilityManager.isEnabled() && accessibilityManager.isTouchExplorationEnabled();
-                    if (Versions.feature16Plus && sEnabled && sSelfBrailleClient == null) {
-                        sSelfBrailleClient = new SelfBrailleClient(GeckoAppShell.getContext(), false);
-                    }
-
-                    try {
-                        ret.put("enabled", sEnabled);
-                    } catch (Exception ex) {
-                        Log.e(LOGTAG, "Error building JSON arguments for Accessibility:Settings:", ex);
-                    }
-
-                    GeckoAppShell.notifyObservers("Accessibility:Settings", ret.toString());
-                    return null;
-                }
-
-                @Override
-                public void onPostExecute(Void args) {
-                    final GeckoAppShell.GeckoInterface geckoInterface = GeckoAppShell.getGeckoInterface();
-                    if (geckoInterface == null) {
-                        return;
-                    }
-                    geckoInterface.setAccessibilityEnabled(sEnabled);
-                }
-            }.execute();
-    }
-
-    private static void populateEventFromJSON (AccessibilityEvent event, JSONObject message) {
-        final JSONArray textArray = message.optJSONArray("text");
-        if (textArray != null) {
-            for (int i = 0; i < textArray.length(); i++)
-                event.getText().add(textArray.optString(i));
-        }
-
-        event.setContentDescription(message.optString("description"));
-        event.setEnabled(message.optBoolean("enabled", true));
-        event.setChecked(message.optBoolean("checked"));
-        event.setPassword(message.optBoolean("password"));
-        event.setAddedCount(message.optInt("addedCount", -1));
-        event.setRemovedCount(message.optInt("removedCount", -1));
-        event.setFromIndex(message.optInt("fromIndex", -1));
-        event.setItemCount(message.optInt("itemCount", -1));
-        event.setCurrentItemIndex(message.optInt("currentItemIndex", -1));
-        event.setBeforeText(message.optString("beforeText"));
-        if (Versions.feature14Plus) {
-            event.setToIndex(message.optInt("toIndex", -1));
-            event.setScrollable(message.optBoolean("scrollable"));
-            event.setScrollX(message.optInt("scrollX", -1));
-            event.setScrollY(message.optInt("scrollY", -1));
-        }
-        if (Versions.feature15Plus) {
-            event.setMaxScrollX(message.optInt("maxScrollX", -1));
-            event.setMaxScrollY(message.optInt("maxScrollY", -1));
-        }
-    }
-
-    private static void sendDirectAccessibilityEvent(int eventType, JSONObject message) {
-        final AccessibilityEvent accEvent = AccessibilityEvent.obtain(eventType);
-        accEvent.setClassName(GeckoAccessibility.class.getName());
-        accEvent.setPackageName(GeckoAppShell.getContext().getPackageName());
-        populateEventFromJSON(accEvent, message);
-        AccessibilityManager accessibilityManager =
-            (AccessibilityManager) GeckoAppShell.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
-        try {
-            accessibilityManager.sendAccessibilityEvent(accEvent);
-        } catch (IllegalStateException e) {
-            // Accessibility is off.
-        }
-    }
-
-    public static boolean isEnabled() {
-        return sEnabled;
-    }
-
-    public static void sendAccessibilityEvent (final JSONObject message) {
-        if (!sEnabled)
-            return;
-
-        final int eventType = message.optInt("eventType", -1);
-        if (eventType < 0) {
-            Log.e(LOGTAG, "No accessibility event type provided");
-            return;
-        }
-
-        sendAccessibilityEvent(message, eventType);
-    }
-
-    public static void sendAccessibilityEvent (final JSONObject message, final int eventType) {
-        if (!sEnabled)
-            return;
-
-        final String exitView = message.optString("exitView");
-        if (exitView.equals("moveNext")) {
-            sCurrentNode = VIRTUAL_ENTRY_POINT_AFTER;
-        } else if (exitView.equals("movePrevious")) {
-            sCurrentNode = VIRTUAL_ENTRY_POINT_BEFORE;
-        } else {
-            sCurrentNode = VIRTUAL_CURSOR_POSITION;
-        }
-
-        if (Versions.preJB) {
-            // Before Jelly Bean we send events directly from here while spoofing the source by setting
-            // the package and class name manually.
-            ThreadUtils.postToBackgroundThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        sendDirectAccessibilityEvent(eventType, message);
-                }
-            });
-        } else {
-            // In Jelly Bean we populate an AccessibilityNodeInfo with the minimal amount of data to have
-            // it work with TalkBack.
-            final LayerView view = GeckoAppShell.getLayerView();
-            if (view == null)
-                return;
-
-            if (sVirtualCursorNode == null)
-                sVirtualCursorNode = AccessibilityNodeInfo.obtain(view, VIRTUAL_CURSOR_POSITION);
-            sVirtualCursorNode.setEnabled(message.optBoolean("enabled", true));
-            sVirtualCursorNode.setClickable(message.optBoolean("clickable"));
-            sVirtualCursorNode.setCheckable(message.optBoolean("checkable"));
-            sVirtualCursorNode.setChecked(message.optBoolean("checked"));
-            sVirtualCursorNode.setPassword(message.optBoolean("password"));
-
-            final JSONArray textArray = message.optJSONArray("text");
-            StringBuilder sb = new StringBuilder();
-            if (textArray != null && textArray.length() > 0) {
-                sb.append(textArray.optString(0));
-                for (int i = 1; i < textArray.length(); i++) {
-                    sb.append(" ").append(textArray.optString(i));
-                }
-                sVirtualCursorNode.setText(sb.toString());
-            }
-            sVirtualCursorNode.setContentDescription(message.optString("description"));
-
-            JSONObject bounds = message.optJSONObject("bounds");
-            if (bounds != null) {
-                Rect relativeBounds = new Rect(bounds.optInt("left"), bounds.optInt("top"),
-                                               bounds.optInt("right"), bounds.optInt("bottom"));
-                sVirtualCursorNode.setBoundsInParent(relativeBounds);
-                int[] locationOnScreen = new int[2];
-                view.getLocationOnScreen(locationOnScreen);
-                Rect screenBounds = new Rect(relativeBounds);
-                screenBounds.offset(locationOnScreen[0], locationOnScreen[1]);
-                sVirtualCursorNode.setBoundsInScreen(screenBounds);
-            }
-
-            final JSONObject braille = message.optJSONObject("brailleOutput");
-            if (braille != null) {
-                sendBrailleText(view, braille.optString("text"),
-                                braille.optInt("selectionStart"), braille.optInt("selectionEnd"));
-            }
-
-            if (eventType == AccessibilityEvent.TYPE_VIEW_HOVER_ENTER) {
-                sHoverEnter = message;
-            }
-
-            ThreadUtils.postToUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        final AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
-                        event.setPackageName(GeckoAppShell.getContext().getPackageName());
-                        event.setClassName(GeckoAccessibility.class.getName());
-                        if (eventType == AccessibilityEvent.TYPE_ANNOUNCEMENT ||
-                            eventType == AccessibilityEvent.TYPE_VIEW_SCROLLED) {
-                            event.setSource(view, View.NO_ID);
-                        } else {
-                            event.setSource(view, VIRTUAL_CURSOR_POSITION);
-                        }
-                        populateEventFromJSON(event, message);
-                        view.requestSendAccessibilityEvent(view, event);
-                    }
-                });
-
-        }
-    }
-
-    private static void sendBrailleText(final View view, final String text, final int selectionStart, final int selectionEnd) {
-        AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain(view, VIRTUAL_CURSOR_POSITION);
-        WriteData data = WriteData.forInfo(info);
-        data.setText(text);
-        // Set either the focus blink or the current caret position/selection
-        data.setSelectionStart(selectionStart);
-        data.setSelectionEnd(selectionEnd);
-        sSelfBrailleClient.write(data);
-    }
-
-    public static void setDelegate(LayerView layerview) {
-        // Only use this delegate in Jelly Bean.
-        if (Versions.feature16Plus) {
-            layerview.setAccessibilityDelegate(new GeckoAccessibilityDelegate());
-            layerview.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
-        }
-    }
-
-    public static void setAccessibilityManagerListeners(final Context context) {
-        AccessibilityManager accessibilityManager =
-            (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
-
-        accessibilityManager.addAccessibilityStateChangeListener(new AccessibilityManager.AccessibilityStateChangeListener() {
-            @Override
-            public void onAccessibilityStateChanged(boolean enabled) {
-                updateAccessibilitySettings(context);
-            }
-        });
-
-        if (Versions.feature19Plus) {
-            accessibilityManager.addTouchExplorationStateChangeListener(new AccessibilityManager.TouchExplorationStateChangeListener() {
-                @Override
-                public void onTouchExplorationStateChanged(boolean enabled) {
-                    updateAccessibilitySettings(context);
-                }
-            });
-        }
-    }
-
-    public static void onLayerViewFocusChanged(LayerView layerview, boolean gainFocus) {
-        if (sEnabled)
-            GeckoAppShell.notifyObservers("Accessibility:Focus", gainFocus ? "true" : "false");
-    }
-
-    public static class GeckoAccessibilityDelegate extends View.AccessibilityDelegate {
-        AccessibilityNodeProvider mAccessibilityNodeProvider;
-
-        @Override
-        public AccessibilityNodeProvider getAccessibilityNodeProvider(final View host) {
-            if (mAccessibilityNodeProvider == null)
-                // The accessibility node structure for web content consists of 3 LayerView child nodes:
-                // 1. VIRTUAL_ENTRY_POINT_BEFORE: Represents the entry point before the LayerView.
-                // 2. VIRTUAL_CURSOR_POSITION: Represents the current position of the virtual cursor.
-                // 3. VIRTUAL_ENTRY_POINT_AFTER: Represents the entry point after the LayerView.
-                mAccessibilityNodeProvider = new AccessibilityNodeProvider() {
-                        @Override
-                        public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualDescendantId) {
-                            AccessibilityNodeInfo info = (virtualDescendantId == VIRTUAL_CURSOR_POSITION && sVirtualCursorNode != null) ?
-                                AccessibilityNodeInfo.obtain(sVirtualCursorNode) :
-                                AccessibilityNodeInfo.obtain(host, virtualDescendantId);
-
-                            switch (virtualDescendantId) {
-                            case View.NO_ID:
-                                // This is the parent LayerView node, populate it with children.
-                                onInitializeAccessibilityNodeInfo(host, info);
-                                info.addChild(host, VIRTUAL_ENTRY_POINT_BEFORE);
-                                info.addChild(host, VIRTUAL_CURSOR_POSITION);
-                                info.addChild(host, VIRTUAL_ENTRY_POINT_AFTER);
-                                break;
-                            default:
-                                info.setParent(host);
-                                info.setSource(host, virtualDescendantId);
-                                info.setVisibleToUser(host.isShown());
-                                info.setPackageName(GeckoAppShell.getContext().getPackageName());
-                                info.setClassName(host.getClass().getName());
-                                info.setEnabled(true);
-                                info.addAction(AccessibilityNodeInfo.ACTION_CLEAR_ACCESSIBILITY_FOCUS);
-                                info.addAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
-                                info.addAction(AccessibilityNodeInfo.ACTION_CLICK);
-                                info.addAction(AccessibilityNodeInfo.ACTION_LONG_CLICK);
-                                info.addAction(AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY);
-                                info.addAction(AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY);
-                                info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
-                                info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
-                                info.addAction(AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT);
-                                info.addAction(AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT);
-                                info.setMovementGranularities(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER |
-                                                              AccessibilityNodeInfo.MOVEMENT_GRANULARITY_WORD |
-                                                              AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE |
-                                                              AccessibilityNodeInfo.MOVEMENT_GRANULARITY_PARAGRAPH);
-                                break;
-                            }
-                            return info;
-                        }
-
-                        @Override
-                        public boolean performAction (int virtualViewId, int action, Bundle arguments) {
-                            if (action == AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS) {
-                                // The accessibility focus is permanently on the middle node, VIRTUAL_CURSOR_POSITION.
-                                // When we enter the view forward or backward we just ask Gecko to get focus, keeping the current position.
-                                if (virtualViewId == VIRTUAL_CURSOR_POSITION && sHoverEnter != null) {
-                                    GeckoAccessibility.sendAccessibilityEvent(sHoverEnter, AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
-                                } else {
-                                    GeckoAppShell.notifyObservers("Accessibility:Focus", "true");
-                                }
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_CLICK && virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                GeckoAppShell.notifyObservers("Accessibility:ActivateObject", null);
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_LONG_CLICK && virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                GeckoAppShell.notifyObservers("Accessibility:LongPress", null);
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_SCROLL_FORWARD && virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                GeckoAppShell.notifyObservers("Accessibility:ScrollForward", null);
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD && virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                GeckoAppShell.notifyObservers("Accessibility:ScrollBackward", null);
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_NEXT_HTML_ELEMENT && virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                String traversalRule = "";
-                                if (arguments != null) {
-                                    traversalRule = arguments.getString(AccessibilityNodeInfo.ACTION_ARGUMENT_HTML_ELEMENT_STRING);
-                                }
-                                GeckoAppShell.notifyObservers("Accessibility:NextObject", traversalRule);
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_PREVIOUS_HTML_ELEMENT && virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                String traversalRule = "";
-                                if (arguments != null) {
-                                    traversalRule = arguments.getString(AccessibilityNodeInfo.ACTION_ARGUMENT_HTML_ELEMENT_STRING);
-                                }
-                                GeckoAppShell.notifyObservers("Accessibility:PreviousObject", traversalRule);
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY &&
-                                       virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                // XXX: Self brailling gives this action with a bogus argument instead of an actual click action;
-                                // the argument value is the BRAILLE_CLICK_BASE_INDEX - the index of the routing key that was hit.
-                                // Other negative values are used by ChromeVox, but we don't support them.
-                                // FAKE_GRANULARITY_READ_CURRENT = -1
-                                // FAKE_GRANULARITY_READ_TITLE = -2
-                                // FAKE_GRANULARITY_STOP_SPEECH = -3
-                                // FAKE_GRANULARITY_CHANGE_SHIFTER = -4
-                                int granularity = arguments.getInt(AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
-                                if (granularity <= BRAILLE_CLICK_BASE_INDEX) {
-                                    int keyIndex = BRAILLE_CLICK_BASE_INDEX - granularity;
-                                    JSONObject activationData = new JSONObject();
-                                    try {
-                                        activationData.put("keyIndex", keyIndex);
-                                    } catch (JSONException e) {
-                                        return true;
-                                    }
-                                    GeckoAppShell.notifyObservers("Accessibility:ActivateObject", activationData.toString());
-                                } else if (granularity > 0) {
-                                    JSONObject movementData = new JSONObject();
-                                    try {
-                                        movementData.put("direction", "Next");
-                                        movementData.put("granularity", granularity);
-                                    } catch (JSONException e) {
-                                        return true;
-                                    }
-                                    GeckoAppShell.notifyObservers("Accessibility:MoveByGranularity", movementData.toString());
-                                }
-                                return true;
-                            } else if (action == AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY &&
-                                       virtualViewId == VIRTUAL_CURSOR_POSITION) {
-                                JSONObject movementData = new JSONObject();
-                                int granularity = arguments.getInt(AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT);
-                                try {
-                                    movementData.put("direction", "Previous");
-                                    movementData.put("granularity", granularity);
-                                } catch (JSONException e) {
-                                    return true;
-                                }
-                                if (granularity > 0) {
-                                    GeckoAppShell.notifyObservers("Accessibility:MoveByGranularity", movementData.toString());
-                                }
-                                return true;
-                            }
-                            return host.performAccessibilityAction(action, arguments);
-                        }
-                    };
-
-            return mAccessibilityNodeProvider;
-        }
-    }
-}

deleted file mode 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java
+++ /dev/null
@@ -1,2362 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.net.MalformedURLException;
-import java.net.Proxy;
-import java.net.URLConnection;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-import android.annotation.SuppressLint;
-import org.mozilla.gecko.annotation.JNITarget;
-import org.mozilla.gecko.annotation.RobocopTarget;
-import org.mozilla.gecko.annotation.WrapForJNI;
-import org.mozilla.gecko.AppConstants.Versions;
-import org.mozilla.gecko.gfx.BitmapUtils;
-import org.mozilla.gecko.gfx.LayerView;
-import org.mozilla.gecko.gfx.PanZoomController;
-import org.mozilla.gecko.permissions.Permissions;
-import org.mozilla.gecko.util.EventCallback;
-import org.mozilla.gecko.util.GeckoRequest;
-import org.mozilla.gecko.util.HardwareCodecCapabilityUtils;
-import org.mozilla.gecko.util.HardwareUtils;
-import org.mozilla.gecko.util.NativeEventListener;
-import org.mozilla.gecko.util.NativeJSContainer;
-import org.mozilla.gecko.util.NativeJSObject;
-import org.mozilla.gecko.util.ProxySelector;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.pm.Signature;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.ImageFormat;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.SurfaceTexture;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.hardware.Sensor;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.location.Criteria;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Looper;
-import android.os.Vibrator;
-import android.provider.Settings;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.ContextThemeWrapper;
-import android.view.Display;
-import android.view.HapticFeedbackConstants;
-import android.view.Surface;
-import android.view.SurfaceView;
-import android.view.TextureView;
-import android.view.View;
-import android.view.WindowManager;
-import android.webkit.MimeTypeMap;
-import android.widget.AbsoluteLayout;
-
-public class GeckoAppShell
-{
-    private static final String LOGTAG = "GeckoAppShell";
-
-    // We have static members only.
-    private GeckoAppShell() { }
-
-    public static final String ACTION_ALERT_CALLBACK       = "org.mozilla.gecko.ACTION_ALERT_CALLBACK";
-    public static final String ACTION_HOMESCREEN_SHORTCUT  = "org.mozilla.gecko.BOOKMARK";
-    public static final String PREFS_OOM_EXCEPTION         = "OOMException";
-
-    private static final CrashHandler CRASH_HANDLER = new CrashHandler() {
-        @Override
-        protected String getAppPackageName() {
-            return AppConstants.ANDROID_PACKAGE_NAME;
-        }
-
-        @Override
-        protected Context getAppContext() {
-            return sContextGetter != null ? getApplicationContext() : null;
-        }
-
-        @Override
-        protected Bundle getCrashExtras(final Thread thread, final Throwable exc) {
-            final Bundle extras = super.getCrashExtras(thread, exc);
-
-            extras.putString("ProductName", AppConstants.MOZ_APP_BASENAME);
-            extras.putString("ProductID", AppConstants.MOZ_APP_ID);
-            extras.putString("Version", AppConstants.MOZ_APP_VERSION);
-            extras.putString("BuildID", AppConstants.MOZ_APP_BUILDID);
-            extras.putString("Vendor", AppConstants.MOZ_APP_VENDOR);
-            extras.putString("ReleaseChannel", AppConstants.MOZ_UPDATE_CHANNEL);
-            return extras;
-        }
-
-        @Override
-        public void uncaughtException(final Thread thread, final Throwable exc) {
-            if (GeckoThread.isState(GeckoThread.State.EXITING) ||
-                    GeckoThread.isState(GeckoThread.State.EXITED)) {
-                // We've called System.exit. All exceptions after this point are Android
-                // berating us for being nasty to it.
-                return;
-            }
-
-            super.uncaughtException(thread, exc);
-        }
-
-        @Override
-        public boolean reportException(final Thread thread, final Throwable exc) {
-            try {
-                if (exc instanceof OutOfMemoryError) {
-                    SharedPreferences prefs = getSharedPreferences();
-                    SharedPreferences.Editor editor = prefs.edit();
-                    editor.putBoolean(PREFS_OOM_EXCEPTION, true);
-
-                    // Synchronously write to disk so we know it's done before we
-                    // shutdown
-                    editor.commit();
-                }
-
-                reportJavaCrash(getExceptionStackTrace(exc));
-
-            } catch (final Throwable e) {
-            }
-
-            // reportJavaCrash should have caused us to hard crash. If we're still here,
-            // it probably means Gecko is not loaded, and we should do something else.
-            if (AppConstants.MOZ_CRASHREPORTER && AppConstants.MOZILLA_OFFICIAL) {
-                // Only use Java crash reporter if enabled on official build.
-                return super.reportException(thread, exc);
-            }
-            return false;
-        }
-    };
-
-    public static CrashHandler ensureCrashHandling() {
-        // Crash handling is automatically enabled when GeckoAppShell is loaded.
-        return CRASH_HANDLER;
-    }
-
-    private static final Map<String, String> ALERT_COOKIES = new ConcurrentHashMap<String, String>();
-
-    private static volatile boolean locationHighAccuracyEnabled;
-
-    // Accessed by NotificationHelper. This should be encapsulated.
-    /* package */ static NotificationClient notificationClient;
-
-    // See also HardwareUtils.LOW_MEMORY_THRESHOLD_MB.
-    private static final int HIGH_MEMORY_DEVICE_THRESHOLD_MB = 768;
-
-    static private int sDensityDpi;
-    static private int sScreenDepth;
-
-    /* Is the value in sVibrationEndTime valid? */
-    private static boolean sVibrationMaybePlaying;
-
-    /* Time (in System.nanoTime() units) when the currently-playing vibration
-     * is scheduled to end.  This value is valid only when
-     * sVibrationMaybePlaying is true. */
-    private static long sVibrationEndTime;
-
-    private static Sensor gAccelerometerSensor;
-    private static Sensor gLinearAccelerometerSensor;
-    private static Sensor gGyroscopeSensor;
-    private static Sensor gOrientationSensor;
-    private static Sensor gProximitySensor;
-    private static Sensor gLightSensor;
-    private static Sensor gRotationVectorSensor;
-    private static Sensor gGameRotationVectorSensor;
-
-    private static final String GECKOREQUEST_RESPONSE_KEY = "response";
-    private static final String GECKOREQUEST_ERROR_KEY = "error";
-
-    /*
-     * Keep in sync with constants found here:
-     * http://mxr.mozilla.org/mozilla-central/source/uriloader/base/nsIWebProgressListener.idl
-    */
-    static public final int WPL_STATE_START = 0x00000001;
-    static public final int WPL_STATE_STOP = 0x00000010;
-    static public final int WPL_STATE_IS_DOCUMENT = 0x00020000;
-    static public final int WPL_STATE_IS_NETWORK = 0x00040000;
-
-    /* Keep in sync with constants found here:
-      http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsINetworkLinkService.idl
-    */
-    static public final int LINK_TYPE_UNKNOWN = 0;
-    static public final int LINK_TYPE_ETHERNET = 1;
-    static public final int LINK_TYPE_USB = 2;
-    static public final int LINK_TYPE_WIFI = 3;
-    static public final int LINK_TYPE_WIMAX = 4;
-    static public final int LINK_TYPE_2G = 5;
-    static public final int LINK_TYPE_3G = 6;
-    static public final int LINK_TYPE_4G = 7;
-
-    /* The Android-side API: API methods that Android calls */
-
-    // Initialization methods
-    public static native void registerJavaUiThread();
-
-    // helper methods
-    public static void callObserver(String observerKey, String topic, String data) {
-        sendEventToGecko(GeckoEvent.createCallObserverEvent(observerKey, topic, data));
-    }
-    public static void removeObserver(String observerKey) {
-        sendEventToGecko(GeckoEvent.createRemoveObserverEvent(observerKey));
-    }
-    public static native void onSurfaceTextureFrameAvailable(Object surfaceTexture, int id);
-    public static native void dispatchMemoryPressure();
-
-    private static native void reportJavaCrash(String stackTrace);
-
-    public static void notifyUriVisited(String uri) {
-        sendEventToGecko(GeckoEvent.createVisitedEvent(uri));
-    }
-
-    public static native void notifyBatteryChange(double aLevel, boolean aCharging, double aRemainingTime);
-
-    public static native void invalidateAndScheduleComposite();
-
-    public static native float computeRenderIntegrity();
-
-    public static native SurfaceBits getSurfaceBits(Surface surface);
-
-    public static native void addPresentationSurface(Surface surface);
-    public static native void removePresentationSurface(Surface surface);
-
-    public static native void onFullScreenPluginHidden(View view);
-
-    private static LayerView sLayerView;
-    private static Rect sScreenSize;
-
-    public static void setLayerView(LayerView lv) {
-        if (sLayerView == lv) {
-            return;
-        }
-        sLayerView = lv;
-    }
-
-    @RobocopTarget
-    public static LayerView getLayerView() {
-        return sLayerView;
-    }
-
-    /**
-     * If the Gecko thread is running, immediately dispatches the event to
-     * Gecko.
-     *
-     * If the Gecko thread is not running, queues the event. If the queue is
-     * full, throws {@link IllegalStateException}.
-     *
-     * Queued events will be dispatched in order of arrival when the Gecko
-     * thread becomes live.
-     *
-     * This method can be called from any thread.
-     *
-     * @param e
-     *            the event to dispatch. Cannot be null.
-     */
-    @RobocopTarget
-    public static void sendEventToGecko(GeckoEvent e) {
-        if (e == null) {
-            throw new IllegalArgumentException("e cannot be null.");
-        }
-
-        if (GeckoThread.isRunning()) {
-            notifyGeckoOfEvent(e);
-            // Gecko will copy the event data into a normal C++ object.
-            // We can recycle the event now.
-            e.recycle();
-            return;
-        }
-
-        GeckoThread.addPendingEvent(e);
-    }
-
-    /**
-     * Sends an asynchronous request to Gecko.
-     *
-     * The response data will be passed to {@link GeckoRequest#onResponse(NativeJSObject)} if the
-     * request succeeds; otherwise, {@link GeckoRequest#onError()} will fire.
-     *
-     * This method follows the same queuing conditions as {@link #sendEventToGecko(GeckoEvent)}.
-     * It can be called from any thread. The GeckoRequest callbacks will be executed on the Gecko thread.
-     *
-     * @param request The request to dispatch. Cannot be null.
-     */
-    @RobocopTarget
-    public static void sendRequestToGecko(final GeckoRequest request) {
-        final String responseMessage = "Gecko:Request" + request.getId();
-
-        EventDispatcher.getInstance().registerGeckoThreadListener(new NativeEventListener() {
-            @Override
-            public void handleMessage(String event, NativeJSObject message, EventCallback callback) {
-                EventDispatcher.getInstance().unregisterGeckoThreadListener(this, event);
-                if (!message.has(GECKOREQUEST_RESPONSE_KEY)) {
-                    request.onError(message.getObject(GECKOREQUEST_ERROR_KEY));
-                    return;
-                }
-                request.onResponse(message.getObject(GECKOREQUEST_RESPONSE_KEY));
-            }
-        }, responseMessage);
-
-        notifyObservers(request.getName(), request.getData());
-    }
-
-    // Tell the Gecko event loop that an event is available.
-    public static native void notifyGeckoOfEvent(GeckoEvent event);
-
-    // Synchronously notify a Gecko observer; must be called from Gecko thread.
-    @WrapForJNI
-    public static native void syncNotifyObservers(String topic, String data);
-
-    @WrapForJNI(stubName = "NotifyObservers")
-    private static native void nativeNotifyObservers(String topic, String data);
-
-    @RobocopTarget
-    public static void notifyObservers(final String topic, final String data) {
-        notifyObservers(topic, data, GeckoThread.State.RUNNING);
-    }
-
-    public static void notifyObservers(final String topic, final String data, final GeckoThread.State state) {
-        if (GeckoThread.isStateAtLeast(state)) {
-            nativeNotifyObservers(topic, data);
-        } else {
-            GeckoThread.queueNativeCallUntil(
-                    state, GeckoAppShell.class, "nativeNotifyObservers",
-                    String.class, topic, String.class, data);
-        }
-    }
-
-    /*
-     *  The Gecko-side API: API methods that Gecko calls
-     */
-
-    @WrapForJNI(allowMultithread = true, noThrow = true)
-    public static String handleUncaughtException(Throwable e) {
-        if (AppConstants.MOZ_CRASHREPORTER) {
-            final Throwable exc = CrashHandler.getRootException(e);
-            final StackTraceElement[] stack = exc.getStackTrace();
-            if (stack.length >= 1 && stack[0].isNativeMethod()) {
-                // The exception occurred when running native code. Return an exception
-                // string and trigger the crash reporter inside the caller so that we get
-                // a better native stack in Socorro.
-                CrashHandler.logException(Thread.currentThread(), exc);
-                return CrashHandler.getExceptionStackTrace(exc);
-            }
-        }
-        CRASH_HANDLER.uncaughtException(null, e);
-        return null;
-    }
-
-    private static final Runnable sCallbackRunnable = new Runnable() {
-        @Override
-        public void run() {
-            ThreadUtils.assertOnUiThread();
-            long nextDelay = runUiThreadCallback();
-            if (nextDelay >= 0) {
-                ThreadUtils.getUiHandler().postDelayed(this, nextDelay);
-            }
-        }
-    };
-
-    private static native long runUiThreadCallback();
-
-    @WrapForJNI(allowMultithread = true)
-    private static void requestUiThreadCallback(long delay) {
-        ThreadUtils.getUiHandler().postDelayed(sCallbackRunnable, delay);
-    }
-
-    private static float getLocationAccuracy(Location location) {
-        float radius = location.getAccuracy();
-        return (location.hasAccuracy() && radius > 0) ? radius : 1001;
-    }
-
-    @SuppressLint("MissingPermission") // Permissions are explicitly checked for in enableLocation()
-    private static Location getLastKnownLocation(LocationManager lm) {
-        Location lastKnownLocation = null;
-        List<String> providers = lm.getAllProviders();
-
-        for (String provider : providers) {
-            Location location = lm.getLastKnownLocation(provider);
-            if (location == null) {
-                continue;
-            }
-
-            if (lastKnownLocation == null) {
-                lastKnownLocation = location;
-                continue;
-            }
-
-            long timeDiff = location.getTime() - lastKnownLocation.getTime();
-            if (timeDiff > 0 ||
-                (timeDiff == 0 &&
-                 getLocationAccuracy(location) < getLocationAccuracy(lastKnownLocation))) {
-                lastKnownLocation = location;
-            }
-        }
-
-        return lastKnownLocation;
-    }
-
-    @WrapForJNI
-    @SuppressLint("MissingPermission") // Permissions are explicitly checked for within this method
-    public static void enableLocation(final boolean enable) {
-        Permissions
-                .from((Activity) getContext())
-                .withPermissions(Manifest.permission.ACCESS_FINE_LOCATION)
-                .onUIThread()
-                .doNotPromptIf(!enable)
-                .run(new Runnable() {
-                    @Override
-                    public void run() {
-                        LocationManager lm = getLocationManager(getApplicationContext());
-                        if (lm == null) {
-                            return;
-                        }
-
-                        if (enable) {
-                            Location lastKnownLocation = getLastKnownLocation(lm);
-                            if (lastKnownLocation != null) {
-                                getGeckoInterface().getLocationListener().onLocationChanged(lastKnownLocation);
-                            }
-
-                            Criteria criteria = new Criteria();
-                            criteria.setSpeedRequired(false);
-                            criteria.setBearingRequired(false);
-                            criteria.setAltitudeRequired(false);
-                            if (locationHighAccuracyEnabled) {
-                                criteria.setAccuracy(Criteria.ACCURACY_FINE);
-                                criteria.setCostAllowed(true);
-                                criteria.setPowerRequirement(Criteria.POWER_HIGH);
-                            } else {
-                                criteria.setAccuracy(Criteria.ACCURACY_COARSE);
-                                criteria.setCostAllowed(false);
-                                criteria.setPowerRequirement(Criteria.POWER_LOW);
-                            }
-
-                            String provider = lm.getBestProvider(criteria, true);
-                            if (provider == null)
-                                return;
-
-                            Looper l = Looper.getMainLooper();
-                            lm.requestLocationUpdates(provider, 100, (float) .5, getGeckoInterface().getLocationListener(), l);
-                        } else {
-                            lm.removeUpdates(getGeckoInterface().getLocationListener());
-                        }
-                    }
-                });
-    }
-
-    private static LocationManager getLocationManager(Context context) {
-        try {
-            return (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
-        } catch (NoSuchFieldError e) {
-            // Some Tegras throw exceptions about missing the CONTROL_LOCATION_UPDATES permission,
-            // which allows enabling/disabling location update notifications from the cell radio.
-            // CONTROL_LOCATION_UPDATES is not for use by normal applications, but we might be
-            // hitting this problem if the Tegras are confused about missing cell radios.
-            Log.e(LOGTAG, "LOCATION_SERVICE not found?!", e);
-            return null;
-        }
-    }
-
-    @WrapForJNI
-    public static void enableLocationHighAccuracy(final boolean enable) {
-        locationHighAccuracyEnabled = enable;
-    }
-
-    @WrapForJNI
-    public static boolean setAlarm(int aSeconds, int aNanoSeconds) {
-        AlarmManager am = (AlarmManager)
-            getApplicationContext().getSystemService(Context.ALARM_SERVICE);
-
-        Intent intent = new Intent(getApplicationContext(), AlarmReceiver.class);
-        PendingIntent pi = PendingIntent.getBroadcast(
-                getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        // AlarmManager only supports millisecond precision
-        long time = ((long) aSeconds * 1000) + ((long) aNanoSeconds / 1_000_000L);
-        am.setExact(AlarmManager.RTC_WAKEUP, time, pi);
-
-        return true;
-    }
-
-    @WrapForJNI
-    public static void disableAlarm() {
-        AlarmManager am = (AlarmManager)
-            getApplicationContext().getSystemService(Context.ALARM_SERVICE);
-
-        Intent intent = new Intent(getApplicationContext(), AlarmReceiver.class);
-        PendingIntent pi = PendingIntent.getBroadcast(
-                getApplicationContext(), 0, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-        am.cancel(pi);
-    }
-
-    @WrapForJNI
-    public static void enableSensor(int aSensortype) {
-        GeckoInterface gi = getGeckoInterface();
-        if (gi == null) {
-            return;
-        }
-        SensorManager sm = (SensorManager)
-            getApplicationContext().getSystemService(Context.SENSOR_SERVICE);
-
-        switch (aSensortype) {
-        case GeckoHalDefines.SENSOR_GAME_ROTATION_VECTOR:
-            if (gGameRotationVectorSensor == null) {
-                gGameRotationVectorSensor = sm.getDefaultSensor(15);
-                    // sm.getDefaultSensor(
-                    //     Sensor.TYPE_GAME_ROTATION_VECTOR); // API >= 18
-            }
-            if (gGameRotationVectorSensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gGameRotationVectorSensor,
-                                    SensorManager.SENSOR_DELAY_FASTEST);
-            }
-            if (gGameRotationVectorSensor != null) {
-              break;
-            }
-            // Fallthrough
-
-        case GeckoHalDefines.SENSOR_ROTATION_VECTOR:
-            if (gRotationVectorSensor == null) {
-                gRotationVectorSensor = sm.getDefaultSensor(
-                    Sensor.TYPE_ROTATION_VECTOR);
-            }
-            if (gRotationVectorSensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gRotationVectorSensor,
-                                    SensorManager.SENSOR_DELAY_FASTEST);
-            }
-            if (gRotationVectorSensor != null) {
-              break;
-            }
-            // Fallthrough
-
-        case GeckoHalDefines.SENSOR_ORIENTATION:
-            if (gOrientationSensor == null) {
-                gOrientationSensor = sm.getDefaultSensor(
-                    Sensor.TYPE_ORIENTATION);
-            }
-            if (gOrientationSensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gOrientationSensor,
-                                    SensorManager.SENSOR_DELAY_FASTEST);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_ACCELERATION:
-            if (gAccelerometerSensor == null) {
-                gAccelerometerSensor = sm.getDefaultSensor(
-                    Sensor.TYPE_ACCELEROMETER);
-            }
-            if (gAccelerometerSensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gAccelerometerSensor,
-                                    SensorManager.SENSOR_DELAY_FASTEST);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_PROXIMITY:
-            if (gProximitySensor == null) {
-                gProximitySensor = sm.getDefaultSensor(Sensor.TYPE_PROXIMITY);
-            }
-            if (gProximitySensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gProximitySensor,
-                                    SensorManager.SENSOR_DELAY_NORMAL);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_LIGHT:
-            if (gLightSensor == null) {
-                gLightSensor = sm.getDefaultSensor(Sensor.TYPE_LIGHT);
-            }
-            if (gLightSensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gLightSensor,
-                                    SensorManager.SENSOR_DELAY_NORMAL);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_LINEAR_ACCELERATION:
-            if (gLinearAccelerometerSensor == null) {
-                gLinearAccelerometerSensor = sm.getDefaultSensor(
-                    Sensor.TYPE_LINEAR_ACCELERATION);
-            }
-            if (gLinearAccelerometerSensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gLinearAccelerometerSensor,
-                                    SensorManager.SENSOR_DELAY_FASTEST);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_GYROSCOPE:
-            if (gGyroscopeSensor == null) {
-                gGyroscopeSensor = sm.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
-            }
-            if (gGyroscopeSensor != null) {
-                sm.registerListener(gi.getSensorEventListener(),
-                                    gGyroscopeSensor,
-                                    SensorManager.SENSOR_DELAY_FASTEST);
-            }
-            break;
-
-        default:
-            Log.w(LOGTAG, "Error! Can't enable unknown SENSOR type " +
-                  aSensortype);
-        }
-    }
-
-    @WrapForJNI
-    public static void disableSensor(int aSensortype) {
-        GeckoInterface gi = getGeckoInterface();
-        if (gi == null)
-            return;
-
-        SensorManager sm = (SensorManager)
-            getApplicationContext().getSystemService(Context.SENSOR_SERVICE);
-
-        switch (aSensortype) {
-        case GeckoHalDefines.SENSOR_GAME_ROTATION_VECTOR:
-            if (gGameRotationVectorSensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gGameRotationVectorSensor);
-              break;
-            }
-            // Fallthrough
-
-        case GeckoHalDefines.SENSOR_ROTATION_VECTOR:
-            if (gRotationVectorSensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gRotationVectorSensor);
-              break;
-            }
-            // Fallthrough
-
-        case GeckoHalDefines.SENSOR_ORIENTATION:
-            if (gOrientationSensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gOrientationSensor);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_ACCELERATION:
-            if (gAccelerometerSensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gAccelerometerSensor);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_PROXIMITY:
-            if (gProximitySensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gProximitySensor);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_LIGHT:
-            if (gLightSensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gLightSensor);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_LINEAR_ACCELERATION:
-            if (gLinearAccelerometerSensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gLinearAccelerometerSensor);
-            }
-            break;
-
-        case GeckoHalDefines.SENSOR_GYROSCOPE:
-            if (gGyroscopeSensor != null) {
-                sm.unregisterListener(gi.getSensorEventListener(), gGyroscopeSensor);
-            }
-            break;
-        default:
-            Log.w(LOGTAG, "Error! Can't disable unknown SENSOR type " + aSensortype);
-        }
-    }
-
-    @WrapForJNI
-    public static void startMonitoringGamepad() {
-        ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    AndroidGamepadManager.startup();
-                }
-            });
-    }
-
-    @WrapForJNI
-    public static void stopMonitoringGamepad() {
-        ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    AndroidGamepadManager.shutdown();
-                }
-            });
-    }
-
-    @WrapForJNI
-    public static void gamepadAdded(final int device_id, final int service_id) {
-        ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    AndroidGamepadManager.gamepadAdded(device_id, service_id);
-                }
-            });
-    }
-
-    @WrapForJNI
-    public static void moveTaskToBack() {
-        if (getGeckoInterface() != null)
-            getGeckoInterface().getActivity().moveTaskToBack(true);
-    }
-
-    @WrapForJNI
-    static void scheduleRestart() {
-        getGeckoInterface().doRestart();
-    }
-
-    // Creates a homescreen shortcut for a web page.
-    // This is the entry point from nsIShellService.
-    @WrapForJNI
-    public static void createShortcut(final String aTitle, final String aURI) {
-        final GeckoInterface geckoInterface = getGeckoInterface();
-        if (geckoInterface == null) {
-            return;
-        }
-        geckoInterface.createShortcut(aTitle, aURI);
-    }
-
-    @JNITarget
-    static public int getPreferredIconSize() {
-        if (Versions.feature11Plus) {
-            ActivityManager am = (ActivityManager)
-                    getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE);
-            return am.getLauncherLargeIconSize();
-        } else {
-            switch (getDpi()) {
-                case DisplayMetrics.DENSITY_MEDIUM:
-                    return 48;
-                case DisplayMetrics.DENSITY_XHIGH:
-                    return 96;
-                case DisplayMetrics.DENSITY_HIGH:
-                default:
-                    return 72;
-            }
-        }
-    }
-
-    @WrapForJNI(stubName = "GetHandlersForMimeTypeWrapper")
-    static String[] getHandlersForMimeType(String aMimeType, String aAction) {
-        final GeckoInterface geckoInterface = getGeckoInterface();
-        if (geckoInterface == null) {
-            return new String[] {};
-        }
-        return geckoInterface.getHandlersForMimeType(aMimeType, aAction);
-    }
-
-    @WrapForJNI(stubName = "GetHandlersForURLWrapper")
-    static String[] getHandlersForURL(String aURL, String aAction) {
-        final GeckoInterface geckoInterface = getGeckoInterface();
-        if (geckoInterface == null) {
-            return new String[] {};
-        }
-        return geckoInterface.getHandlersForURL(aURL, aAction);
-    }
-
-    @WrapForJNI(stubName = "GetHWEncoderCapability")
-    static boolean getHWEncoderCapability() {
-      return HardwareCodecCapabilityUtils.getHWEncoderCapability();
-    }
-
-    @WrapForJNI(stubName = "GetHWDecoderCapability")
-    static boolean getHWDecoderCapability() {
-      return HardwareCodecCapabilityUtils.getHWDecoderCapability();
-    }
-
-    static List<ResolveInfo> queryIntentActivities(Intent intent) {
-        final PackageManager pm = getApplicationContext().getPackageManager();
-
-        // Exclude any non-exported activities: we can't open them even if we want to!
-        // Bug 1031569 has some details.
-        final ArrayList<ResolveInfo> list = new ArrayList<>();
-        for (ResolveInfo ri: pm.queryIntentActivities(intent, 0)) {
-            if (ri.activityInfo.exported) {
-                list.add(ri);
-            }
-        }
-
-        return list;
-    }
-
-    @WrapForJNI(stubName = "GetExtensionFromMimeTypeWrapper")
-    static String getExtensionFromMimeType(String aMimeType) {
-        return MimeTypeMap.getSingleton().getExtensionFromMimeType(aMimeType);
-    }
-
-    @WrapForJNI(stubName = "GetMimeTypeFromExtensionsWrapper")
-    static String getMimeTypeFromExtensions(String aFileExt) {
-        StringTokenizer st = new StringTokenizer(aFileExt, ".,; ");
-        String type = null;
-        String subType = null;
-        while (st.hasMoreElements()) {
-            String ext = st.nextToken();
-            String mt = getMimeTypeFromExtension(ext);
-            if (mt == null)
-                continue;
-            int slash = mt.indexOf('/');
-            String tmpType = mt.substring(0, slash);
-            if (!tmpType.equalsIgnoreCase(type))
-                type = type == null ? tmpType : "*";
-            String tmpSubType = mt.substring(slash + 1);
-            if (!tmpSubType.equalsIgnoreCase(subType))
-                subType = subType == null ? tmpSubType : "*";
-        }
-        if (type == null)
-            type = "*";
-        if (subType == null)
-            subType = "*";
-        return type + "/" + subType;
-    }
-
-    static boolean isUriSafeForScheme(Uri aUri) {
-        // Bug 794034 - We don't want to pass MWI or USSD codes to the
-        // dialer, and ensure the Uri class doesn't parse a URI
-        // containing a fragment ('#')
-        final String scheme = aUri.getScheme();
-        if ("tel".equals(scheme) || "sms".equals(scheme)) {
-            final String number = aUri.getSchemeSpecificPart();
-            if (number.contains("#") || number.contains("*") || aUri.getFragment() != null) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @WrapForJNI
-    public static boolean openUriExternal(String targetURI,
-                                          String mimeType,
-                                          String packageName,
-                                          String className,
-                                          String action,
-                                          String title) {
-        final GeckoInterface geckoInterface = getGeckoInterface();
-        if (geckoInterface == null) {
-            return false;
-        }
-        return geckoInterface.openUriExternal(targetURI, mimeType, packageName, className, action, title);
-    }
-
-    /**
-     * Only called from GeckoApp.
-     */
-    public static void setNotificationClient(NotificationClient client) {
-        if (notificationClient == null) {
-            notificationClient = client;
-        } else {
-            Log.d(LOGTAG, "Notification client already set");
-        }
-    }
-
-    @WrapForJNI(stubName = "ShowPersistentAlertNotificationWrapper")
-    public static void showPersistentAlertNotification(
-          String aPersistentData,
-          String aImageUrl, String aAlertTitle, String aAlertText,
-          String aAlertCookie, String aAlertName, String aHost) {
-        Intent notificationIntent = GeckoService.getIntentToCreateServices(
-                getApplicationContext(), "persistent-notification-click", aPersistentData);
-        int notificationID = aAlertName.hashCode();
-        PendingIntent contentIntent = PendingIntent.getService(
-                getApplicationContext(), 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-        notificationClient.add(notificationID, aImageUrl, aHost, aAlertTitle, aAlertText, contentIntent);
-    }
-
-    @WrapForJNI(stubName = "ShowAlertNotificationWrapper")
-    public static void showAlertNotification(String aImageUrl, String aAlertTitle, String aAlertText, String aAlertCookie, String aAlertName, String aHost) {
-        // The intent to launch when the user clicks the expanded notification
-        Intent notificationIntent = new Intent(ACTION_ALERT_CALLBACK);
-        notificationIntent.setClassName(AppConstants.ANDROID_PACKAGE_NAME, AppConstants.MOZ_ANDROID_BROWSER_INTENT_CLASS);
-        notificationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        int notificationID = aAlertName.hashCode();
-
-        // Put the strings into the intent as an URI "alert:?name=<alertName>&app=<appName>&cookie=<cookie>"
-        Uri.Builder b = new Uri.Builder();
-        Uri dataUri = b.scheme("alert").path(Integer.toString(notificationID))
-                                       .appendQueryParameter("name", aAlertName)
-                                       .appendQueryParameter("cookie", aAlertCookie)
-                                       .build();
-        notificationIntent.setData(dataUri);
-        PendingIntent contentIntent = PendingIntent.getActivity(
-                getApplicationContext(), 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        ALERT_COOKIES.put(aAlertName, aAlertCookie);
-        callObserver(aAlertName, "alertshow", aAlertCookie);
-
-        notificationClient.add(notificationID, aImageUrl, aHost, aAlertTitle, aAlertText, contentIntent);
-    }
-
-    @WrapForJNI
-    public static void alertsProgressListener_OnProgress(String aAlertName, long aProgress, long aProgressMax, String aAlertText) {
-        int notificationID = aAlertName.hashCode();
-        notificationClient.update(notificationID, aProgress, aProgressMax, aAlertText);
-    }
-
-    @WrapForJNI
-    public static void closeNotification(String aAlertName) {
-        String alertCookie = ALERT_COOKIES.get(aAlertName);
-        if (alertCookie != null) {
-            callObserver(aAlertName, "alertfinished", alertCookie);
-            ALERT_COOKIES.remove(aAlertName);
-        }
-
-        removeObserver(aAlertName);
-
-        int notificationID = aAlertName.hashCode();
-        notificationClient.remove(notificationID);
-    }
-
-    public static void handleNotification(String aAction, String aAlertName, String aAlertCookie) {
-        int notificationID = aAlertName.hashCode();
-
-        if (ACTION_ALERT_CALLBACK.equals(aAction)) {
-            callObserver(aAlertName, "alertclickcallback", aAlertCookie);
-
-            if (notificationClient.isOngoing(notificationID)) {
-                // When clicked, keep the notification if it displays progress
-                return;
-            }
-        }
-        closeNotification(aAlertName);
-    }
-
-    @WrapForJNI(stubName = "GetDpiWrapper")
-    public static int getDpi() {
-        if (sDensityDpi == 0) {
-            sDensityDpi = getApplicationContext().getResources().getDisplayMetrics().densityDpi;
-        }
-
-        return sDensityDpi;
-    }
-
-    @WrapForJNI
-    public static float getDensity() {
-        return getApplicationContext().getResources().getDisplayMetrics().density;
-    }
-
-    private static boolean isHighMemoryDevice() {
-        return HardwareUtils.getMemSize() > HIGH_MEMORY_DEVICE_THRESHOLD_MB;
-    }
-
-    /**
-     * Returns the colour depth of the default screen. This will either be
-     * 24 or 16.
-     */
-    @WrapForJNI(stubName = "GetScreenDepthWrapper")
-    public static synchronized int getScreenDepth() {
-        if (sScreenDepth == 0) {
-            sScreenDepth = 16;
-            PixelFormat info = new PixelFormat();
-            final WindowManager wm = (WindowManager)
-                    getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
-            PixelFormat.getPixelFormatInfo(wm.getDefaultDisplay().getPixelFormat(), info);
-            if (info.bitsPerPixel >= 24 && isHighMemoryDevice()) {
-                sScreenDepth = 24;
-            }
-        }
-
-        return sScreenDepth;
-    }
-
-    @WrapForJNI
-    public static synchronized void setScreenDepthOverride(int aScreenDepth) {
-        if (sScreenDepth != 0) {
-            Log.e(LOGTAG, "Tried to override screen depth after it's already been set");
-            return;
-        }
-
-        sScreenDepth = aScreenDepth;
-    }
-
-    @WrapForJNI
-    public static void setFullScreen(boolean fullscreen) {
-        if (getGeckoInterface() != null)
-            getGeckoInterface().setFullScreen(fullscreen);
-    }
-
-    @WrapForJNI
-    public static void performHapticFeedback(boolean aIsLongPress) {
-        // Don't perform haptic feedback if a vibration is currently playing,
-        // because the haptic feedback will nuke the vibration.
-        if (!sVibrationMaybePlaying || System.nanoTime() >= sVibrationEndTime) {
-            LayerView layerView = getLayerView();
-            layerView.performHapticFeedback(aIsLongPress ?
-                                            HapticFeedbackConstants.LONG_PRESS :
-                                            HapticFeedbackConstants.VIRTUAL_KEY);
-        }
-    }
-
-    private static Vibrator vibrator() {
-        return (Vibrator) getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE);
-    }
-
-    // Helper method to convert integer array to long array.
-    private static long[] convertIntToLongArray(int[] input) {
-        long[] output = new long[input.length];
-        for (int i = 0; i < input.length; i++) {
-            output[i] = input[i];
-        }
-        return output;
-    }
-
-    // Vibrate only if haptic feedback is enabled.
-    public static void vibrateOnHapticFeedbackEnabled(int[] milliseconds) {
-        if (Settings.System.getInt(getApplicationContext().getContentResolver(),
-                                   Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) > 0) {
-            vibrate(convertIntToLongArray(milliseconds), -1);
-        }
-    }
-
-    @WrapForJNI(stubName = "Vibrate1")
-    public static void vibrate(long milliseconds) {
-        sVibrationEndTime = System.nanoTime() + milliseconds * 1000000;
-        sVibrationMaybePlaying = true;
-        vibrator().vibrate(milliseconds);
-    }
-
-    @WrapForJNI(stubName = "VibrateA")
-    public static void vibrate(long[] pattern, int repeat) {
-        // If pattern.length is even, the last element in the pattern is a
-        // meaningless delay, so don't include it in vibrationDuration.
-        long vibrationDuration = 0;
-        int iterLen = pattern.length - (pattern.length % 2 == 0 ? 1 : 0);
-        for (int i = 0; i < iterLen; i++) {
-          vibrationDuration += pattern[i];
-        }
-
-        sVibrationEndTime = System.nanoTime() + vibrationDuration * 1000000;
-        sVibrationMaybePlaying = true;
-        vibrator().vibrate(pattern, repeat);
-    }
-
-    @WrapForJNI
-    public static void cancelVibrate() {
-        sVibrationMaybePlaying = false;
-        sVibrationEndTime = 0;
-        vibrator().cancel();
-    }
-
-    @WrapForJNI
-    public static void setKeepScreenOn(final boolean on) {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                // TODO
-            }
-        });
-    }
-
-    @WrapForJNI
-    public static void notifyDefaultPrevented(final boolean defaultPrevented) {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                LayerView view = getLayerView();
-                PanZoomController controller = (view == null ? null : view.getPanZoomController());
-                if (controller != null) {
-                    controller.notifyDefaultActionPrevented(defaultPrevented);
-                }
-            }
-        });
-    }
-
-    @WrapForJNI
-    public static boolean isNetworkLinkUp() {
-        ConnectivityManager cm = (ConnectivityManager)
-           getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-        try {
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info == null || !info.isConnected())
-                return false;
-        } catch (SecurityException se) {
-            return false;
-        }
-        return true;
-    }
-
-    @WrapForJNI
-    public static boolean isNetworkLinkKnown() {
-        ConnectivityManager cm = (ConnectivityManager)
-            getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-        try {
-            if (cm.getActiveNetworkInfo() == null)
-                return false;
-        } catch (SecurityException se) {
-            return false;
-        }
-        return true;
-    }
-
-    @WrapForJNI
-    public static int networkLinkType() {
-        ConnectivityManager cm = (ConnectivityManager)
-            getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo info = cm.getActiveNetworkInfo();
-        if (info == null) {
-            return LINK_TYPE_UNKNOWN;
-        }
-
-        switch (info.getType()) {
-            case ConnectivityManager.TYPE_ETHERNET:
-                return LINK_TYPE_ETHERNET;
-            case ConnectivityManager.TYPE_WIFI:
-                return LINK_TYPE_WIFI;
-            case ConnectivityManager.TYPE_WIMAX:
-                return LINK_TYPE_WIMAX;
-            case ConnectivityManager.TYPE_MOBILE:
-                break; // We will handle sub-types after the switch.
-            default:
-                Log.w(LOGTAG, "Ignoring the current network type.");
-                return LINK_TYPE_UNKNOWN;
-        }
-
-        TelephonyManager tm = (TelephonyManager)
-            getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
-        if (tm == null) {
-            Log.e(LOGTAG, "Telephony service does not exist");
-            return LINK_TYPE_UNKNOWN;
-        }
-
-        switch (tm.getNetworkType()) {
-            case TelephonyManager.NETWORK_TYPE_IDEN:
-            case TelephonyManager.NETWORK_TYPE_CDMA:
-            case TelephonyManager.NETWORK_TYPE_GPRS:
-                return LINK_TYPE_2G;
-            case TelephonyManager.NETWORK_TYPE_1xRTT:
-            case TelephonyManager.NETWORK_TYPE_EDGE:
-                return LINK_TYPE_2G; // 2.5G
-            case TelephonyManager.NETWORK_TYPE_UMTS:
-            case TelephonyManager.NETWORK_TYPE_EVDO_0:
-                return LINK_TYPE_3G;
-            case TelephonyManager.NETWORK_TYPE_HSPA:
-            case TelephonyManager.NETWORK_TYPE_HSDPA:
-            case TelephonyManager.NETWORK_TYPE_HSUPA:
-            case TelephonyManager.NETWORK_TYPE_EVDO_A:
-            case TelephonyManager.NETWORK_TYPE_EVDO_B:
-            case TelephonyManager.NETWORK_TYPE_EHRPD:
-                return LINK_TYPE_3G; // 3.5G
-            case TelephonyManager.NETWORK_TYPE_HSPAP:
-                return LINK_TYPE_3G; // 3.75G
-            case TelephonyManager.NETWORK_TYPE_LTE:
-                return LINK_TYPE_4G; // 3.9G
-            case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-            default:
-                Log.w(LOGTAG, "Connected to an unknown mobile network!");
-                return LINK_TYPE_UNKNOWN;
-        }
-    }
-
-    @WrapForJNI(stubName = "GetSystemColoursWrapper")
-    public static int[] getSystemColors() {
-        // attrsAppearance[] must correspond to AndroidSystemColors structure in android/AndroidBridge.h
-        final int[] attrsAppearance = {
-            android.R.attr.textColor,
-            android.R.attr.textColorPrimary,
-            android.R.attr.textColorPrimaryInverse,
-            android.R.attr.textColorSecondary,
-            android.R.attr.textColorSecondaryInverse,
-            android.R.attr.textColorTertiary,
-            android.R.attr.textColorTertiaryInverse,
-            android.R.attr.textColorHighlight,
-            android.R.attr.colorForeground,
-            android.R.attr.colorBackground,
-            android.R.attr.panelColorForeground,
-            android.R.attr.panelColorBackground
-        };
-
-        int[] result = new int[attrsAppearance.length];
-
-        final ContextThemeWrapper contextThemeWrapper =
-            new ContextThemeWrapper(getApplicationContext(), android.R.style.TextAppearance);
-
-        final TypedArray appearance = contextThemeWrapper.getTheme().obtainStyledAttributes(attrsAppearance);
-
-        if (appearance != null) {
-            for (int i = 0; i < appearance.getIndexCount(); i++) {
-                int idx = appearance.getIndex(i);
-                int color = appearance.getColor(idx, 0);
-                result[idx] = color;
-            }
-            appearance.recycle();
-        }
-
-        return result;
-    }
-
-    @WrapForJNI
-    public static void killAnyZombies() {
-        GeckoProcessesVisitor visitor = new GeckoProcessesVisitor() {
-            @Override
-            public boolean callback(int pid) {
-                if (pid != android.os.Process.myPid())
-                    android.os.Process.killProcess(pid);
-                return true;
-            }
-        };
-
-        EnumerateGeckoProcesses(visitor);
-    }
-
-    interface GeckoProcessesVisitor {
-        boolean callback(int pid);
-    }
-
-    private static void EnumerateGeckoProcesses(GeckoProcessesVisitor visiter) {
-        int pidColumn = -1;
-        int userColumn = -1;
-
-        try {
-            // run ps and parse its output
-            java.lang.Process ps = Runtime.getRuntime().exec("ps");
-            BufferedReader in = new BufferedReader(new InputStreamReader(ps.getInputStream()),
-                                                   2048);
-
-            String headerOutput = in.readLine();
-
-            // figure out the column offsets.  We only care about the pid and user fields
-            StringTokenizer st = new StringTokenizer(headerOutput);
-
-            int tokenSoFar = 0;
-            while (st.hasMoreTokens()) {
-                String next = st.nextToken();
-                if (next.equalsIgnoreCase("PID"))
-                    pidColumn = tokenSoFar;
-                else if (next.equalsIgnoreCase("USER"))
-                    userColumn = tokenSoFar;
-                tokenSoFar++;
-            }
-
-            // alright, the rest are process entries.
-            String psOutput = null;
-            while ((psOutput = in.readLine()) != null) {
-                String[] split = psOutput.split("\\s+");
-                if (split.length <= pidColumn || split.length <= userColumn)
-                    continue;
-                int uid = android.os.Process.getUidForName(split[userColumn]);
-                if (uid == android.os.Process.myUid() &&
-                    !split[split.length - 1].equalsIgnoreCase("ps")) {
-                    int pid = Integer.parseInt(split[pidColumn]);
-                    boolean keepGoing = visiter.callback(pid);
-                    if (keepGoing == false)
-                        break;
-                }
-            }
-            in.close();
-        }
-        catch (Exception e) {
-            Log.w(LOGTAG, "Failed to enumerate Gecko processes.",  e);
-        }
-    }
-
-    public static String getAppNameByPID(int pid) {
-        BufferedReader cmdlineReader = null;
-        String path = "/proc/" + pid + "/cmdline";
-        try {
-            File cmdlineFile = new File(path);
-            if (!cmdlineFile.exists())
-                return "";
-            cmdlineReader = new BufferedReader(new FileReader(cmdlineFile));
-            return cmdlineReader.readLine().trim();
-        } catch (Exception ex) {
-            return "";
-        } finally {
-            if (null != cmdlineReader) {
-                try {
-                    cmdlineReader.close();
-                } catch (Exception e) { }
-            }
-        }
-    }
-
-    public static void listOfOpenFiles() {
-        int pidColumn = -1;
-        int nameColumn = -1;
-
-        try {
-            String filter = GeckoProfile.get(getApplicationContext()).getDir().toString();
-            Log.d(LOGTAG, "[OPENFILE] Filter: " + filter);
-
-            // run lsof and parse its output
-            java.lang.Process lsof = Runtime.getRuntime().exec("lsof");
-            BufferedReader in = new BufferedReader(new InputStreamReader(lsof.getInputStream()), 2048);
-
-            String headerOutput = in.readLine();
-            StringTokenizer st = new StringTokenizer(headerOutput);
-            int token = 0;
-            while (st.hasMoreTokens()) {
-                String next = st.nextToken();
-                if (next.equalsIgnoreCase("PID"))
-                    pidColumn = token;
-                else if (next.equalsIgnoreCase("NAME"))
-                    nameColumn = token;
-                token++;
-            }
-
-            // alright, the rest are open file entries.
-            Map<Integer, String> pidNameMap = new TreeMap<Integer, String>();
-            String output = null;
-            while ((output = in.readLine()) != null) {
-                String[] split = output.split("\\s+");
-                if (split.length <= pidColumn || split.length <= nameColumn)
-                    continue;
-                final Integer pid = Integer.valueOf(split[pidColumn]);
-                String name = pidNameMap.get(pid);
-                if (name == null) {
-                    name = getAppNameByPID(pid.intValue());
-                    pidNameMap.put(pid, name);
-                }
-                String file = split[nameColumn];
-                if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(file) && file.startsWith(filter))
-                    Log.d(LOGTAG, "[OPENFILE] " + name + "(" + split[pidColumn] + ") : " + file);
-            }
-            in.close();
-        } catch (Exception e) { }
-    }
-
-    @WrapForJNI(stubName = "GetIconForExtensionWrapper")
-    public static byte[] getIconForExtension(String aExt, int iconSize) {
-        try {
-            if (iconSize <= 0)
-                iconSize = 16;
-
-            if (aExt != null && aExt.length() > 1 && aExt.charAt(0) == '.')
-                aExt = aExt.substring(1);
-
-            PackageManager pm = getApplicationContext().getPackageManager();
-            Drawable icon = getDrawableForExtension(pm, aExt);
-            if (icon == null) {
-                // Use a generic icon
-                icon = pm.getDefaultActivityIcon();
-            }
-
-            Bitmap bitmap = ((BitmapDrawable)icon).getBitmap();
-            if (bitmap.getWidth() != iconSize || bitmap.getHeight() != iconSize)
-                bitmap = Bitmap.createScaledBitmap(bitmap, iconSize, iconSize, true);
-
-            ByteBuffer buf = ByteBuffer.allocate(iconSize * iconSize * 4);
-            bitmap.copyPixelsToBuffer(buf);
-
-            return buf.array();
-        }
-        catch (Exception e) {
-            Log.w(LOGTAG, "getIconForExtension failed.",  e);
-            return null;
-        }
-    }
-
-    public static String getMimeTypeFromExtension(String ext) {
-        final MimeTypeMap mtm = MimeTypeMap.getSingleton();
-        return mtm.getMimeTypeFromExtension(ext);
-    }
-
-    private static Drawable getDrawableForExtension(PackageManager pm, String aExt) {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        final String mimeType = getMimeTypeFromExtension(aExt);
-        if (mimeType != null && mimeType.length() > 0)
-            intent.setType(mimeType);
-        else
-            return null;
-
-        List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);
-        if (list.size() == 0)
-            return null;
-
-        ResolveInfo resolveInfo = list.get(0);
-
-        if (resolveInfo == null)
-            return null;
-
-        ActivityInfo activityInfo = resolveInfo.activityInfo;
-
-        return activityInfo.loadIcon(pm);
-    }
-
-    @WrapForJNI
-    public static boolean getShowPasswordSetting() {
-        try {
-            int showPassword =
-                Settings.System.getInt(getApplicationContext().getContentResolver(),
-                                       Settings.System.TEXT_SHOW_PASSWORD, 1);
-            return (showPassword > 0);
-        }
-        catch (Exception e) {
-            return true;
-        }
-    }
-
-    @WrapForJNI(stubName = "AddPluginViewWrapper")
-    public static void addPluginView(View view,
-                                     float x, float y,
-                                     float w, float h,
-                                     boolean isFullScreen) {
-        if (getGeckoInterface() != null)
-             getGeckoInterface().addPluginView(view, new RectF(x, y, x + w, y + h), isFullScreen);
-    }
-
-    @WrapForJNI
-    public static void removePluginView(View view, boolean isFullScreen) {
-        if (getGeckoInterface() != null)
-            getGeckoInterface().removePluginView(view, isFullScreen);
-    }
-
-    /**
-     * A plugin that wish to be loaded in the WebView must provide this permission
-     * in their AndroidManifest.xml.
-     */
-    public static final String PLUGIN_ACTION = "android.webkit.PLUGIN";
-    public static final String PLUGIN_PERMISSION = "android.webkit.permission.PLUGIN";
-
-    private static final String PLUGIN_SYSTEM_LIB = "/system/lib/plugins/";
-
-    private static final String PLUGIN_TYPE = "type";
-    private static final String TYPE_NATIVE = "native";
-    public static final ArrayList<PackageInfo> mPackageInfoCache = new ArrayList<>();
-
-    // Returns null if plugins are blocked on the device.
-    static String[] getPluginDirectories() {
-
-        // Block on Pixel C.
-        if ((new File("/system/lib/hw/power.dragon.so")).exists()) {
-            Log.w(LOGTAG, "Blocking plugins because of Pixel C device (bug 1255122)");
-            return null;
-        }
-        // An awful hack to detect Tegra devices. Easiest way to do it without spinning up a EGL context.
-        boolean isTegra = (new File("/system/lib/hw/gralloc.tegra.so")).exists() ||
-                          (new File("/system/lib/hw/gralloc.tegra3.so")).exists() ||
-                          (new File("/sys/class/nvidia-gpu")).exists();
-        if (isTegra) {
-            // disable on KitKat (bug 957694)
-            if (Versions.feature19Plus) {
-                Log.w(LOGTAG, "Blocking plugins because of Tegra (bug 957694)");
-                return null;
-            }
-
-            // disable Flash on Tegra ICS with CM9 and other custom firmware (bug 736421)
-            final File vfile = new File("/proc/version");
-            try {
-                if (vfile.canRead()) {
-                    final BufferedReader reader = new BufferedReader(new FileReader(vfile));
-                    try {
-                        final String version = reader.readLine();
-                        if (version.indexOf("CM9") != -1 ||
-                            version.indexOf("cyanogen") != -1 ||
-                            version.indexOf("Nova") != -1) {
-                            Log.w(LOGTAG, "Blocking plugins because of Tegra 2 + unofficial ICS bug (bug 736421)");
-                            return null;
-                        }
-                    } finally {
-                      reader.close();
-                    }
-                }
-            } catch (IOException ex) {
-                // Do nothing.
-            }
-        }
-
-        ArrayList<String> directories = new ArrayList<String>();
-        PackageManager pm = getApplicationContext().getPackageManager();
-        List<ResolveInfo> plugins = pm.queryIntentServices(new Intent(PLUGIN_ACTION),
-                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
-
-        synchronized (mPackageInfoCache) {
-
-            // clear the list of existing packageInfo objects
-            mPackageInfoCache.clear();
-
-
-            for (ResolveInfo info : plugins) {
-
-                // retrieve the plugin's service information
-                ServiceInfo serviceInfo = info.serviceInfo;
-                if (serviceInfo == null) {
-                    Log.w(LOGTAG, "Ignoring bad plugin.");
-                    continue;
-                }
-
-                // Blacklist HTC's flash lite.
-                // See bug #704516 - We're not quite sure what Flash Lite does,
-                // but loading it causes Flash to give errors and fail to draw.
-                if (serviceInfo.packageName.equals("com.htc.flashliteplugin")) {
-                    Log.w(LOGTAG, "Skipping HTC's flash lite plugin");
-                    continue;
-                }
-
-
-                // Retrieve information from the plugin's manifest.
-                PackageInfo pkgInfo;
-                try {
-                    pkgInfo = pm.getPackageInfo(serviceInfo.packageName,
-                                    PackageManager.GET_PERMISSIONS
-                                    | PackageManager.GET_SIGNATURES);
-                } catch (Exception e) {
-                    Log.w(LOGTAG, "Can't find plugin: " + serviceInfo.packageName);
-                    continue;
-                }
-
-                if (pkgInfo == null) {
-                    Log.w(LOGTAG, "Not loading plugin: " + serviceInfo.packageName + ". Could not load package information.");
-                    continue;
-                }
-
-                /*
-                 * find the location of the plugin's shared library. The default
-                 * is to assume the app is either a user installed app or an
-                 * updated system app. In both of these cases the library is
-                 * stored in the app's data directory.
-                 */
-                String directory = pkgInfo.applicationInfo.dataDir + "/lib";
-                final int appFlags = pkgInfo.applicationInfo.flags;
-                final int updatedSystemFlags = ApplicationInfo.FLAG_SYSTEM |
-                                               ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
-
-                // preloaded system app with no user updates
-                if ((appFlags & updatedSystemFlags) == ApplicationInfo.FLAG_SYSTEM) {
-                    directory = PLUGIN_SYSTEM_LIB + pkgInfo.packageName;
-                }
-
-                // check if the plugin has the required permissions
-                String permissions[] = pkgInfo.requestedPermissions;
-                if (permissions == null) {
-                    Log.w(LOGTAG, "Not loading plugin: " + serviceInfo.packageName + ". Does not have required permission.");
-                    continue;
-                }
-                boolean permissionOk = false;
-                for (String permit : permissions) {
-                    if (PLUGIN_PERMISSION.equals(permit)) {
-                        permissionOk = true;
-                        break;
-                    }
-                }
-                if (!permissionOk) {
-                    Log.w(LOGTAG, "Not loading plugin: " + serviceInfo.packageName + ". Does not have required permission (2).");
-                    continue;
-                }
-
-                // check to ensure the plugin is properly signed
-                Signature signatures[] = pkgInfo.signatures;
-                if (signatures == null) {
-                    Log.w(LOGTAG, "Not loading plugin: " + serviceInfo.packageName + ". Not signed.");
-                    continue;
-                }
-
-                // determine the type of plugin from the manifest
-                if (serviceInfo.metaData == null) {
-                    Log.e(LOGTAG, "The plugin '" + serviceInfo.name + "' has no defined type.");
-                    continue;
-                }
-
-                String pluginType = serviceInfo.metaData.getString(PLUGIN_TYPE);
-                if (!TYPE_NATIVE.equals(pluginType)) {
-                    Log.e(LOGTAG, "Unrecognized plugin type: " + pluginType);
-                    continue;
-                }
-
-                try {
-                    Class<?> cls = getPluginClass(serviceInfo.packageName, serviceInfo.name);
-
-                    //TODO implement any requirements of the plugin class here!
-                    boolean classFound = true;
-
-                    if (!classFound) {
-                        Log.e(LOGTAG, "The plugin's class' " + serviceInfo.name + "' does not extend the appropriate class.");
-                        continue;
-                    }
-
-                } catch (NameNotFoundException e) {
-                    Log.e(LOGTAG, "Can't find plugin: " + serviceInfo.packageName);
-                    continue;
-                } catch (ClassNotFoundException e) {
-                    Log.e(LOGTAG, "Can't find plugin's class: " + serviceInfo.name);
-                    continue;
-                }
-
-                // if all checks have passed then make the plugin available
-                mPackageInfoCache.add(pkgInfo);
-                directories.add(directory);
-            }
-        }
-
-        return directories.toArray(new String[directories.size()]);
-    }
-
-    static String getPluginPackage(String pluginLib) {
-
-        if (pluginLib == null || pluginLib.length() == 0) {
-            return null;
-        }
-
-        synchronized (mPackageInfoCache) {
-            for (PackageInfo pkgInfo : mPackageInfoCache) {
-                if (pluginLib.contains(pkgInfo.packageName)) {
-                    return pkgInfo.packageName;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    static Class<?> getPluginClass(String packageName, String className)
-            throws NameNotFoundException, ClassNotFoundException {
-        Context pluginContext = getApplicationContext().createPackageContext(packageName,
-                Context.CONTEXT_INCLUDE_CODE |
-                Context.CONTEXT_IGNORE_SECURITY);
-        ClassLoader pluginCL = pluginContext.getClassLoader();
-        return pluginCL.loadClass(className);
-    }
-
-    @WrapForJNI(allowMultithread = true)
-    public static Class<?> loadPluginClass(String className, String libName) {
-        if (getGeckoInterface() == null)
-            return null;
-        try {
-            final String packageName = getPluginPackage(libName);
-            final int contextFlags = Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY;
-            final Context pluginContext = getApplicationContext().createPackageContext(
-                    packageName, contextFlags);
-            return pluginContext.getClassLoader().loadClass(className);
-        } catch (java.lang.ClassNotFoundException cnfe) {
-            Log.w(LOGTAG, "Couldn't find plugin class " + className, cnfe);
-            return null;
-        } catch (android.content.pm.PackageManager.NameNotFoundException nnfe) {
-            Log.w(LOGTAG, "Couldn't find package.", nnfe);
-            return null;
-        }
-    }
-
-    private static Context sApplicationContext;
-    private static ContextGetter sContextGetter;
-
-    @Deprecated
-    @WrapForJNI(allowMultithread = true)
-    public static Context getContext() {
-        return sContextGetter.getContext();
-    }
-
-    public static void setContextGetter(ContextGetter cg) {
-        sContextGetter = cg;
-    }
-
-    @WrapForJNI(allowMultithread = true)
-    public static Context getApplicationContext() {
-        return sApplicationContext;
-    }
-
-    public static void setApplicationContext(final Context context) {
-        sApplicationContext = context;
-    }
-
-    public static SharedPreferences getSharedPreferences() {
-        if (sContextGetter == null) {
-            throw new IllegalStateException("No ContextGetter; cannot fetch prefs.");
-        }
-        return sContextGetter.getSharedPreferences();
-    }
-
-    public interface AppStateListener {
-        public void onPause();
-        public void onResume();
-        public void onOrientationChanged();
-    }
-
-    public interface GeckoInterface {
-        public GeckoProfile getProfile();
-        public Activity getActivity();
-        public String getDefaultUAString();
-        public LocationListener getLocationListener();
-        public SensorEventListener getSensorEventListener();
-        public void doRestart();
-        public void setFullScreen(boolean fullscreen);
-        public void addPluginView(View view, final RectF rect, final boolean isFullScreen);
-        public void removePluginView(final View view, final boolean isFullScreen);
-        public void enableCameraView();
-        public void disableCameraView();
-        public void addAppStateListener(AppStateListener listener);
-        public void removeAppStateListener(AppStateListener listener);
-        public View getCameraView();
-        public void notifyWakeLockChanged(String topic, String state);
-        public void onInputMethodChanged(String inputMethod);
-        public boolean areTabsShown();
-        public AbsoluteLayout getPluginContainer();
-        public void notifyCheckUpdateResult(String result);
-        public void invalidateOptionsMenu();
-
-        /**
-         * Create a shortcut -- generally a home-screen icon -- linking the given title to the given URI.
-         * <p>
-         * This method is always invoked on the Gecko thread.
-         *
-         * @param title of URI to link to.
-         * @param URI to link to.
-         */
-        public void createShortcut(String title, String URI);
-
-        /**
-         * Check if the given URI is visited.
-         * <p/>
-         * If it has been visited, call {@link GeckoAppShell#notifyUriVisited(String)}.  (If it
-         * has not been visited, do nothing.)
-         * <p/>
-         * This method is always invoked on the Gecko thread.
-         *
-         * @param uri to check.
-         */
-        public void checkUriVisited(String uri);
-
-        /**
-         * Mark the given URI as visited in Gecko.
-         * <p/>
-         * Implementors may maintain some local store of visited URIs in order to be able to
-         * answer {@link #checkUriVisited(String)} requests affirmatively.
-         * <p/>
-         * This method is always invoked on the Gecko thread.
-         *
-         * @param uri to mark.
-         */
-        public void markUriVisited(final String uri);
-
-        /**
-         * Set the title of the given URI, as determined by Gecko.
-         * <p/>
-         * This method is always invoked on the Gecko thread.
-         *
-         * @param uri given.
-         * @param title to associate with the given URI.
-         */
-        public void setUriTitle(final String uri, final String title);
-
-        public void setAccessibilityEnabled(boolean enabled);
-
-        public boolean openUriExternal(String targetURI, String mimeType, String packageName, String className, String action, String title);
-
-        public String[] getHandlersForMimeType(String mimeType, String action);
-        public String[] getHandlersForURL(String url, String action);
-
-        /**
-         * URI of the underlying chrome window to be opened, or null to use the default GeckoView
-         * XUL container <tt>chrome://browser/content/geckoview.xul</tt>.  See
-         * <a href="https://developer.mozilla.org/en/docs/toolkit.defaultChromeURI">https://developer.mozilla.org/en/docs/toolkit.defaultChromeURI</a>
-         *
-         * @return URI or null.
-         */
-        String getDefaultChromeURI();
-    };
-
-    private static GeckoInterface sGeckoInterface;
-
-    public static GeckoInterface getGeckoInterface() {
-        return sGeckoInterface;
-    }
-
-    public static void setGeckoInterface(GeckoInterface aGeckoInterface) {
-        sGeckoInterface = aGeckoInterface;
-    }
-
-    public static android.hardware.Camera sCamera;
-
-    static native void cameraCallbackBridge(byte[] data);
-
-    static final int kPreferredFPS = 25;
-    static byte[] sCameraBuffer;
-
-
-    @WrapForJNI(stubName = "InitCameraWrapper")
-    static int[] initCamera(String aContentType, int aCamera, int aWidth, int aHeight) {
-        ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        if (getGeckoInterface() != null)
-                            getGeckoInterface().enableCameraView();
-                    } catch (Exception e) { }
-                }
-            });
-
-        // [0] = 0|1 (failure/success)
-        // [1] = width
-        // [2] = height
-        // [3] = fps
-        int[] result = new int[4];
-        result[0] = 0;
-
-        if (android.hardware.Camera.getNumberOfCameras() == 0) {
-            return result;
-        }
-
-        try {
-            sCamera = android.hardware.Camera.open(aCamera);
-
-            android.hardware.Camera.Parameters params = sCamera.getParameters();
-            params.setPreviewFormat(ImageFormat.NV21);
-
-            // use the preview fps closest to 25 fps.
-            int fpsDelta = 1000;
-            try {
-                Iterator<Integer> it = params.getSupportedPreviewFrameRates().iterator();
-                while (it.hasNext()) {
-                    int nFps = it.next();
-                    if (Math.abs(nFps - kPreferredFPS) < fpsDelta) {
-                        fpsDelta = Math.abs(nFps - kPreferredFPS);
-                        params.setPreviewFrameRate(nFps);
-                    }
-                }
-            } catch (Exception e) {
-                params.setPreviewFrameRate(kPreferredFPS);
-            }
-
-            // set up the closest preview size available
-            Iterator<android.hardware.Camera.Size> sit = params.getSupportedPreviewSizes().iterator();
-            int sizeDelta = 10000000;
-            int bufferSize = 0;
-            while (sit.hasNext()) {
-                android.hardware.Camera.Size size = sit.next();
-                if (Math.abs(size.width * size.height - aWidth * aHeight) < sizeDelta) {
-                    sizeDelta = Math.abs(size.width * size.height - aWidth * aHeight);
-                    params.setPreviewSize(size.width, size.height);
-                    bufferSize = size.width * size.height;
-                }
-            }
-
-            try {
-                if (getGeckoInterface() != null) {
-                    View cameraView = getGeckoInterface().getCameraView();
-                    if (cameraView instanceof SurfaceView) {
-                        sCamera.setPreviewDisplay(((SurfaceView)cameraView).getHolder());
-                    } else if (cameraView instanceof TextureView) {
-                        sCamera.setPreviewTexture(((TextureView)cameraView).getSurfaceTexture());
-                    }
-                }
-            } catch (IOException | RuntimeException e) {
-                Log.w(LOGTAG, "Error setPreviewXXX:", e);
-            }
-
-            sCamera.setParameters(params);
-            sCameraBuffer = new byte[(bufferSize * 12) / 8];
-            sCamera.addCallbackBuffer(sCameraBuffer);
-            sCamera.setPreviewCallbackWithBuffer(new android.hardware.Camera.PreviewCallback() {
-                @Override
-                public void onPreviewFrame(byte[] data, android.hardware.Camera camera) {
-                    cameraCallbackBridge(data);
-                    if (sCamera != null)
-                        sCamera.addCallbackBuffer(sCameraBuffer);
-                }
-            });
-            sCamera.startPreview();
-            params = sCamera.getParameters();
-            result[0] = 1;
-            result[1] = params.getPreviewSize().width;
-            result[2] = params.getPreviewSize().height;
-            result[3] = params.getPreviewFrameRate();
-        } catch (RuntimeException e) {
-            Log.w(LOGTAG, "initCamera RuntimeException.", e);
-            result[0] = result[1] = result[2] = result[3] = 0;
-        }
-        return result;
-    }
-
-    @WrapForJNI
-    static synchronized void closeCamera() {
-        ThreadUtils.postToUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        if (getGeckoInterface() != null)
-                            getGeckoInterface().disableCameraView();
-                    } catch (Exception e) { }
-                }
-            });
-        if (sCamera != null) {
-            sCamera.stopPreview();
-            sCamera.release();
-            sCamera = null;
-            sCameraBuffer = null;
-        }
-    }
-
-    /*
-     * Battery API related methods.
-     */
-    @WrapForJNI
-    public static void enableBatteryNotifications() {
-        GeckoBatteryManager.enableNotifications();
-    }
-
-    @WrapForJNI(stubName = "HandleGeckoMessageWrapper")
-    public static void handleGeckoMessage(final NativeJSContainer message) {
-        EventDispatcher.getInstance().dispatchEvent(message);
-        message.disposeNative();
-    }
-
-    @WrapForJNI
-    public static void disableBatteryNotifications() {
-        GeckoBatteryManager.disableNotifications();
-    }
-
-    @WrapForJNI(stubName = "GetCurrentBatteryInformationWrapper")
-    public static double[] getCurrentBatteryInformation() {
-        return GeckoBatteryManager.getCurrentInformation();
-    }
-
-    @WrapForJNI(stubName = "CheckURIVisited")
-    static void checkUriVisited(String uri) {
-        final GeckoInterface geckoInterface = getGeckoInterface();
-        if (geckoInterface == null) {
-            return;
-        }
-        geckoInterface.checkUriVisited(uri);
-    }
-
-    @WrapForJNI(stubName = "MarkURIVisited")
-    static void markUriVisited(final String uri) {
-        final GeckoInterface geckoInterface = getGeckoInterface();
-        if (geckoInterface == null) {
-            return;
-        }
-        geckoInterface.markUriVisited(uri);
-    }
-
-    @WrapForJNI(stubName = "SetURITitle")
-    static void setUriTitle(final String uri, final String title) {
-        final GeckoInterface geckoInterface = getGeckoInterface();
-        if (geckoInterface == null) {
-            return;
-        }
-        geckoInterface.setUriTitle(uri, title);
-    }
-
-    @WrapForJNI
-    static void hideProgressDialog() {
-        // unused stub
-    }
-
-    /*
-     * WebSMS related methods.
-     */
-    public static void sendMessage(String aNumber, String aMessage, int aRequestId, boolean aShouldNotify) {
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().send(aNumber, aMessage, aRequestId, aShouldNotify);
-    }
-
-    @WrapForJNI(stubName = "SendMessageWrapper")
-    public static void sendMessage(String aNumber, String aMessage, int aRequestId) {
-        sendMessage(aNumber, aMessage, aRequestId, /* shouldNotify */ true);
-    }
-
-    @WrapForJNI(stubName = "GetMessageWrapper")
-    public static void getMessage(int aMessageId, int aRequestId) {
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().getMessage(aMessageId, aRequestId);
-    }
-
-    @WrapForJNI(stubName = "DeleteMessageWrapper")
-    public static void deleteMessage(int aMessageId, int aRequestId) {
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().deleteMessage(aMessageId, aRequestId);
-    }
-
-    @WrapForJNI
-    public static void markMessageRead(int aMessageId, boolean aValue, boolean aSendReadReport, int aRequestId) {
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().markMessageRead(aMessageId, aValue, aSendReadReport, aRequestId);
-    }
-
-    @WrapForJNI(stubName = "CreateMessageCursorWrapper")
-    public static void createMessageCursor(long aStartDate, long aEndDate, String[] aNumbers, int aNumbersCount, String aDelivery, boolean aHasRead, boolean aRead, boolean aHasThreadId, long aThreadId, boolean aReverse, int aRequestId) {
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().createMessageCursor(aStartDate, aEndDate, aNumbers, aNumbersCount, aDelivery, aHasRead, aRead, aHasThreadId, aThreadId, aReverse, aRequestId);
-    }
-
-    @WrapForJNI(stubName = "GetNextMessageWrapper")
-    public static void getNextMessage(int aRequestId) {
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().getNextMessage(aRequestId);
-    }
-
-    @WrapForJNI(stubName = "CreateThreadCursorWrapper")
-    public static void createThreadCursor(int aRequestId) {
-        Log.i("GeckoAppShell", "CreateThreadCursorWrapper!");
-
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().createThreadCursor(aRequestId);
-    }
-
-    @WrapForJNI(stubName = "GetNextThreadWrapper")
-    public static void getNextThread(int aRequestId) {
-        if (!SmsManager.isEnabled()) {
-            return;
-        }
-
-        SmsManager.getInstance().getNextThread(aRequestId);
-    }
-
-    /* Called by JNI from AndroidBridge, and by reflection from tests/BaseTest.java.in */
-    @WrapForJNI
-    @RobocopTarget
-    public static boolean isTablet() {
-        return HardwareUtils.isTablet();
-    }
-
-    private static boolean sImeWasEnabledOnLastResize = false;
-    public static void viewSizeChanged() {
-        GeckoView v = (GeckoView) getLayerView();
-        if (v == null) {
-            return;
-        }
-        boolean imeIsEnabled = v.isIMEEnabled();
-        if (imeIsEnabled && !sImeWasEnabledOnLastResize) {
-            // The IME just came up after not being up, so let's scroll
-            // to the focused input.
-            notifyObservers("ScrollTo:FocusedInput", "");
-        }
-        sImeWasEnabledOnLastResize = imeIsEnabled;
-    }
-
-    @WrapForJNI(stubName = "GetCurrentNetworkInformationWrapper")
-    public static double[] getCurrentNetworkInformation() {
-        return GeckoNetworkManager.getInstance().getCurrentInformation();
-    }
-
-    @WrapForJNI
-    public static void enableNetworkNotifications() {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                GeckoNetworkManager.getInstance().enableNotifications();
-            }
-        });
-    }
-
-    @WrapForJNI
-    public static void disableNetworkNotifications() {
-        ThreadUtils.postToUiThread(new Runnable() {
-            @Override
-            public void run() {
-                GeckoNetworkManager.getInstance().disableNotifications();
-            }
-        });
-    }
-
-    @WrapForJNI(stubName = "GetScreenOrientationWrapper")
-    public static short getScreenOrientation() {
-        return GeckoScreenOrientation.getInstance().getScreenOrientation().value;
-    }
-
-    @WrapForJNI
-    public static int getScreenAngle() {
-        return GeckoScreenOrientation.getInstance().getAngle();
-    }
-
-    @WrapForJNI
-    public static void enableScreenOrientationNotifications() {
-        GeckoScreenOrientation.getInstance().enableNotifications();
-    }
-
-    @WrapForJNI
-    public static void disableScreenOrientationNotifications() {
-        GeckoScreenOrientation.getInstance().disableNotifications();
-    }
-
-    @WrapForJNI
-    public static void lockScreenOrientation(int aOrientation) {
-        GeckoScreenOrientation.getInstance().lock(aOrientation);
-    }
-
-    @WrapForJNI
-    public static void unlockScreenOrientation() {
-        GeckoScreenOrientation.getInstance().unlock();
-    }
-
-    @WrapForJNI
-    public static void notifyWakeLockChanged(String topic, String state) {
-        if (getGeckoInterface() != null)
-            getGeckoInterface().notifyWakeLockChanged(topic, state);
-    }
-
-    @WrapForJNI(allowMultithread = true)
-    public static void registerSurfaceTextureFrameListener(Object surfaceTexture, final int id) {
-        ((SurfaceTexture)surfaceTexture).setOnFrameAvailableListener(new SurfaceTexture.OnFrameAvailableListener() {
-            @Override
-            public void onFrameAvailable(SurfaceTexture surfaceTexture) {
-                GeckoAppShell.onSurfaceTextureFrameAvailable(surfaceTexture, id);
-            }
-        });
-    }
-
-    @WrapForJNI(allowMultithread = true)
-    public static void unregisterSurfaceTextureFrameListener(Object surfaceTexture) {
-        ((SurfaceTexture)surfaceTexture).setOnFrameAvailableListener(null);
-    }
-
-    @WrapForJNI
-    public static boolean unlockProfile() {
-        // Try to kill any zombie Fennec's that might be running
-        GeckoAppShell.killAnyZombies();
-
-        // Then force unlock this profile
-        if (getGeckoInterface() != null) {
-            GeckoProfile profile = getGeckoInterface().getProfile();
-            File lock = profile.getFile(".parentlock");
-            return lock.exists() && lock.delete();
-        }
-        return false;
-    }
-
-    @WrapForJNI(stubName = "GetProxyForURIWrapper")
-    public static String getProxyForURI(String spec, String scheme, String host, int port) {
-        final ProxySelector ps = new ProxySelector();
-
-        Proxy proxy = ps.select(scheme, host);
-        if (Proxy.NO_PROXY.equals(proxy)) {
-            return "DIRECT";
-        }
-
-        switch (proxy.type()) {
-            case HTTP:
-                return "PROXY " + proxy.address().toString();
-            case SOCKS:
-                return "SOCKS " + proxy.address().toString();
-        }
-
-        return "DIRECT";
-    }
-
-    @WrapForJNI(allowMultithread = true)
-    static InputStream createInputStream(URLConnection connection) throws IOException {
-        return connection.getInputStream();
-    }
-
-    private static class BitmapConnection extends URLConnection {
-        private Bitmap bitmap;
-
-        BitmapConnection(Bitmap b) throws MalformedURLException, IOException {
-            super(null);
-            bitmap = b;
-        }
-
-        @Override
-        public void connect() {}
-
-        @Override
-        public InputStream getInputStream() throws IOException {
-            return new BitmapInputStream();
-        }
-
-        @Override
-        public String getContentType() {
-            return "image/png";
-        }
-
-        private final class BitmapInputStream extends PipedInputStream {
-            private boolean mHaveConnected = false;
-
-            @Override
-            public synchronized int read(byte[] buffer, int byteOffset, int byteCount)
-                                    throws IOException {
-                if (mHaveConnected) {
-                    return super.read(buffer, byteOffset, byteCount);
-                }
-
-                final PipedOutputStream output = new PipedOutputStream();
-                connect(output);
-                ThreadUtils.postToBackgroundThread(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                bitmap.compress(Bitmap.CompressFormat.PNG, 100, output);
-                                output.close();
-                            } catch (IOException ioe) { }
-                        }
-                    });
-                mHaveConnected = true;
-                return super.read(buffer, byteOffset, byteCount);
-            }
-        }
-    }
-
-    @WrapForJNI(allowMultithread = true, narrowChars = true)
-    static URLConnection getConnection(String url) {
-        try {
-            String spec;
-            if (url.startsWith("android://")) {
-                spec = url.substring(10);
-            } else {
-                spec = url.substring(8);
-            }
-
-            // Check if we are loading a package icon.
-            try {
-                if (spec.startsWith("icon/")) {
-                    String[] splits = spec.split("/");
-                    if (splits.length != 2) {
-                        return null;
-                    }
-                    final String pkg = splits[1];
-                    final PackageManager pm = getApplicationContext().getPackageManager();
-                    final Drawable d = pm.getApplicationIcon(pkg);
-                    final Bitmap bitmap = BitmapUtils.getBitmapFromDrawable(d);
-                    return new BitmapConnection(bitmap);
-                }
-            } catch (Exception ex) {
-                Log.e(LOGTAG, "error", ex);
-            }
-
-            // if the colon got stripped, put it back
-            int colon = spec.indexOf(':');
-            if (colon == -1 || colon > spec.indexOf('/')) {
-                spec = spec.replaceFirst("/", ":/");
-            }
-        } catch (Exception ex) {
-            return null;
-        }
-        return null;
-    }
-
-    @WrapForJNI(allowMultithread = true, narrowChars = true)
-    static String connectionGetMimeType(URLConnection connection) {
-        return connection.getContentType();
-    }
-
-    /**
-     * Retrieve the absolute path of an external storage directory.
-     *
-     * @param type The type of directory to return
-     * @return Absolute path of the specified directory or null on failure
-     */
-    @WrapForJNI
-    static String getExternalPublicDirectory(final String type) {
-        final String state = Environment.getExternalStorageState();
-        if (!Environment.MEDIA_MOUNTED.equals(state) &&
-            !Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
-            // External storage is not available.
-            return null;
-        }
-
-        if ("sdcard".equals(type)) {
-            // SD card has a separate path.
-            return Environment.getExternalStorageDirectory().getAbsolutePath();
-        }
-
-        final String systemType;
-        if ("downloads".equals(type)) {
-            systemType = Environment.DIRECTORY_DOWNLOADS;
-        } else if ("pictures".equals(type)) {
-            systemType = Environment.DIRECTORY_PICTURES;
-        } else if ("videos".equals(type)) {
-            systemType = Environment.DIRECTORY_MOVIES;
-        } else if ("music".equals(type)) {
-            systemType = Environment.DIRECTORY_MUSIC;
-        } else if ("apps".equals(type)) {
-            File appInternalStorageDirectory = getApplicationContext().getFilesDir();
-            return new File(appInternalStorageDirectory, "mozilla").getAbsolutePath();
-        } else {
-            return null;
-        }
-        return Environment.getExternalStoragePublicDirectory(systemType).getAbsolutePath();
-    }
-
-    @WrapForJNI
-    static int getMaxTouchPoints() {
-        PackageManager pm = getApplicationContext().getPackageManager();
-        if (pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND)) {
-            // at least, 5+ fingers.
-            return 5;
-        } else if (pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT)) {
-            // at least, 2+ fingers.
-            return 2;
-        } else if (pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH)) {
-            // 2 fingers
-            return 2;
-        } else if (pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)) {
-            // 1 finger
-            return 1;
-        }
-        return 0;
-    }
-
-    public static synchronized void resetScreenSize() {
-        sScreenSize = null;
-    }
-
-    @WrapForJNI
-    public static synchronized Rect getScreenSize() {
-        if (sScreenSize == null) {
-            final WindowManager wm = (WindowManager)
-                    getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
-            final Display disp = wm.getDefaultDisplay();
-            sScreenSize = new Rect(0, 0, disp.getWidth(), disp.getHeight());
-        }
-        return sScreenSize;
-    }
-}