author | Wes Johnston <wjohnston@mozilla.com> |
Wed, 03 Sep 2014 09:27:38 -0700 | |
changeset 203428 | 16d4b2727467eaac79f1f049c1c97a4419e4e047 |
parent 203427 | b5a85757ac0eeb09f94029b6527ade7cac9b7f52 |
child 203429 | a8f37943e690e3c0f2f55eb34bb67e2c946e032b |
push id | 48665 |
push user | ryanvm@gmail.com |
push date | Wed, 03 Sep 2014 20:40:15 +0000 |
treeherder | mozilla-inbound@0da762e6868a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | rnewman |
bugs | 1061936 |
milestone | 35.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
|
mobile/android/base/BrowserApp.java | file | annotate | diff | comparison | revisions | |
mobile/android/base/GeckoApp.java | file | annotate | diff | comparison | revisions |
--- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -630,17 +630,17 @@ public class BrowserApp extends GeckoApp IconDirectoryEntry.setMaxBPP(GeckoAppShell.getScreenDepth()); Class<?> mediaManagerClass = getMediaPlayerManager(); if (mediaManagerClass != null) { try { Method init = mediaManagerClass.getMethod("init", Context.class); init.invoke(null, this); } catch(Exception ex) { - Log.i(LOGTAG, "Error initializing media manager", ex); + Log.e(LOGTAG, "Error initializing media manager", ex); } } } private void registerOnboardingReceiver(Context context) { final LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this); // Receiver for launching first run start pane on new profile creation. @@ -660,17 +660,17 @@ public class BrowserApp extends GeckoApp } private Class<?> getMediaPlayerManager() { if (AppConstants.MOZ_MEDIA_PLAYER) { try { return Class.forName("org.mozilla.gecko.MediaPlayerManager"); } catch(Exception ex) { // Ignore failures - Log.i(LOGTAG, "No native casting support", ex); + Log.e(LOGTAG, "No native casting support", ex); } } return null; } @Override @@ -882,17 +882,17 @@ public class BrowserApp extends GeckoApp if (itemId == R.id.subscribe) { // This can be selected from either the browser menu or the contextmenu, depending on the size and version (v11+) of the phone. Tab tab = Tabs.getInstance().getSelectedTab(); if (tab != null && tab.hasFeeds()) { JSONObject args = new JSONObject(); try { args.put("tabId", tab.getId()); } catch (JSONException e) { - Log.e(LOGTAG, "error building json arguments"); + Log.e(LOGTAG, "error building json arguments", e); } GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Feeds:Subscribe", args.toString())); if (Versions.preHC) { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.CONTEXT_MENU, "subscribe"); } } return true; } @@ -900,17 +900,17 @@ public class BrowserApp extends GeckoApp if (itemId == R.id.add_search_engine) { // This can be selected from either the browser menu or the contextmenu, depending on the size and version (v11+) of the phone. Tab tab = Tabs.getInstance().getSelectedTab(); if (tab != null && tab.hasOpenSearch()) { JSONObject args = new JSONObject(); try { args.put("tabId", tab.getId()); } catch (JSONException e) { - Log.e(LOGTAG, "error building json arguments"); + Log.e(LOGTAG, "error building json arguments", e); return true; } GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("SearchEngines:Add", args.toString())); if (Versions.preHC) { Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.CONTEXT_MENU, "add_search_engine"); } } @@ -1026,17 +1026,17 @@ public class BrowserApp extends GeckoApp } Class<?> mediaManagerClass = getMediaPlayerManager(); if (mediaManagerClass != null) { try { Method destroy = mediaManagerClass.getMethod("onDestroy", (Class[]) null); destroy.invoke(null); } catch(Exception ex) { - Log.i(LOGTAG, "Error destroying media manager", ex); + Log.e(LOGTAG, "Error destroying media manager", ex); } } super.onDestroy(); } @Override protected void initializeChrome() { @@ -1887,28 +1887,25 @@ public class BrowserApp extends GeckoApp * * @param engine * a search engine instance. Can be null. * @param where * where the search was initialized; one of the values in * {@link BrowserHealthRecorder#SEARCH_LOCATIONS}. */ private static void recordSearch(SearchEngine engine, String where) { - Log.i(LOGTAG, "Recording search: " + - ((engine == null) ? "null" : engine.name) + - ", " + where); try { String identifier = (engine == null) ? "other" : engine.getEngineIdentifier(); JSONObject message = new JSONObject(); message.put("type", BrowserHealthRecorder.EVENT_SEARCH); message.put("location", where); message.put("identifier", identifier); EventDispatcher.getInstance().dispatchEvent(message, null); } catch (Exception e) { - Log.w(LOGTAG, "Error recording search.", e); + Log.e(LOGTAG, "Error recording search.", e); } } /** * Store search query in SearchHistoryProvider. * * @param query * a search query to store. We won't store empty queries. @@ -2292,17 +2289,16 @@ public class BrowserApp extends GeckoApp } } MenuItem item = destination.add(Menu.NONE, info.id, Menu.NONE, info.label); item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { - Log.i(LOGTAG, "Menu item clicked"); GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Menu:Clicked", Integer.toString(info.id - ADDON_MENU_OFFSET))); return true; } }); if (info.icon == null) { item.setIcon(R.drawable.ic_menu_addons_filler); } else { @@ -2737,17 +2733,17 @@ public class BrowserApp extends GeckoApp Tab selectedTab = Tabs.getInstance().getSelectedTab(); if (selectedTab == null) return true; JSONObject args = new JSONObject(); try { args.put("desktopMode", !item.isChecked()); args.put("tabId", selectedTab.getId()); } catch (JSONException e) { - Log.e(LOGTAG, "error building json arguments"); + Log.e(LOGTAG, "error building json arguments", e); } GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("DesktopMode:Change", args.toString())); return true; } if (itemId == R.id.new_tab) { addTab(); return true;
--- a/mobile/android/base/GeckoApp.java +++ b/mobile/android/base/GeckoApp.java @@ -1217,17 +1217,16 @@ public abstract class GeckoApp Bundle stateBundle = getIntent().getBundleExtra(EXTRA_STATE_BUNDLE); if (stateBundle != null) { // Use the state bundle if it was given as an intent extra. This is // only intended to be used internally via Robocop, so a boolean // is read from a private shared pref to prevent other apps from // injecting states. final SharedPreferences prefs = getSharedPreferences(); if (prefs.getBoolean(PREFS_ALLOW_STATE_BUNDLE, false)) { - Log.i(LOGTAG, "Restoring state from intent bundle"); prefs.edit().remove(PREFS_ALLOW_STATE_BUNDLE).apply(); savedInstanceState = stateBundle; } } else if (savedInstanceState != null) { // Bug 896992 - This intent has already been handled; reset the intent. setIntent(new Intent(Intent.ACTION_MAIN)); } @@ -1281,17 +1280,16 @@ public abstract class GeckoApp editor.apply(); // The lifecycle of mHealthRecorder is "shortly after onCreate" // through "onDestroy" -- essentially the same as the lifecycle // of the activity itself. final String profilePath = getProfile().getDir().getAbsolutePath(); final EventDispatcher dispatcher = EventDispatcher.getInstance(); - Log.i(LOGTAG, "Creating HealthRecorder."); final String osLocale = Locale.getDefault().toString(); String appLocale = localeManager.getAndApplyPersistedLocale(GeckoApp.this); Log.d(LOGTAG, "OS locale is " + osLocale + ", app locale is " + appLocale); if (appLocale == null) { appLocale = osLocale; } @@ -2230,24 +2228,21 @@ public abstract class GeckoApp // Reduce device storage footprint by removing .ttf files from // the res/fonts directory: we no longer need to copy our // bundled fonts out of the APK in order to use them. // See https://bugzilla.mozilla.org/show_bug.cgi?id=878674. File dir = new File("res/fonts"); if (dir.exists() && dir.isDirectory()) { for (File file : dir.listFiles()) { if (file.isFile() && file.getName().endsWith(".ttf")) { - Log.i(LOGTAG, "deleting " + file.toString()); file.delete(); } } if (!dir.delete()) { Log.w(LOGTAG, "unable to delete res/fonts directory (not empty?)"); - } else { - Log.i(LOGTAG, "res/fonts directory deleted"); } } } // Additional cleanup needed for future versions would go here if (cleanupVersion != CURRENT_CLEANUP_VERSION) { SharedPreferences.Editor editor = GeckoApp.this.getSharedPreferences().edit(); @@ -2572,17 +2567,16 @@ public abstract class GeckoApp }); } /** * Use BrowserLocaleManager to change our persisted and current locales, * and poke HealthRecorder to tell it of our changed state. */ protected void setLocale(final String locale) { - Log.d(LOGTAG, "setLocale: " + locale); if (locale == null) { return; } final String resultant = BrowserLocaleManager.getInstance().setSelectedLocale(this, locale); if (resultant == null) { return; }