1098082 - Merge identical catch blocks

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Chris Kitching [:ckitching]]

Multi-catch FTW...

Comment 1

[Chris Kitching [:ckitching]]

Attachment: Merge identical catch branches

Comment 2

[Richard Newman [:rnewman]]

Comment on attachment 8521884 [details] [diff] [review]
Merge identical catch branches

Review of attachment 8521884 [details] [diff] [review]:
-----------------------------------------------------------------

Hooray!

Don't forget to upstream necessary changes.

::: mobile/android/base/GeckoAppShell.java
@@ +1850,5 @@
>      private static final String PLUGIN_SYSTEM_LIB = "/system/lib/plugins/";
>  
>      private static final String PLUGIN_TYPE = "type";
>      private static final String TYPE_NATIVE = "native";
> +    static public final ArrayList<PackageInfo> mPackageInfoCache = new ArrayList<>();

If you're breaking blame like this, also fix the order -- public static final.

@@ +2126,5 @@
>      public static android.hardware.Camera sCamera;
>  
>      static native void cameraCallbackBridge(byte[] data);
>  
> +    static final int kPreferedFps = 25;

Fix to kPreferredFPS while you're here.

@@ +2196,5 @@
>                      } else if (cameraView instanceof TextureView) {
>                          sCamera.setPreviewTexture(((TextureView)cameraView).getSurfaceTexture());
>                      }
>                  }
> +            } catch(IOException | RuntimeException e) {

Space before (.

::: mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
@@ +277,3 @@
>          }
>  
> +          long lastLocalRetrieval  = 0;      // lastSyncTimestamp?

Fix indenting, remove duplicate space before =.

::: mobile/android/base/widget/ActivityChooserModel.java
@@ +1187,5 @@
>  
>                  if (DEBUG) {
>                      Log.i(LOG_TAG, "Wrote " + recordCount + " historical records.");
>                  }
> +            } catch (IllegalArgumentException | IOException | IllegalStateException iae) {

Rename the var, too.

Comment 3

[Chris Kitching [:ckitching]]

(In reply to Richard Newman [:rnewman] from comment #2)
> ::: mobile/android/base/GeckoAppShell.java
> @@ +1850,5 @@
> >      private static final String PLUGIN_SYSTEM_LIB = "/system/lib/plugins/";
> >  
> >      private static final String PLUGIN_TYPE = "type";
> >      private static final String TYPE_NATIVE = "native";
> > +    static public final ArrayList<PackageInfo> mPackageInfoCache = new ArrayList<>();
> 
> If you're breaking blame like this, also fix the order -- public static
> final.

Hnh, some finalisations got applied as well. Oh well, might as well keep them...

See also: Bug 1081594

Comment 4

[Chris Kitching [:ckitching]]

https://hg.mozilla.org/integration/fx-team/rev/64a320318bf9

Comment 5

[Chris Kitching [:ckitching]]

https://github.com/mozilla-services/android-sync/pull/506

Comment 6

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

Backed out in https://hg.mozilla.org/integration/fx-team/rev/e4712f6c8a33 for build bustage:

https://treeherder.mozilla.org/ui/logviewer.html#?job_id=1179985&repo=fx-team

Comment 7

[Richard Newman [:rnewman]]

https://hg.mozilla.org/integration/fx-team/rev/13f4001fe317

Comment 8

[Richard Newman [:rnewman]]

(Chris introduced some errors between review and landing. This commit built on my machine.)

Comment 9

[Chris Kitching [:ckitching]]

:(

Thanks for the save, rnewman.

Comment 10

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/13f4001fe317

Comment 11

[Richard Newman [:rnewman]]

Chris: no more pull requests without you having run `mvn clean test`. You broke the build with source that didn't even compile.

Comment 12

[Richard Newman [:rnewman]]

https://hg.mozilla.org/integration/fx-team/rev/f4fc6de9630d

Comment 13

[Chris Kitching [:ckitching]]

(In reply to Richard Newman [:rnewman] from comment #11)
> Chris: no more pull requests without you having run `mvn clean test`. You
> broke the build with source that didn't even compile.

ACK.

Comment 14

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/f4fc6de9630d