[infer][java] remove no longer required fields in the models for Java

Summary:
@public
The models for Java no longer require to keep the original fields since we now make the union of the fields from the models and the fields from the code to analyze.

Test Plan: Infer CI. No functional change intended.

infer/models/java/src/android/app/Activity.java

@@ -1,40 +1,15 @@
 /*
-* Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
-*
+* All rights reserved.
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
 */
 
 package android.app;
 
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
 import android.content.res.TypedArray;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.text.SpannableStringBuilder;
-import android.util.ArrayMap;
 import android.util.AttributeSet;
-import android.util.SparseArray;
+import android.view.ContextThemeWrapper;
-import android.view.*;
-import com.android.internal.app.ActionBarImpl;
-import com.facebook.infer.models.InferUndefined;
 
-import java.util.ArrayList;
+import com.facebook.infer.models.InferUndefined;
-import java.util.HashMap;
 
 public abstract class Activity extends ContextThemeWrapper {
 

infer/models/java/src/android/app/DownloadManager.java

@@ -1,25 +1,12 @@
 /*
- * Copyright (C) 2010 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.app;
 
 import android.content.ContentResolver;
 import android.database.Cursor;
-import android.net.Uri;
-
 
 public class DownloadManager {
 

infer/models/java/src/android/content/ContentProviderClient.java

@@ -1,53 +1,32 @@
 /*
- * Copyright (C) 2009 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.content;
 
+import com.facebook.infer.models.InferBuiltins;
+import com.facebook.infer.models.InferUndefined;
+
 import android.database.Cursor;
 import android.database.sqlite.SQLiteCursor;
 import android.net.Uri;
 import android.os.CancellationSignal;
-import android.os.Handler;
 import android.os.RemoteException;
-import dalvik.system.CloseGuard;
 
 
 public class ContentProviderClient {
-    private static String TAG;
-
-    private static Handler sAnrHandler;
 
     private ContentResolver mContentResolver;
     private IContentProvider mContentProvider;
     private String mPackageName;
     private boolean mStable;
 
-    private CloseGuard mGuard;
-
-    private long mAnrTimeout;
-    private NotRespondingRunnable mAnrRunnable;
-
-    private boolean mReleased;
-
-
     ContentProviderClient(
             ContentResolver contentResolver, IContentProvider contentProvider, boolean stable) {
         mContentResolver = contentResolver;
         mContentProvider = contentProvider;
-        mPackageName = contentResolver.mPackageName;
+        mPackageName = InferUndefined.string_undefined();
         mStable = stable;
     }
 

infer/models/java/src/android/content/ContentResolver.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.content;
 
@@ -23,92 +12,15 @@ import android.os.CancellationSignal;
 
 import com.facebook.infer.models.InferUndefined;
 
-import java.util.Random;
-
 
 public class ContentResolver {
 
-    public static String SYNC_EXTRAS_ACCOUNT;
+    private final Context mContext;
-
-    public static String SYNC_EXTRAS_EXPEDITED;
-
-    public static String SYNC_EXTRAS_FORCE;
-
-    public static String SYNC_EXTRAS_IGNORE_SETTINGS;
-
-    public static String SYNC_EXTRAS_IGNORE_BACKOFF;
-
-    public static String SYNC_EXTRAS_DO_NOT_RETRY;
-
-    public static String SYNC_EXTRAS_MANUAL;
-
-    public static String SYNC_EXTRAS_UPLOAD;
-
-    public static String SYNC_EXTRAS_OVERRIDE_TOO_MANY_DELETIONS;
-
-    public static String SYNC_EXTRAS_DISCARD_LOCAL_DELETIONS;
-
-    public static String SYNC_EXTRAS_EXPECTED_UPLOAD;
-
-    public static String SYNC_EXTRAS_EXPECTED_DOWNLOAD;
-
-    public static String SYNC_EXTRAS_PRIORITY;
-
-    public static String SYNC_EXTRAS_DISALLOW_METERED;
-
-    public static String SYNC_EXTRAS_INITIALIZE;
-
-    public static Intent ACTION_SYNC_CONN_STATUS_CHANGED;
-
-    public static String SCHEME_CONTENT;
-    public static String SCHEME_ANDROID_RESOURCE;
-    public static String SCHEME_FILE;
-
-    public static String CURSOR_ITEM_BASE_TYPE;
-
-    public static String CURSOR_DIR_BASE_TYPE;
-
-    public static int SYNC_ERROR_SYNC_ALREADY_IN_PROGRESS;
-
-    public static int SYNC_ERROR_AUTHENTICATION;
-
-    public static int SYNC_ERROR_IO;
-
-    public static int SYNC_ERROR_PARSE;
-
-    public static int SYNC_ERROR_CONFLICT;
-
-    public static int SYNC_ERROR_TOO_MANY_DELETIONS;
-
-    public static int SYNC_ERROR_TOO_MANY_RETRIES;
-
-    public static int SYNC_ERROR_INTERNAL;
-
-    private static String[] SYNC_ERROR_NAMES;
-
-    public static int SYNC_OBSERVER_TYPE_SETTINGS;
-    public static int SYNC_OBSERVER_TYPE_PENDING;
-    public static int SYNC_OBSERVER_TYPE_ACTIVE;
-
-    public static int SYNC_OBSERVER_TYPE_STATUS;
-
-    public static int SYNC_OBSERVER_TYPE_ALL;
-
-    private static boolean ENABLE_CONTENT_SAMPLE;
-    private static int SLOW_THRESHOLD_MILLIS;
-    private Random mRandom;
 
     public ContentResolver(Context context) {
         mContext = context;
     }
 
-    public static String CONTENT_SERVICE_NAME;
-
-    private static IContentService sContentService;
-    private final Context mContext;
-    String mPackageName;
-    private static String TAG;
-
     public final Cursor query(Uri uri, String[] projection,
                               String selection, String[] selectionArgs, String sortOrder) {
         if (InferUndefined.boolean_undefined()) {

infer/models/java/src/android/content/Context.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.content;
 
@@ -22,39 +11,6 @@ import com.facebook.infer.models.InferUndefined;
 
 public class Context {
 
-    public static int MODE_PRIVATE;
-
-    public static int MODE_WORLD_READABLE;
-
-    public static int MODE_WORLD_WRITEABLE;
-
-    public static int MODE_APPEND;
-
-    public static int MODE_MULTI_PROCESS;
-
-    public static int MODE_ENABLE_WRITE_AHEAD_LOGGING;
-
-    public static int BIND_AUTO_CREATE;
-
-    public static int BIND_DEBUG_UNBIND;
-
-    public static int BIND_NOT_FOREGROUND;
-
-    public static int BIND_ABOVE_CLIENT;
-
-    public static int BIND_ALLOW_OOM_MANAGEMENT;
-
-    public static int BIND_WAIVE_PRIORITY;
-
-    public static int BIND_IMPORTANT;
-
-    public static int BIND_ADJUST_WITH_ACTIVITY;
-
-    public static int BIND_VISIBLE;
-
-    public static int BIND_SHOWING_UI;
-
-    public static int BIND_NOT_VISIBLE;
 
     public ContentResolver getContentResolver() {
         return new ContentResolver(this);

infer/models/java/src/android/content/IContentProvider.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.content;
 

infer/models/java/src/android/content/IContentService.java

@@ -1,5 +1,9 @@
-package android.content;
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
 
+package android.content;
 
 public interface IContentService {
 }

infer/models/java/src/android/content/res/Resources.java

@@ -1,73 +1,17 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.content.res;
 
-import android.graphics.drawable.Drawable;
-import android.os.IBinder;
 import android.util.AttributeSet;
-import android.util.DisplayMetrics;
+
-import android.util.LongSparseArray;
-import android.util.TypedValue;
 import com.facebook.infer.models.InferUndefined;
-import libcore.icu.NativePluralRules;
 
-import java.lang.ref.WeakReference;
 
 public class Resources {
-    static String TAG;
-    private static boolean DEBUG_LOAD;
-    private static boolean DEBUG_CONFIG;
-    private static boolean DEBUG_ATTRIBUTES_CACHE;
-    private static boolean TRACE_FOR_PRELOAD;
-    private static boolean TRACE_FOR_MISS_PRELOAD;
-
-    private static int ID_OTHER;
-
-    private static Object sSync;
-
-    private static LongSparseArray<Drawable.ConstantState>[] sPreloadedDrawables;
-    private static LongSparseArray<Drawable.ConstantState> sPreloadedColorDrawables;
-    private static LongSparseArray<ColorStateList> sPreloadedColorStateLists;
-
-    private static boolean sPreloaded;
-    private static int sPreloadedDensity;
 
-    Object mAccessLock;
-    Configuration mTmpConfig;
-    TypedValue mTmpValue;
-    LongSparseArray<WeakReference<Drawable.ConstantState>> mDrawableCache;
-    LongSparseArray<WeakReference<ColorStateList>> mColorStateListCache;
-    LongSparseArray<WeakReference<Drawable.ConstantState>> mColorDrawableCache;
-    boolean mPreloading;
-
-    TypedArray mCachedStyledAttributes;
-    RuntimeException mLastRetrievedAttrs;
-
-    private int mLastCachedXmlBlockIndex;
-    private int[] mCachedXmlBlockIds;
-    private XmlBlock[] mCachedXmlBlocks;
-
-    AssetManager mAssets;
-    private Configuration mConfiguration;
-    DisplayMetrics mMetrics;
-    private NativePluralRules mPluralRule;
-
-    private CompatibilityInfo mCompatibilityInfo;
-    private WeakReference<IBinder> mToken;
 
     public final class Theme {
         public TypedArray obtainStyledAttributes(int[] attrs) {
@@ -102,6 +46,4 @@ public class Resources {
         return new TypedArray(null, attrs, attrs, 1);
     }
 
-    static private int LAYOUT_DIR_CONFIG;
+}
-
-}

infer/models/java/src/android/content/res/TypedArray.java

@@ -1,22 +1,10 @@
 /*
- * Copyright (C) 2008 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.content.res;
 
-import android.util.TypedValue;
 import com.facebook.infer.models.InferBuiltins;
 
 public class TypedArray {
@@ -25,7 +13,6 @@ public class TypedArray {
     int[] mData;
     int[] mIndices;
     int mLength;
-    TypedValue mValue = new TypedValue();
 
     public void recycle() {
         // Release resource

infer/models/java/src/android/database/AbstractCursor.java

@@ -1,20 +1,9 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database;
 
 public abstract class AbstractCursor extends CrossProcessCursor {
-}
+}

infer/models/java/src/android/database/CrossProcessCursor.java

@@ -1,20 +1,9 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database;
 
 public class CrossProcessCursor extends Cursor {
-}
+}

infer/models/java/src/android/database/CrossProcessCursorWrapper.java

@@ -1,20 +1,9 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database;
 
 public abstract class CrossProcessCursorWrapper extends CrossProcessCursor {
-}
+}

infer/models/java/src/android/database/CursorWrapper.java

@@ -5,7 +5,6 @@
 
 package android.database;
 
-import android.database.sqlite.SQLiteCursor;
 
 public class CursorWrapper extends Cursor {
   protected final Cursor mCursor;

infer/models/java/src/android/database/sqlite/SQLiteConnectionPool.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2011 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database.sqlite;
 

infer/models/java/src/android/database/sqlite/SQLiteCursor.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database.sqlite;
 

infer/models/java/src/android/database/sqlite/SQLiteDatabase.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database.sqlite;
 
@@ -20,12 +9,6 @@ import android.database.Cursor;
 import android.database.DatabaseErrorHandler;
 import android.os.CancellationSignal;
 
-import com.facebook.infer.models.InferUndefined;
-
-import dalvik.system.CloseGuard;
-
-import java.util.WeakHashMap;
-
 
 public final class SQLiteDatabase {
 

infer/models/java/src/android/database/sqlite/SQLiteDatabaseConfiguration.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2011 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database.sqlite;
 

infer/models/java/src/android/database/sqlite/SQLiteQueryBuilder.java

@@ -1,42 +1,14 @@
 /*
- * Copyright (C) 2006 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.database.sqlite;
 
 import android.database.Cursor;
 import android.os.CancellationSignal;
 
-import java.util.Map;
-import java.util.regex.Pattern;
-
 public class SQLiteQueryBuilder {
-    private static String TAG;
-    private static Pattern sLimitPattern;
-
-    private Map<String, String> mProjectionMap;
-    private String mTables;
-    private StringBuilder mWhereClause;
-    private boolean mDistinct;
-    private SQLiteDatabase.CursorFactory mFactory;
-    private boolean mStrict;
-
-    public SQLiteQueryBuilder() {
-        mDistinct = false;
-        mFactory = null;
-    }
 
     public Cursor query(SQLiteDatabase db, String[] projectionIn,
                         String selection, String[] selectionArgs, String groupBy,

infer/models/java/src/android/provider/MediaStore.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package android.provider;
 
@@ -20,71 +9,7 @@ import android.content.ContentResolver;
 import android.database.Cursor;
 import android.net.Uri;
 
-/**
- * The Media provider contains meta data for all available media on both internal
- * and external storage devices.
- */
 public final class MediaStore {
-    private static String TAG;
-
-    public static String AUTHORITY;
-
-    private static String CONTENT_AUTHORITY_SLASH;
-
-    public static String ACTION_MTP_SESSION_END;
-
-    public static String UNHIDE_CALL;
-
-    public static String PARAM_DELETE_DATA;
-
-    public static String INTENT_ACTION_MUSIC_PLAYER;
-
-    public static String INTENT_ACTION_MEDIA_SEARCH;
-
-    public static String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH;
-
-    public static String INTENT_ACTION_TEXT_OPEN_FROM_SEARCH;
-
-    public static String INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH;
-
-    public static String EXTRA_MEDIA_ARTIST;
-
-    public static String EXTRA_MEDIA_ALBUM;
-
-    public static String EXTRA_MEDIA_TITLE;
-
-    public static String EXTRA_MEDIA_FOCUS;
-
-    public static String EXTRA_SCREEN_ORIENTATION;
-
-    public static String EXTRA_FULL_SCREEN;
-
-    public static String EXTRA_SHOW_ACTION_ICONS;
-
-    public static String EXTRA_FINISH_ON_COMPLETION;
-
-    public static String INTENT_ACTION_STILL_IMAGE_CAMERA;
-
-    public static String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE;
-
-    public static String INTENT_ACTION_VIDEO_CAMERA;
-
-    public static String ACTION_IMAGE_CAPTURE;
-
-    public static String ACTION_IMAGE_CAPTURE_SECURE;
-
-    public static String ACTION_VIDEO_CAPTURE;
-
-    public static String EXTRA_VIDEO_QUALITY;
-
-    public static String EXTRA_SIZE_LIMIT;
-
-    public static String EXTRA_DURATION_LIMIT;
-
-    public static String EXTRA_OUTPUT;
-
-    public static String UNKNOWN_STRING;
-
 
     public static final class Images {
 

infer/models/java/src/com/facebook/infer/models/InferCloseables.java

@@ -1,3 +1,9 @@
+/*
+* Copyright (c) 2009-2013 Monoidics ltd.
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package com.facebook.infer.models;
 
 import com.squareup.okhttp.internal.StrictLineReader;

infer/models/java/src/com/fasterxml/jackson/core/JsonFactory.java

@@ -1,57 +1,23 @@
-/* Jackson JSON-processor.
+/*
- *
+* Copyright (c) 2013- Facebook.
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
+* All rights reserved.
- */
+*/
+
 package com.fasterxml.jackson.core;
 
-import com.fasterxml.jackson.core.io.CharacterEscapes;
+import com.android.internal.util.FileRotator.Reader;
-import com.fasterxml.jackson.core.io.InputDecorator;
-import com.fasterxml.jackson.core.io.OutputDecorator;
 import com.fasterxml.jackson.core.json.PackageVersion;
 import com.fasterxml.jackson.core.json.UTF8StreamJsonParser;
-import com.fasterxml.jackson.core.sym.BytesToNameCanonicalizer;
-import com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer;
-import com.fasterxml.jackson.core.util.BufferRecycler;
 
-import java.io.*;
+import java.io.File;
-import java.lang.ref.SoftReference;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 
 public class JsonFactory
         implements Versioned, java.io.Serializable {
-    private static long serialVersionUID;
-
-    public static String FORMAT_NAME_JSON;
-
-    protected static int DEFAULT_FACTORY_FEATURE_FLAGS;
-
-    protected static int DEFAULT_PARSER_FEATURE_FLAGS;
-
-    protected static int DEFAULT_GENERATOR_FEATURE_FLAGS;
-
-    private static SerializableString DEFAULT_ROOT_VALUE_SEPARATOR;
-
-    protected static ThreadLocal<SoftReference<BufferRecycler>> _recyclerRef;
-
-    protected transient CharsToNameCanonicalizer _rootCharSymbols;
-
-    protected transient BytesToNameCanonicalizer _rootByteSymbols;
-
-    protected ObjectCodec _objectCodec;
-
-    protected int _factoryFeatures;
-
-    protected int _parserFeatures;
-
-    protected int _generatorFeatures;
-
-    protected CharacterEscapes _characterEscapes;
-
-    protected InputDecorator _inputDecorator;
-
-    protected OutputDecorator _outputDecorator;
 
-    protected SerializableString _rootValueSeparator;
 
     @Override
     public Version version() {

infer/models/java/src/com/fasterxml/jackson/core/JsonParser.java

@@ -1,7 +1,7 @@
-/* Jackson JSON-processor.
+/*
- *
+* Copyright (c) 2013- Facebook.
- * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
+* All rights reserved.
- */
+*/
 
 package com.fasterxml.jackson.core;
 
@@ -13,13 +13,6 @@ import java.io.IOException;
 
 public abstract class JsonParser
         implements Closeable, Versioned {
-    private static int MIN_BYTE_I;
-    private static int MAX_BYTE_I;
-
-    private static int MIN_SHORT_I;
-    private static int MAX_SHORT_I;
-
-    protected int _features;
 
     public void close() throws IOException {
         if (this instanceof UTF8StreamJsonParser) {
@@ -44,4 +37,3 @@ public abstract class JsonParser
     }
 
 }
-    

infer/models/java/src/com/google/common/base/Preconditions.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2007 The Guava Authors
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package com.google.common.base;
 

infer/models/java/src/com/google/common/collect/ImmutableList.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package com.google.common.collect;
 
 import com.facebook.infer.models.InferBuiltins;

infer/models/java/src/com/google/common/collect/Iterators.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package com.google.common.collect;
 
 import java.util.NoSuchElementException;
@@ -8,22 +13,6 @@ import javax.annotation.Nullable;
 
 public class Iterators {
 
-  static final UnmodifiableListIterator<Object> EMPTY_LIST_ITERATOR = null;
-
-  public static void FakeMethod() {
-    Object o1 = new Object() {};
-    Object o2 = new Object() {};
-    Object o3 = new Object() {};
-    Object o4 = new Object() {};
-    Object o5 = new Object() {};
-    Object o6 = new Object() {};
-    Object o7 = new Object() {};
-    Object o8 = new Object() {};
-    Object o9 = new Object() {};
-    Object o10 = new Object() {};
-    Object o11 = new Object() {};
-  }
-
   public static <T> UnmodifiableIterator<T> singletonIterator(@Nullable final T value) {
     return new UnmodifiableIterator<T>() {
       boolean done;

infer/models/java/src/com/google/common/io/Closeables.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package com.google.common.io;
 
 import com.facebook.infer.models.InferCloseables;
@@ -18,4 +23,4 @@ public final class Closeables {
         InferCloseables.closeQuietly(closeable);
     }
 
-}
+}

infer/models/java/src/com/squareup/okhttp/internal/StrictLineReader.java

@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package com.squareup.okhttp.internal;
 

infer/models/java/src/com/squareup/okhttp/internal/Util.java

@@ -1,16 +1,18 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package com.squareup.okhttp.internal;
 
 import com.facebook.infer.models.InferCloseables;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.nio.charset.Charset;
 
 
 public class Util {
 
-    public static final Charset US_ASCII = Charset.forName("US-ASCII");
-
     public static void closeQuietly(Closeable closeable) throws IOException {
         InferCloseables.closeQuietly(closeable);
     }

infer/models/java/src/dalvik/system/CloseGuard.java

@@ -1,14 +1,12 @@
-package dalvik.system;
+/*
-
+* Copyright (c) 2013- Facebook.
-public class CloseGuard {
+* All rights reserved.
-
+*/
 
-    private static CloseGuard NOOP;
+package dalvik.system;
-
-    private static volatile boolean ENABLED;
 
-    private static volatile Reporter REPORTER;
 
+public class CloseGuard {
 
     public static interface Reporter {
         public void report(String message, Throwable allocationSite);

infer/models/java/src/java/io/BufferedInputStream.java

@@ -1,27 +1,7 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.io;
 

infer/models/java/src/java/io/BufferedOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/io/BufferedReader.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
@@ -5,14 +10,6 @@ import com.facebook.infer.models.InferUndefined;
 public class BufferedReader extends Reader {
 
     private Reader in;
-    private char[] buf;
-    private int pos;
-    private int end;
-    private int mark;
-    private int markLimit;
-    private boolean lastWasCR;
-    private boolean markedLastWasCR;
-
 
     public BufferedReader(Reader in, int sz) {
         this.in = in;

infer/models/java/src/java/io/BufferedWriter.java

@@ -1,15 +1,17 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
+
 public class BufferedWriter extends Writer {
 
     private Writer out;
 
-    private char[] buf;
-
-    private int pos;
-
     public BufferedWriter(Writer out) {
         this.out = out;
     }

infer/models/java/src/java/io/DataInputStream.java

@@ -1,35 +1,14 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
-public class DataInputStream extends FilterInputStream {
 
-    private byte[] scratch;
+public class DataInputStream extends FilterInputStream {
 
     public DataInputStream(InputStream in) {
         super(in);

infer/models/java/src/java/io/DataOutputStream.java

@@ -1,11 +1,14 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
-public class DataOutputStream extends FilterOutputStream {
 
-    private byte[] scratch;
+public class DataOutputStream extends FilterOutputStream {
-    protected int written;
 
     public DataOutputStream(OutputStream out) {
         super(out);

infer/models/java/src/java/io/FileInputStream.java

@@ -1,8 +1,13 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferBuiltins;
 import com.facebook.infer.models.InferUndefined;
-import dalvik.system.CloseGuard;
+
 
 import java.nio.FileChannelImpl;
 import java.nio.channels.FileChannel;

infer/models/java/src/java/io/FileOutputStream.java

@@ -1,12 +1,17 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferBuiltins;
 import com.facebook.infer.models.InferUndefined;
-import dalvik.system.CloseGuard;
 
 import java.nio.FileChannelImpl;
 import java.nio.channels.FileChannel;
 
+
 public class FileOutputStream extends OutputStream {
 
     private FileDescriptor fd;

infer/models/java/src/java/io/FileReader.java

@@ -1,5 +1,11 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
+
 public class FileReader extends InputStreamReader {
 
     public FileReader(String fileName) throws FileNotFoundException {

infer/models/java/src/java/io/FileWriter.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 public class FileWriter extends OutputStreamWriter {

infer/models/java/src/java/io/FilterInputStream.java

@@ -1,27 +1,7 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.io;
 

infer/models/java/src/java/io/FilterOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/io/FilterReader.java

@@ -1,27 +1,7 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.io;
 

infer/models/java/src/java/io/InputStream.java

@@ -1,11 +1,14 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
 public class InputStream implements Closeable {
 
-    private int MAX_SKIP_BUFFER_SIZE;
-
     public void close() throws IOException {
         if (this instanceof FileInputStream) {
             ((FileInputStream) this).close();

infer/models/java/src/java/io/InputStreamReader.java

@@ -1,17 +1,18 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 
 public class InputStreamReader extends Reader {
 
     private InputStream in;
-    private boolean endOfInput;
-    private CharsetDecoder decoder;
-    private ByteBuffer bytes;
 
     public InputStreamReader(InputStream in) {
         this.in = in;

infer/models/java/src/java/io/ObjectInputStream.java

@@ -1,46 +1,22 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 public class ObjectInputStream extends InputStream {
 
-    private InputStream emptyStream;
-    private static Object UNSHARED_OBJ;
-    private boolean hasPushbackTC;
-    private byte pushbackTC;
-    private int nestedLevels;
-    private int nextHandle;
     private DataInputStream input;
 
-    private DataInputStream primitiveTypes;
-    private InputStream primitiveData;
-    private boolean enableResolve;
-    private ArrayList<Object> objectsRead;
-    private Object currentObject;
-    private ObjectStreamClass currentClass;
-    private InputValidationDesc[] validations;
-
-    private boolean subclassOverridingImplementation;
-    private ClassLoader callerClassLoader;
-    private boolean mustResolve;
-    private int descriptorHandle;
-
-    private static HashMap<String, Class<?>> PRIMITIVE_CLASSES;
-
     static class InputValidationDesc {
         ObjectInputValidation validator;
         int priority;
     }
 
-    private static ClassLoader bootstrapLoader;
-    private static ClassLoader systemLoader;
-
-    private HashMap<Class<?>, List<Class<?>>> cachedSuperclasses;
-
     public ObjectInputStream(InputStream in) throws IOException {
         this.input = new DataInputStream(in);
         InferUndefined.can_throw_ioexception_void();

infer/models/java/src/java/io/ObjectOutputStream.java

@@ -1,25 +1,15 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
 public class ObjectOutputStream extends OutputStream {
 
-    private static Class<?>[] WRITE_UNSHARED_PARAM_TYPES;
-    private static byte NOT_SC_BLOCK_DATA;
-    private int nestedLevels;
     private DataOutputStream output;
-    private boolean enableReplace;
-    private DataOutputStream primitiveTypes;
-    private ByteArrayOutputStream primitiveTypesBuffer;
-    private SerializationHandleMap objectsWritten;
-    private int currentHandle;
-    private Object currentObject;
-    private ObjectStreamClass currentClass;
-    private int protocolVersion;
-    private StreamCorruptedException nestedException;
-    private EmulatedFieldsForDumping currentPutField;
-    private boolean subclassOverridingImplementation;
-    private ObjectStreamClass proxyClassDesc;
 
     public ObjectOutputStream(OutputStream out) throws IOException {
         this.output = new DataOutputStream(out);

infer/models/java/src/java/io/OutputStream.java

@@ -1,27 +1,7 @@
 /*
- * Copyright (c) 1994, 2004, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.io;
 
@@ -52,4 +32,4 @@ public abstract class OutputStream implements Closeable {
     public void flush() throws IOException {
         InferUndefined.can_throw_ioexception_void();
     }
-}
+}

infer/models/java/src/java/io/OutputStreamWriter.java

@@ -1,8 +1,12 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 
@@ -10,10 +14,6 @@ public class OutputStreamWriter extends Writer {
 
     private OutputStream out;
 
-    private CharsetEncoder encoder;
-
-    private ByteBuffer bytes;
-
     public OutputStreamWriter(OutputStream out, String charsetName)
             throws UnsupportedEncodingException {
         if (charsetName == null)

infer/models/java/src/java/io/PipedInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferBuiltins;

infer/models/java/src/java/io/PipedOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferBuiltins;

infer/models/java/src/java/io/PipedReader.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferBuiltins;

infer/models/java/src/java/io/PipedWriter.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferBuiltins;

infer/models/java/src/java/io/PrintStream.java

@@ -1,11 +1,12 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 public class PrintStream extends FilterOutputStream implements Closeable {
 
-    private boolean ioError;
-    private boolean autoFlush;
-    private String encoding;
-
     public PrintStream(OutputStream out) {
         super(out);
     }

infer/models/java/src/java/io/PrintWriter.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
@@ -5,8 +10,6 @@ import com.facebook.infer.models.InferUndefined;
 public class PrintWriter extends Writer {
 
     protected Writer out;
-    private boolean ioError;
-    private boolean autoFlush;
 
     public PrintWriter(OutputStream out) {
         this(new OutputStreamWriter(out));

infer/models/java/src/java/io/PushbackInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/io/PushbackReader.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/io/RandomAccessFile.java

@@ -1,8 +1,12 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferBuiltins;
 import com.facebook.infer.models.InferUndefined;
-import dalvik.system.CloseGuard;
 
 import java.nio.FileChannelImpl;
 import java.nio.channels.FileChannel;

infer/models/java/src/java/io/Reader.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/io/Writer.java

@@ -1,11 +1,14 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.io;
 
 import com.facebook.infer.models.InferUndefined;
 
 public abstract class Writer implements Closeable {
 
-    protected Object lock;
-
     public Writer append(char c) throws IOException {
         InferUndefined.can_throw_ioexception_void();
         return this;

infer/models/java/src/java/lang/Class.java

@@ -1,13 +1,11 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.lang;
 
 public final class Class<T> {
-    private static long serialVersionUID;
-
-    private transient int dexClassDefIndex;
-
-    private transient int dexTypeIndex;
-
-    private transient volatile boolean dexIndicesInitialized;
 
     transient String name;
 

infer/models/java/src/java/lang/NullPointerException.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.lang;
 
 public class NullPointerException extends RuntimeException {

infer/models/java/src/java/lang/Object.java

@@ -1,27 +1,7 @@
 /*
- * Copyright (c) 1994, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.lang;
 

infer/models/java/src/java/lang/Process.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.lang;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/lang/ProcessManager.java

@@ -1,34 +1,22 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+* Copyright (c) 2013- Facebook.
- *
+* All rights reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
+*/
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package java.lang;
 
 import com.facebook.infer.models.InferUndefined;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.IOException;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
-import java.util.Map;
 
 
-final class ProcessManager {
 
-    private Map<Integer, ProcessReference> processReferences;
+final class ProcessManager {
 
-    private ProcessReferenceQueue referenceQueue;
 
     public Process exec(String[] taintedCommand, String[] taintedEnvironment, File workingDirectory,
                         boolean redirectErrorStream) throws IOException {

infer/models/java/src/java/lang/Runtime.java

@@ -1,21 +1,15 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.lang;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
-
-public class Runtime {
 
-    private static Runtime mRuntime;
-    private String[] mLibPaths;
-    private List<Thread> shutdownHooks;
-    private static boolean finalizeOnExit;
-    private boolean shuttingDown;
-    private boolean tracingMethods;
 
-    public static Runtime getRuntime() {
+public class Runtime {
-        return mRuntime;
-    }
 
     private Runtime() {
     }

infer/models/java/src/java/lang/String.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.lang;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/lang/System.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.lang;
 
 import com.facebook.infer.models.InferBuiltins;
@@ -6,7 +11,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.PrintStream;
-import java.util.Properties;
+
 
 public final class System {
 
@@ -26,10 +31,6 @@ public final class System {
     public final static PrintStream err = new PrintStream(
             new ByteArrayOutputStream());
 
-    private static Properties systemProperties;
-
-    private static String lineSeparator;
-
     public static void exit(int status) {
         InferBuiltins._exit();
     }

infer/models/java/src/java/lang/Thread.java

@@ -1,36 +1,13 @@
-package java.lang;
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
 
-import java.util.List;
+package java.lang;
 
 public class Thread implements Runnable {
 
-    private static int NANOS_PER_MILLI;
-
-    public static int MAX_PRIORITY;
-    public static int MIN_PRIORITY;
-
-    public static int NORM_PRIORITY;
-
-    volatile VMThread vmThread;
-    volatile ThreadGroup group;
-    volatile boolean daemon;
-    volatile String name;
-    volatile int priority;
-    volatile long stackSize;
     Runnable target;
-    private static int count;
-
-    private long id;
-    ThreadLocal.Values localValues;
-    ThreadLocal.Values inheritableValues;
-    private List<Runnable> interruptActions;
-    private ClassLoader contextClassLoader;
-    private UncaughtExceptionHandler uncaughtHandler;
-    private static UncaughtExceptionHandler defaultUncaughtHandler;
-    boolean hasBeenStarted;
-
-    private int parkState;
-    private Object parkBlocker;
 
     public static interface UncaughtExceptionHandler {
     }

infer/models/java/src/java/lang/reflect/Array.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.lang.reflect;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/net/HttpURLConnection.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.net;
 
 import com.facebook.infer.models.InferBuiltins;

infer/models/java/src/java/net/JarURLConnection.java

@@ -1,38 +1,12 @@
 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.net;
 
 public class JarURLConnection extends URLConnection {
 
-
-    protected URLConnection jarFileURLConnection;
-    private String entryName;
-    private URL fileURL;
-    private String file;
-
     protected JarURLConnection(URL url) throws MalformedURLException {
         super(url);
     }

infer/models/java/src/java/net/PlainSocketImpl.java

@@ -1,33 +1,12 @@
 /*
- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.net;
 
 import com.facebook.infer.models.InferBuiltins;
 import com.facebook.infer.models.InferUndefined;
-import dalvik.system.CloseGuard;
 
 import java.io.IOException;
 import java.io.InputStream;

infer/models/java/src/java/net/ServerSocket.java

@@ -1,27 +1,7 @@
 /*
- * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013- Facebook.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+* All rights reserved.
- *
+*/
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
 
 package java.net;
 
@@ -31,16 +11,8 @@ import java.io.IOException;
 
 public class ServerSocket {
 
-    private static int DEFAULT_BACKLOG;
-
     private SocketImpl impl;
 
-    static SocketImplFactory factory;
-
-    private boolean isBound;
-
-    private boolean isClosed;
-
     public ServerSocket() throws IOException {
         impl = new PlainSocketImpl();
     }

infer/models/java/src/java/net/Socket.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.net;
 
 import java.io.IOException;
@@ -6,21 +11,7 @@ import java.io.OutputStream;
 
 public class Socket {
 
-    private static SocketImplFactory factory;
-
     SocketImpl impl;
-    private Proxy proxy;
-
-    volatile boolean isCreated;
-    private boolean isBound;
-    private boolean isConnected;
-    private boolean isClosed;
-    private boolean isInputShutdown;
-    private boolean isOutputShutdown;
-
-    private InetAddress localAddress;
-
-    private Object connectLock;
 
     public Socket() {
         try {

infer/models/java/src/java/net/URL.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.net;
 
 import javax.net.ssl.HttpsURLConnection;
@@ -5,23 +10,10 @@ import java.util.Hashtable;
 
 public final class URL implements java.io.Serializable {
 
-    private static long serialVersionUID;
-    private static URLStreamHandlerFactory streamHandlerFactory;
-    private static Hashtable<String, URLStreamHandler> streamHandlers;
-
     private String protocol;
-    private String authority;
     private String host;
     private int port;
     private String file;
-    private String ref;
-
-    private transient String userInfo;
-    private transient String path;
-    private transient String query;
-    transient URLStreamHandler streamHandler;
-    private transient int hashCode;
-
 
     public URL(String protocol, String host, int port, String file) throws MalformedURLException {
         this(protocol, host, port, file, null);

infer/models/java/src/java/net/URLConnection.java

@@ -1,29 +1,22 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.net;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
-import java.util.Hashtable;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 
 public class URLConnection {
 
     protected URL url;
-    private String contentType;
-    private static boolean defaultAllowUserInteraction;
-    private static boolean defaultUseCaches;
-    ContentHandler defaultHandler;
-    private long lastModified;
-    protected long ifModifiedSince;
-    protected boolean useCaches;
-    protected boolean connected;
-    protected boolean doOutput;
-    protected boolean doInput;
-    protected boolean allowUserInteraction;
-
-    private static ContentHandlerFactory contentHandlerFactory;
-    private int readTimeout;
-    private int connectTimeout;
-    static Hashtable<String, Object> contentHandlers;
-    private static FileNameMap fileNameMap;
-
 
     public URLConnection(URL url) {
         this.url = url;

infer/models/java/src/java/nio/FileChannelImpl.java

@@ -1,41 +1,27 @@
 /*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
+* Copyright (c) 2013- Facebook.
- *  contributor license agreements.  See the NOTICE file distributed with
+* All rights reserved.
- *  this work for additional information regarding copyright ownership.
+*/
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
 
 package java.nio;
 
 import com.facebook.infer.models.InferUndefined;
 
-import java.io.*;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
-import java.util.Comparator;
-import java.util.SortedSet;
 
 public class FileChannelImpl extends FileChannel {
-    private static Comparator<FileLock> LOCK_COMPARATOR;
 
     private Object stream;
     private FileDescriptor fd;
     private int mode;
 
-    private SortedSet<FileLock> locks;
-
     public FileChannelImpl(Object stream, FileDescriptor fd, int mode) {
         this.fd = fd;
         this.stream = stream;

infer/models/java/src/java/nio/channels/FileChannel.java

@@ -1,18 +1,7 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*
- * contributor license agreements.  See the NOTICE file distributed with
+* Copyright (c) 2013- Facebook.
- * this work for additional information regarding copyright ownership.
+* All rights reserved.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+*/
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 package java.nio.channels;
 

infer/models/java/src/java/nio/channels/spi/AbstractInterruptibleChannel.java

@@ -1,19 +1,7 @@
 /*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
+* Copyright (c) 2013- Facebook.
- *  contributor license agreements.  See the NOTICE file distributed with
+* All rights reserved.
- *  this work for additional information regarding copyright ownership.
+*/
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
 
 package java.nio.channels.spi;
 

infer/models/java/src/java/security/DigestInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.security;
 
 import com.facebook.infer.models.InferUndefined;
@@ -6,11 +11,8 @@ import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class DigestInputStream extends FilterInputStream {
-
-    protected MessageDigest digest;
 
-    private boolean isOn;
+public class DigestInputStream extends FilterInputStream {
 
     public DigestInputStream(InputStream stream, MessageDigest digest) {
         super(stream);

infer/models/java/src/java/security/DigestOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.security;
 
 import com.facebook.infer.models.InferUndefined;
@@ -8,9 +13,6 @@ import java.io.OutputStream;
 
 public class DigestOutputStream extends FilterOutputStream {
 
-    protected MessageDigest digest;
-    private boolean isOn;
-
     public DigestOutputStream(OutputStream stream, MessageDigest digest) {
         super(stream);
     }

infer/models/java/src/java/util/HashMap.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util;
 import java.io.*;
 

infer/models/java/src/java/util/Properties.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util;
 
 import com.facebook.infer.models.InferUndefined;
@@ -7,19 +12,8 @@ import java.io.*;
 
 public class Properties extends Hashtable<Object, Object> {
 
-    private static long serialVersionUID;
-
-    private transient DocumentBuilder builder;
-
-    private static String PROP_DTD_NAME;
-
-    private static String PROP_DTD;
-
     protected Properties defaults;
 
-    private static int NONE, SLASH, UNICODE, CONTINUE, KEY_DONE, IGNORE;
-
-
     public Properties() {
     }
 

infer/models/java/src/java/util/Scanner.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/util/Vector.java

@@ -1,14 +1,15 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util;
 
 import com.facebook.infer.models.InferUndefined;
 
 public class Vector<E> extends AbstractList<E> {
 
-    private static long serialVersionUID;
-    protected int elementCount;
     protected Object[] elementData;
-    protected int capacityIncrement;
-    private static int DEFAULT_SIZE;
 
     E elementData(int index) {
         return (E) elementData[index];

infer/models/java/src/java/util/jar/JarFile.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.jar;
 
 import java.io.File;
@@ -9,14 +14,6 @@ import java.util.zip.ZipFile;
 
 public class JarFile extends ZipFile {
 
-    public static String MANIFEST_NAME;
-    static String META_DIR;
-    private Manifest manifest;
-    private ZipEntry manifestEntry;
-
-    JarVerifier verifier;
-
-    private boolean closed;
 
     public JarFile(String name) throws IOException {
         super(name);

infer/models/java/src/java/util/jar/JarInputStream.java

@@ -1,27 +1,18 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.jar;
 
 import com.facebook.infer.models.InferUndefined;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.zip.ZipInputStream;
 
-public class JarInputStream extends ZipInputStream {
-
-    private Manifest manifest;
-
-    private boolean eos;
-
-    private JarEntry mEntry;
 
-    private JarEntry jarEntry;
+public class JarInputStream extends ZipInputStream {
-
-    private boolean isMeta;
-
-    private JarVerifier verifier;
-
-    private OutputStream verStream;
 
     public JarInputStream(InputStream in) throws IOException {
         super(in);

infer/models/java/src/java/util/jar/JarOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.jar;
 
 import com.facebook.infer.models.InferUndefined;
@@ -9,8 +14,6 @@ import java.util.zip.ZipOutputStream;
 
 public class JarOutputStream extends ZipOutputStream {
 
-    private Manifest manifest;
-
     public JarOutputStream(OutputStream out, Manifest man) throws IOException {
         super(out);
         InferUndefined.can_throw_ioexception_void();

infer/models/java/src/java/util/zip/CheckedInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;
@@ -8,8 +13,6 @@ import java.io.InputStream;
 
 public class CheckedInputStream extends FilterInputStream {
 
-    private Checksum check;
-
     public CheckedInputStream(InputStream in, Checksum cksum) {
         super(in);
     }

infer/models/java/src/java/util/zip/CheckedOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;
@@ -8,8 +13,6 @@ import java.io.OutputStream;
 
 public class CheckedOutputStream extends FilterOutputStream {
 
-    private Checksum check;
-
     public CheckedOutputStream(OutputStream out, Checksum cksum) {
         super(out);
     }

infer/models/java/src/java/util/zip/DeflaterInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/util/zip/DeflaterOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/util/zip/GZIPInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;
@@ -7,14 +12,6 @@ import java.io.InputStream;
 
 public class GZIPInputStream extends InflaterInputStream {
 
-    private static int FCOMMENT;
-    private static int FEXTRA;
-    private static int FHCRC;
-    private static int FNAME;
-
-    public static int GZIP_MAGIC;
-    protected CRC32 crc;
-    protected boolean eos;
 
     public GZIPInputStream(InputStream in, int size) throws IOException {
         super(in);

infer/models/java/src/java/util/zip/GZIPOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;
@@ -7,7 +12,6 @@ import java.io.OutputStream;
 
 public class GZIPOutputStream extends DeflaterOutputStream {
 
-    protected CRC32 crc;
 
     public GZIPOutputStream(OutputStream out, int size) throws IOException {
         super(out);

infer/models/java/src/java/util/zip/InflaterInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/util/zip/InflaterOutputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/util/zip/ZipFile.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferBuiltins;

infer/models/java/src/java/util/zip/ZipInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
 import com.facebook.infer.models.InferUndefined;

infer/models/java/src/java/util/zip/ZipOutputStream.java

@@ -1,36 +1,20 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package java.util.zip;
 
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
 import com.facebook.infer.models.InferUndefined;
 
-import java.io.*;
-import java.util.HashSet;
 
 public class ZipOutputStream extends DeflaterOutputStream {
 
-    public static int DEFLATED;
-
-    public static int STORED;
-
-    private static int ZIP_VERSION_2_0;
-
-    private byte[] commentBytes;
-
-    private HashSet<String> entries;
-
-    private int defaultCompressionMethod;
-
-    private int compressionLevel;
-
-    private ByteArrayOutputStream cDir;
-
-    private ZipEntry currentEntry;
-
-    private CRC32 crc;
-
-    private int offset, curOffset, nameLength;
-
-    private byte[] nameBytes;
-
     public ZipOutputStream(OutputStream out) {
         super(out);
     }

infer/models/java/src/javax/crypto/CipherInputStream.java

@@ -1,3 +1,8 @@
+/*
+* Copyright (c) 2013- Facebook.
+* All rights reserved.
+*/
+
 package javax.crypto;
 
 import com.facebook.infer.models.InferUndefined;
@@ -8,16 +13,8 @@ import java.io.InputStream;
 
 public class CipherInputStream extends FilterInputStream {
 
-    private static int I_BUFFER_SIZE;
-
-    private Cipher cipher;
-    private byte[] inputBuffer;
-    private byte[] outputBuffer;
-    private int outputIndex;
-    private int outputLength;
-    private boolean finished;
 
-    public CipherInputStream(InputStream is, Cipher c) {
+  public CipherInputStream(InputStream is, Cipher c) {
         super(is);
     }