author | Jim Chen <nchen@mozilla.com> |
Wed, 15 Feb 2017 20:22:12 -0500 | |
changeset 343232 | 0cdc48673b0c5499003e7d7ef4f99d87ff2720b5 |
parent 343231 | 6ea939aba89430a4844c1fbbacb0a0c00dfd9cda |
child 343233 | 36663347138dc227d190bdec9b469821058cf176 |
push id | 31372 |
push user | cbook@mozilla.com |
push date | Thu, 16 Feb 2017 12:16:10 +0000 |
treeherder | mozilla-central@2737f66ad6ac [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | me |
bugs | 1339160 |
milestone | 54.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoProfile.java @@ -445,32 +445,32 @@ public final class GeckoProfile { * possible the format of this file (and the access calls in the jsm) will change, leaving * this code to fail. There are tests in TestGeckoProfile to verify the file format but be * warned: THIS IS NOT FOOLPROOF. * * [1]: https://dxr.mozilla.org/mozilla-central/source/toolkit/modules/ClientID.jsm * * @throws IOException if the client ID could not be retrieved. */ - // Mimics ClientID.jsm – _doLoadClientID. + // Mimics ClientID.jsm - _doLoadClientID. @WorkerThread public String getClientId() throws IOException { try { return getValidClientIdFromDisk(CLIENT_ID_FILE_PATH); } catch (final IOException e) { // Avoid log spam: don't log the full Exception w/ the stack trace. Log.d(LOGTAG, "Could not get client ID - attempting to migrate ID from FHR: " + e.getLocalizedMessage()); } String clientIdToWrite; try { clientIdToWrite = getValidClientIdFromDisk(FHR_CLIENT_ID_FILE_PATH); } catch (final IOException e) { // Avoid log spam: don't log the full Exception w/ the stack trace. - Log.d(LOGTAG, "Could not migrate client ID from FHR – creating a new one: " + e.getLocalizedMessage()); + Log.d(LOGTAG, "Could not migrate client ID from FHR - creating a new one: " + e.getLocalizedMessage()); clientIdToWrite = generateNewClientId(); } // There is a possibility Gecko is running and the Gecko telemetry implementation decided it's time to generate // the client ID, writing client ID underneath us. Since it's highly unlikely (e.g. we run in onStart before // Gecko is started), we don't handle that possibility besides writing the ID and then reading from the file // again (rather than just returning the value we generated before writing). //
--- a/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java +++ b/mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java @@ -39,17 +39,17 @@ public class GeckoViewActivity extends A } @Override protected void onStart() { super.onStart(); final GeckoProfile profile = GeckoProfile.get(getApplicationContext()); - GeckoThread.init(profile, /* args */ null, /* action */ null, /* debugging */ false); + GeckoThread.initMainProcess(profile, /* args */ null, /* debugging */ false); GeckoThread.launch(); } private class MyGeckoViewChrome implements GeckoView.ChromeDelegate { @Override public void onAlert(GeckoView view, String message, GeckoView.PromptResult result) { Log.i(LOGTAG, "Alert!"); result.confirm();