run whitespace_format.py --add-new-line-marker-at-end-of-file --remove-trailing-whitespace --remove-trailing-empty-lines --new-line-marker=linux --normalize-non-standard-whitespace=remove on src/

src/api-impl-jni/app/android_app_Activity.c

@@ -109,7 +109,7 @@ void current_activity_back_pressed(void){
 	jmethodID current_activity_on_back_pressed_method_id = (*env) ->GetMethodID(env, current_activity_class, "onBackPressed", "()V");
 	if((*env)->ExceptionCheck(env))
 		(*env)->ExceptionDescribe(env);
-	
+
 	// Either a new activity was added to the backlog or the current activity's onBackPressed method was changed
 	if(g_list_length(activity_backlog) > 1 || handle_cache.activity.onBackPressed != current_activity_on_back_pressed_method_id){
 		(*env)->CallVoidMethod(env, activity_current, handle_cache.activity.onBackPressed);
@@ -222,7 +222,7 @@ static void file_dialog_callback(GObject* source_object, GAsyncResult* res, gpoi
 
 	if (file) {
 		char *uri = g_file_get_uri(file);
-		
+
 		(*env)->CallVoidMethod(env, d->activity, fileChooserResultCallback, d->request_code, RESULT_OK, d->action, _JSTRING(uri));
 		if ((*env)->ExceptionCheck(env))
 			(*env)->ExceptionDescribe(env);

src/api-impl-jni/database/android_database_SQLiteCommon.c

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 /*
-** Rewritten from C++ to C for Android Translation Layer: 
+** Rewritten from C++ to C for Android Translation Layer:
 */
 
 #include <stdio.h>
@@ -128,7 +128,7 @@ void throw_sqlite3_exception_errcode_message(JNIEnv* env, int errcode,
 
 	if (sqlite3Message) {
 		char *zFullmsg = sqlite3_mprintf(
-			"%s (code %d)%s%s", sqlite3Message, errcode, 
+			"%s (code %d)%s%s", sqlite3Message, errcode,
 			(message ? ": " : ""), (message ? message : "")
 		);
 		printf("throwing new %s\n", exceptionClass);

src/api-impl-jni/database/android_database_SQLiteCommon.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl-jni/database/android_database_SQLiteConnection.c

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 /*
-** Rewritten from C++ to C for Android Translation Layer: 
+** Rewritten from C++ to C for Android Translation Layer:
 */
 
 #include <stdlib.h>
@@ -69,14 +69,14 @@ static const int BUSY_TIMEOUT_MS = 2500;
 
 /*
 ** This function is a collation sequence callback equivalent to the built-in
-** BINARY sequence. 
+** BINARY sequence.
 **
 ** Stock Android uses a modified version of sqlite3.c that calls out to a module
 ** named "sqlite3_android" to add extra built-in collations and functions to
 ** all database handles. Specifically, collation sequence "LOCALIZED". For now,
 ** this module does not include sqlite3_android (since it is difficult to build
 ** with the NDK only). Instead, this function is registered as "LOCALIZED" for all
-** new database handles. 
+** new database handles.
 */
 static int coll_localized(
 	void *not_used,
@@ -585,17 +585,17 @@ static jboolean setWindowNumColumns(
 }
 
 /*
-** This method has been rewritten for org.sqlite.database.*. The original 
+** This method has been rewritten for org.sqlite.database.*. The original
 ** android implementation used the C++ interface to populate a CursorWindow
 ** object. Since the NDK does not export this interface, we invoke the Java
 ** interface using standard JNI methods to do the same thing.
 **
-** This function executes the SQLite statement object passed as the 4th 
+** This function executes the SQLite statement object passed as the 4th
 ** argument and copies one or more returned rows into the CursorWindow
-** object passed as the 5th argument. The set of rows copied into the 
+** object passed as the 5th argument. The set of rows copied into the
 ** CursorWindow is always contiguous.
 **
-** The only row that *must* be copied into the CursorWindow is row 
+** The only row that *must* be copied into the CursorWindow is row
 ** iRowRequired. Ideally, all rows from iRowStart through to the end
 ** of the query are copied into the CursorWindow. If this is not possible
 ** (CursorWindow objects have a finite capacity), some compromise position
@@ -607,11 +607,11 @@ static jboolean setWindowNumColumns(
 **
 ** where iStart is the index of the first row copied into the CursorWindow.
 ** If the countAllRows argument is true, nRow is the total number of rows
-** returned by the query. Otherwise, nRow is one greater than the index of 
+** returned by the query. Otherwise, nRow is one greater than the index of
 ** the last row copied into the CursorWindow.
 */
 JNIEXPORT jlong JNICALL Java_android_database_sqlite_SQLiteConnection_nativeExecuteForCursorWindow(
-	JNIEnv *env, 
+	JNIEnv *env,
 	jclass clazz,
 	jlong connectionPtr,            /* Pointer to SQLiteConnection C++ object */
 	jlong statementPtr,             /* Pointer to sqlite3_stmt object */

src/api-impl-jni/database/android_database_SQLiteGlobal.c

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 /*
-** Rewritten from C++ to C for Android Translation Layer: 
+** Rewritten from C++ to C for Android Translation Layer:
 */
 
 #include <jni.h>

src/api-impl-jni/graphics/android_graphics_Path.c

@@ -146,7 +146,7 @@ JNIEXPORT jlong JNICALL Java_android_graphics_Path_native_1transform(JNIEnv *env
 
 JNIEXPORT void JNICALL Java_android_graphics_Path_native_1add_1rect(JNIEnv *env, jclass this, jlong builder_ptr, jfloat left, jfloat top, jfloat right, jfloat bottom)
 {
-	gsk_path_builder_add_rect(_PTR(builder_ptr), &GRAPHENE_RECT_INIT(left, top, right-left, bottom-top));	
+	gsk_path_builder_add_rect(_PTR(builder_ptr), &GRAPHENE_RECT_INIT(left, top, right-left, bottom-top));
 }
 
 JNIEXPORT void JNICALL Java_android_graphics_Path_native_1get_1bounds(JNIEnv *env, jclass this, jlong path_ptr, jobject bounds)

src/api-impl-jni/native_activity.h

@@ -78,17 +78,17 @@ typedef struct ANativeActivity {
      * Path to this application's internal data directory.
      */
     const char* internalDataPath;
-    
+
     /**
      * Path to this application's external (removable/mountable) data directory.
      */
     const char* externalDataPath;
-    
+
     /**
      * The platform's SDK version code.
      */
     int32_t sdkVersion;
-    
+
     /**
      * This is the native instance of the application.  It is not used by
      * the framework, but can be set by the application to its own instance
@@ -122,13 +122,13 @@ typedef struct ANativeActivityCallbacks {
      * for more information.
      */
     void (*onStart)(ANativeActivity* activity);
-    
+
     /**
      * NativeActivity has resumed.  See Java documentation for Activity.onResume()
      * for more information.
      */
     void (*onResume)(ANativeActivity* activity);
-    
+
     /**
      * Framework is asking NativeActivity to save its current instance state.
      * See Java documentation for Activity.onSaveInstanceState() for more
@@ -139,19 +139,19 @@ typedef struct ANativeActivityCallbacks {
      * entities (pointers to memory, file descriptors, etc).
      */
     void* (*onSaveInstanceState)(ANativeActivity* activity, size_t* outSize);
-    
+
     /**
      * NativeActivity has paused.  See Java documentation for Activity.onPause()
      * for more information.
      */
     void (*onPause)(ANativeActivity* activity);
-    
+
     /**
      * NativeActivity has stopped.  See Java documentation for Activity.onStop()
      * for more information.
      */
     void (*onStop)(ANativeActivity* activity);
-    
+
     /**
      * NativeActivity is being destroyed.  See Java documentation for Activity.onDestroy()
      * for more information.
@@ -163,7 +163,7 @@ typedef struct ANativeActivityCallbacks {
      * for example, to pause a game when it loses input focus.
      */
     void (*onWindowFocusChanged)(ANativeActivity* activity, int hasFocus);
-    
+
     /**
      * The drawing window for this native activity has been created.  You
      * can use the given native window object to start drawing.
@@ -194,13 +194,13 @@ typedef struct ANativeActivityCallbacks {
      * returning from here.
      */
     void (*onNativeWindowDestroyed)(ANativeActivity* activity, ANativeWindow* window);
-    
+
     /**
      * The input queue for this native activity's window has been created.
      * You can use the given input queue to start retrieving input events.
      */
     void (*onInputQueueCreated)(ANativeActivity* activity, AInputQueue* queue);
-    
+
     /**
      * The input queue for this native activity's window is being destroyed.
      * You should no longer try to reference this object upon returning from this
@@ -310,4 +310,3 @@ void ANativeActivity_hideSoftInput(ANativeActivity* activity, uint32_t flags);
 #endif
 
 #endif // ANDROID_NATIVE_ACTIVITY_H
-

src/api-impl-jni/views/AndroidLayout.h

@@ -29,4 +29,4 @@ void android_layout_set_params(AndroidLayout *layout, int width, int height);
 
 void widget_set_needs_allocation(GtkWidget *widget);
 
-#endif  // ANDROID_LAYOUT_H
+#endif  // ANDROID_LAYOUT_H

src/api-impl-jni/views/android_view_View.c

@@ -181,7 +181,7 @@ static gboolean on_event(GtkEventControllerLegacy *event_controller, GdkEvent *e
 		pointers[id].index = pointer_index;
 		pointers[id].id = id;
 	}
-	
+
 	pointers[id].coord_x = x;
 	pointers[id].coord_y = y;
 	pointers[id].raw_x = x;

src/api-impl-jni/widgets/WrapperWidget.c

@@ -34,7 +34,7 @@ static void wrapper_widget_get_property (GObject *object, guint property_id, GVa
 
 	switch ((WrapperWidgetProperty) property_id)
 	{
-		case ATL_ID: 
+		case ATL_ID:
 		{
 			jint id_jint = (*env)->CallIntMethod(env, jobj, handle_cache.view.getId);
 			if((*env)->ExceptionCheck(env))
@@ -83,7 +83,7 @@ static void wrapper_widget_get_property (GObject *object, guint property_id, GVa
 			(*env)->ReleaseStringUTFChars(env, super_classes_names_obj, super_classes_names);
 			break;
 		}
-		
+
 
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -220,13 +220,13 @@ static void wrapper_widget_class_init(WrapperWidgetClass *class)
 
 	object_class->set_property = wrapper_widget_set_property;
 	object_class->get_property = wrapper_widget_get_property;
-	
+
 	// According to testing, these properties are not evaluated till we open the GtkInspector
 	wrapper_widget_properties[ATL_ID] = g_param_spec_string("ATL-id", "ATL: ID", "ID of the component", "", G_PARAM_READABLE);
 	wrapper_widget_properties[ATL_ID_NAME] = g_param_spec_string("ATL-id-name", "ATL: ID name", "Name of the ID of the component", "", G_PARAM_READABLE);
 	wrapper_widget_properties[ATL_CLASS_NAME] = g_param_spec_string("ATL-class-name", "ATL: Class name", "Name of the class of the component", "", G_PARAM_READABLE);
 	wrapper_widget_properties[ATL_SUPER_CLASS_NAMES] = g_param_spec_string("ATL-superclasses-names", "ATL: Super classes names", "Names of all the superclasses of the component class", "", G_PARAM_READABLE);
-	
+
 	g_object_class_install_properties (object_class, N_PROPERTIES, wrapper_widget_properties);
 }
 

src/api-impl-jni/widgets/android_webkit_WebView.c

@@ -38,11 +38,11 @@ static void web_view_load_changed(WebKitWebView *web_view, WebKitLoadEvent load_
 
 JNIEXPORT jlong JNICALL Java_android_webkit_WebView_native_1constructor(JNIEnv *env, jobject this, jobject context, jobject attrs)
 {
-	/* 
+	/*
-         * many apps use webview just for fingerprinting or displaying ads, which seems like
+	 * many apps use webview just for fingerprinting or displaying ads, which seems like
-         * a waste of resources even if we deal with fingerprinting and ads in some other way
+	 * a waste of resources even if we deal with fingerprinting and ads in some other way
-         * in the future.
+	 * in the future.
-         */
+	 */
 	if(!getenv("ATL_UGLY_ENABLE_WEBVIEW"))
 		return Java_android_view_View_native_1constructor(env, this, context, attrs);
 

src/api-impl/android/accounts/AccountManager.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.os.Bundle;
 
 public class AccountManager {
-	
+
 	public static AccountManager get(Context context) {
 		return new AccountManager();
 	}

src/api-impl/android/animation/AnimatorInflater.java

@@ -11,5 +11,5 @@ public class AnimatorInflater {
 	public static StateListAnimator loadStateListAnimator(Context context, int resId) {
 		return new StateListAnimator();
 	}
-	
+
 }

src/api-impl/android/animation/ArgbEvaluator.java

@@ -1,5 +1,5 @@
 package android.animation;
 
 public class ArgbEvaluator {
-	
+
 }

src/api-impl/android/animation/LayoutTransition.java

@@ -1,7 +1,7 @@
 package android.animation;
 
 public class LayoutTransition {
-	
+
 	public void enableTransitionType(int transitionType) {}
 
 	public void setStartDelay(int transitionType, long startDelay) {}

src/api-impl/android/annotation/SystemApi.java

@@ -1,5 +1,5 @@
 package android.annotation;
 
 public @interface SystemApi {
-	
+
 }

src/api-impl/android/app/Activity.java

@@ -83,7 +83,7 @@ public class Activity extends ContextThemeWrapper implements Window.Callback, La
 	 *
 	 * @param className  class name of activity or null
 	 * @return  instance of main activity class
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	private static Activity createMainActivity(String className, long native_window, String uriString) throws Exception {
 		Uri uri = uriString != null ? Uri.parse(uriString) : null;

src/api-impl/android/app/DownloadManager.java

@@ -1,5 +1,5 @@
 package android.app;
 
 public class DownloadManager {
-	
+
 }

src/api-impl/android/app/SearchManager.java

@@ -1,5 +1,5 @@
 package android.app;
 
 public class SearchManager {
-	
+
 }

src/api-impl/android/app/UiModeManager.java

@@ -3,7 +3,7 @@ package android.app;
 import android.content.res.Configuration;
 
 public class UiModeManager {
-	
+
 	public int getCurrentModeType() {
 		return Configuration.UI_MODE_TYPE_NORMAL;
 	}

src/api-impl/android/app/WallpaperManager.java

@@ -14,5 +14,5 @@ public class WallpaperManager {
 	}
 
 	private static native void set_bitmap(long texture);
-	
+
 }

src/api-impl/android/app/admin/DevicePolicyManager.java

@@ -1,5 +1,5 @@
 package android.app.admin;
 
 public class DevicePolicyManager {
-	
+
 }

src/api-impl/android/app/job/JobWorkItem.java

@@ -6,4 +6,3 @@ final public class JobWorkItem {
 	public JobWorkItem(Intent intent) {
 	}
 }
-

src/api-impl/android/bluetooth/BluetoothProfile.java

@@ -1,6 +1,6 @@
 package android.bluetooth;
 
 public class BluetoothProfile {
-	
+
 	public interface ServiceListener {}
 }

src/api-impl/android/content/ClipData.java

@@ -3,7 +3,7 @@ package android.content;
 public class ClipData {
 
 	String text;
-	
+
 	public static ClipData newPlainText(CharSequence label, CharSequence text) {
 		ClipData clip = new ClipData();
 		clip.text = text.toString();

src/api-impl/android/content/IntentFilter.java

@@ -10,7 +10,7 @@ import android.net.Uri;
 import java.util.Iterator;
 
 public class IntentFilter {
-	
+
 	private List<String> actions = new ArrayList<>();
 	private Set<String> categories = new HashSet<>();
 	private List<String> dataSchemes = new ArrayList<>();

src/api-impl/android/content/pm/PackageManager.java

@@ -1674,7 +1674,7 @@ public class PackageManager {
 	 * to modify the data returned.
 	 *
 	 * @return ProviderInfo containing information about the service.
-	 * @throws Exception 
+	 * @throws Exception
 	 *
 	 * @see #GET_META_DATA
 	 * @see #GET_SHARED_LIBRARY_FILES
@@ -2402,7 +2402,7 @@ public class PackageManager {
 	 *
 	 * @return ContentProviderInfo Information about the provider, if found,
 	 *         else null.
-	 * @throws Exception 
+	 * @throws Exception
 	 */
 	public ProviderInfo resolveContentProvider(String authority, int flags) {
 		for (PackageParser.Provider p : Context.pkg.providers) {

src/api-impl/android/content/pm/PackageUserState.java

@@ -56,4 +56,4 @@ public class PackageUserState {
 					? new HashSet<String>(o.enabledComponents)
 					: null;
 	}
-}
+}

src/api-impl/android/database/AbstractCursor.java

@@ -481,4 +481,4 @@ public abstract class AbstractCursor implements CrossProcessCursor {
 			}
 		}
 	}
-}
+}

src/api-impl/android/database/AbstractWindowedCursor.java

@@ -133,7 +133,7 @@ public abstract class AbstractWindowedCursor extends AbstractCursor {
 	@Override
 	protected void checkPosition() {
 		super.checkPosition();
-		
+
 		if (mWindow == null) {
 			throw new /*StaleDataException*/RuntimeException("Attempting to access a closed CursorWindow." +
 					"Most probable cause: cursor is deactivated prior to calling this method.");
@@ -206,4 +206,4 @@ public abstract class AbstractWindowedCursor extends AbstractCursor {
 		super.onDeactivateOrClose();
 		closeWindow();
 	}
-}
+}

src/api-impl/android/database/CharArrayBuffer.java

@@ -23,11 +23,11 @@ public final class CharArrayBuffer {
 	public CharArrayBuffer(int size) {
 		data = new char[size];
 	}
-	
+
 	public CharArrayBuffer(char[] buf) {
 		data = buf;
 	}
-	
+
 	public char[] data; // In and out parameter
 	public int sizeCopied; // Out parameter
 }

src/api-impl/android/database/ContentObservable.java

@@ -88,4 +88,4 @@ public class ContentObservable extends Observable<ContentObserver> {
 			}
 		}
 	}
-}
+}

src/api-impl/android/database/ContentObserver.java

@@ -248,4 +248,4 @@ public abstract class ContentObserver {
 			});
 		}
 	}
-}
+}

src/api-impl/android/database/CrossProcessCursor.java

@@ -74,5 +74,5 @@ public interface CrossProcessCursor extends Cursor {
 	 * @param newPosition The position that we're moving to.
 	 * @return True if the move is successful, false otherwise.
 	 */
-	boolean onMove(int oldPosition, int newPosition); 
+	boolean onMove(int oldPosition, int newPosition);
-}
+}

src/api-impl/android/database/DefaultDatabaseErrorHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 
@@ -66,7 +66,7 @@ public final class DefaultDatabaseErrorHandler implements DatabaseErrorHandler {
 		if (!dbObj.isOpen()) {
 			// database files are not even openable. delete this database file.
 			// NOTE if the database has attached databases, then any of them could be corrupt.
-			// and not deleting all of them could cause corrupted database file to remain and 
+			// and not deleting all of them could cause corrupted database file to remain and
 			// make the application crash on database open operation. To avoid this problem,
 			// the application should provide its own {@link DatabaseErrorHandler} impl class
 			// to delete ALL files of the database (including the attached databases).

src/api-impl/android/database/SQLException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/DatabaseObjectNotClosedException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteAbortException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteAccessPermException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteBindOrColumnIndexOutOfRangeException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteBlobTooBigException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteCantOpenDatabaseException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteClosable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteConnection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteConnectionPool.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteConstraintException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteCursor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 
@@ -130,10 +130,10 @@ public class SQLiteCursor extends AbstractWindowedCursor {
 		return mCount;
 	}
 
-	/* 
+	/*
 	** The AbstractWindowClass contains protected methods clearOrCreateWindow() and
 	** closeWindow(), which are used by the android.database.sqlite.* version of this
-	** class. But, since they are marked with "@hide", the following replacement 
+	** class. But, since they are marked with "@hide", the following replacement
 	** versions are required.
 	*/
 	private void awc_clearOrCreateWindow(String name){

src/api-impl/android/database/sqlite/SQLiteCustomFunction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteDatabase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 
@@ -1743,7 +1743,7 @@ public final class SQLiteDatabase extends SQLiteClosable {
 	 * Returns true if the new version code is greater than the current database version.
 	 *
 	 * @param newVersion The new version code.
-	 * @return True if the new version code is greater than the current database version. 
+	 * @return True if the new version code is greater than the current database version.
 	 */
 	public boolean needUpgrade(int newVersion) {
 		return newVersion > getVersion();

src/api-impl/android/database/sqlite/SQLiteDatabaseConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteDatabaseCorruptException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteDatabaseLockedException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteDatatypeMismatchException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteDebug.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteDiskIOException.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 
 package android.database.sqlite;
 
 /**
- * An exception that indicates that an IO error occured while accessing the 
+ * An exception that indicates that an IO error occured while accessing the
  * SQLite database file.
  */
 public class SQLiteDiskIOException extends SQLiteException {

src/api-impl/android/database/sqlite/SQLiteDoneException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteFullException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteGlobal.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteMisuseException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteOpenHelper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteOutOfMemoryException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteProgram.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteQuery.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteQueryBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteReadOnlyDatabaseException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteSession.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteStatement.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteStatementInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteTableLockedException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/database/sqlite/SQLiteTransactionListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 /*
-** Modified to support SQLite extensions by the SQLite developers: 
+** Modified to support SQLite extensions by the SQLite developers:
 ** sqlite-dev@sqlite.org.
 */
 

src/api-impl/android/graphics/Paint.java

@@ -60,9 +60,9 @@ public class Paint {
 	}
 	public void getTextBounds(String text, int start, int end, Rect bounds) {}
 	public void getTextBounds(char[] text, int index, int count, Rect bounds) {}
-	public int getTextWidths(String text, int start, int end, float[] widths) { 
+	public int getTextWidths(String text, int start, int end, float[] widths) {
 		// TODO fix it
-		return 0; 
+		return 0;
 	}
 	public void setFilterBitmap(boolean filter) {}
 
@@ -100,7 +100,7 @@ public class Paint {
 		return colorFilter;
 	}
 
-	public Shader setShader(Shader shader) { return shader; } 
+	public Shader setShader(Shader shader) { return shader; }
 
 	public enum Style {
 		/**

src/api-impl/android/graphics/PointF.java

@@ -24,13 +24,13 @@ import android.os.Parcelable;
 public class PointF implements Parcelable {
 	public float x;
 	public float y;
-	
+
 	public PointF() {}
 	public PointF(float x, float y) {
 		this.x = x;
-		this.y = y; 
+		this.y = y;
 	}
-	
+
 	public PointF(Point p) {
 		this.x = p.x;
 		this.y = p.y;
@@ -46,7 +46,7 @@ public class PointF implements Parcelable {
 		this.x = p.x;
 		this.y = p.y;
 	}
-	
+
 	/**
 	 * Set the point's x and y coordinates
 	 */
@@ -54,7 +54,7 @@ public class PointF implements Parcelable {
 		this.x = x;
 		this.y = y;
 	}
-	
+
 	/**
 	 * Set the point's x and y coordinates to the coordinates of p
 	 */
@@ -62,22 +62,22 @@ public class PointF implements Parcelable {
 		this.x = p.x;
 		this.y = p.y;
 	}
-	
+
-	public final void negate() { 
+	public final void negate() {
 		x = -x;
-		y = -y; 
+		y = -y;
 	}
-	
+
 	public final void offset(float dx, float dy) {
 		x += dx;
 		y += dy;
 	}
-	
+
 	/**
 	 * Returns true if the point's coordinates equal (x,y)
 	 */
-	public final boolean equals(float x, float y) { 
+	public final boolean equals(float x, float y) {
-		return this.x == x && this.y == y; 
+		return this.x == x && this.y == y;
 	}
 
 	@Override
@@ -105,14 +105,14 @@ public class PointF implements Parcelable {
 	/**
 	 * Return the euclidian distance from (0,0) to the point
 	 */
-	public final float length() { 
+	public final float length() {
-		return length(x, y); 
+		return length(x, y);
 	}
-	
+
 	/**
 	 * Returns the euclidian distance from (0,0) to (x,y)
 	 */
 	public static float length(float x, float y) {
 		return (float) Math.hypot(x, y);
 	}
-}
+}

src/api-impl/android/graphics/drawable/Animatable.java

@@ -1,5 +1,5 @@
 package android.graphics.drawable;
 
 public interface Animatable {
-	
+
 }

src/api-impl/android/graphics/drawable/Drawable.java

@@ -71,7 +71,7 @@ public class Drawable {
 			public int getChangingConfigurations() {
 				return Drawable.this.getChangingConfigurations();
 			}
-			
+
 		};
 	}
 
@@ -127,7 +127,7 @@ public class Drawable {
 
 	public void invalidateSelf() {
 		native_invalidate(paintable);
-	
+
 		/* this shouldn't ever be needed with Gtk, but let's play it safe for now */
 		if (this.callback != null) {
 			callback.invalidateDrawable(this);

src/api-impl/android/graphics/drawable/ScaleDrawable.java

@@ -9,5 +9,5 @@ public class ScaleDrawable extends Drawable {
 		// TODO Auto-generated method stub
 		throw new UnsupportedOperationException("Unimplemented method 'draw'");
 	}
-	
+
 }

src/api-impl/android/graphics/drawable/ShapeDrawable.java

@@ -13,5 +13,5 @@ public class ShapeDrawable extends Drawable {
 	public void setPadding(Rect padding) {}
 
 	public void setShape(Shape shape) {}
-	
+
 }

src/api-impl/android/location/GnssStatus.java

@@ -0,0 +1,37 @@
+package android.location;
+
+public final class GnssStatus {
+	public static final int CONSTELLATION_UNKNOWN = 0;
+	public static final int CONSTELLATION_GPS = 1;
+	public static final int CONSTELLATION_SBAS = 2;
+	public static final int CONSTELLATION_GLONASS = 3;
+	public static final int CONSTELLATION_QZSS = 4;
+	public static final int CONSTELLATION_BEIDOU = 5;
+	public static final int CONSTELLATION_GALILEO = 6;
+	public static final int CONSTELLATION_IRNSS = 7;
+
+	public GnssStatus() {
+	}
+
+	public static abstract class Callback {
+		public void onStarted() {
+		}
+
+		public void onStopped() {
+		}
+
+		public void onFirstFix(int ttffMillis) {
+		}
+
+		public void onSatelliteStatusChanged(GnssStatus status) {
+		}
+	}
+
+	public int getSatelliteCount() {
+		return 3; // FIXME
+	}
+
+	public boolean usedInFix(int index) {
+		return true; // FIXME
+	}
+}

src/api-impl/android/location/Location.java

@@ -23,5 +23,5 @@ public class Location {
 	public double getBearing() {
 		return bearing;
 	}
-	
+
 }

src/api-impl/android/media/MediaCodec.java

@@ -198,5 +198,5 @@ public class MediaCodec {
 	}
 
 	public static interface OnFrameRenderedListener {}
-	
+
 }

src/api-impl/android/media/MediaDescription.java

@@ -41,5 +41,5 @@ public class MediaDescription {
 			return description;
 		}
 	}
-	
+
 }

src/api-impl/android/net/Network.java

@@ -5,4 +5,3 @@ public class Network {
 		return 1L;
 	}
 }
-

src/api-impl/android/net/http/X509TrustManagerExtensions.java

@@ -10,7 +10,7 @@ public class X509TrustManagerExtensions {
 
 	public X509TrustManagerExtensions(X509TrustManager tm) {}
 
-	public List<X509Certificate> checkServerTrusted (X509Certificate[] chain, 
+	public List<X509Certificate> checkServerTrusted (X509Certificate[] chain,
                 String authType, String host) {
 		return new ArrayList<>();
 	}

src/api-impl/android/net/wifi/p2p/WifiP2pManager.java

@@ -1,5 +1,5 @@
 package android.net.wifi.p2p;
 
 public class WifiP2pManager {
-	
+
 }

src/api-impl/android/nfc/NfcManager.java

@@ -1,5 +1,5 @@
 package android.nfc;
 
 public class NfcManager {
-	
+
 }

src/api-impl/android/os/ConditionVariable.java

@@ -42,7 +42,7 @@ public class ConditionVariable {
 
 	/**
 	 * Create the ConditionVariable with the given state.
-	* 
+	*
 	* <p>
 	* Pass true for opened and false for closed.
 	*/

src/api-impl/android/os/DropBoxManager.java

@@ -1,5 +1,5 @@
 package android.os;
 
 public class DropBoxManager {
-	
+
 }

src/api-impl/android/os/FileObserver.java

@@ -7,7 +7,7 @@ public class FileObserver {
 	public FileObserver(String path) {}
 
 	public void startWatching() {}
-	
+
 	public void stopWatching() {}
-	
+
 }

src/api-impl/android/os/OperationCanceledException.java

@@ -22,7 +22,7 @@ package android.os;
  * @see CancellationSignal
  */
 public class OperationCanceledException extends RuntimeException {
- 
+
 	public OperationCanceledException() {
 		this(null);
 	}
@@ -30,4 +30,4 @@ public class OperationCanceledException extends RuntimeException {
 	public OperationCanceledException(String message) {
 		super(message != null ? message : "The operation has been canceled.");
 	}
-}
+}

src/api-impl/android/os/StrictMode.java

@@ -11,7 +11,7 @@ public final class StrictMode {
 	public static ThreadPolicy allowThreadDiskReads() {
 		return new ThreadPolicy();
 	}
-	public static ThreadPolicy getThreadPolicy() { 
+	public static ThreadPolicy getThreadPolicy() {
 		return new ThreadPolicy();
 	}
 
@@ -22,7 +22,7 @@ public final class StrictMode {
 		final int mask;
 		final OnThreadViolationListener listener;
 		final Executor callbackExecutor;
-		
+
 		private ThreadPolicy(int mask, OnThreadViolationListener listener, Executor executor) {
 		    this.mask = mask;
 		    this.listener = listener;
@@ -37,7 +37,7 @@ public final class StrictMode {
 				public void execute(Runnable command) {}
 			};
 		}
-	
+
 		public static final class Builder {
 			private int mask = 0;
 			private OnThreadViolationListener listener;

src/api-impl/android/os/storage/StorageManager.java

@@ -1,5 +1,5 @@
 package android.os.storage;
 
 public class StorageManager {
-	
+
 }

src/api-impl/android/text/Layout.java

@@ -3,7 +3,7 @@ package android.text;
 import android.graphics.Canvas;
 
 public class Layout {
-	
+
 	public enum Alignment {
 		ALIGN_NORMAL,
 		ALIGN_OPPOSITE,

src/api-impl/android/text/Selection.java

@@ -148,4 +148,4 @@ public class Selection {
 	 */
 	public static final Object SELECTION_START = new START();
 	public static final Object SELECTION_END = new END();
-}
+}

src/api-impl/android/text/SpannableStringBuilder.java

@@ -1415,4 +1415,4 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable
 	private static final int SPAN_END_AT_START = 0x4000;
 	private static final int SPAN_END_AT_END = 0x8000;
 	private static final int SPAN_START_END_MASK = 0xF000;
-}
+}

src/api-impl/android/text/format/DateUtils.java

@@ -13,7 +13,7 @@ public class DateUtils {
 	public static boolean isToday(long millis) {
 		Date d1 = new Date(millis);
 		Date d2 = new Date();
-		
+
 		return d1.getYear() == d2.getYear() && d1.getMonth() == d2.getMonth() && d1.getDate() == d2.getDate();
 	}
 

src/api-impl/android/text/method/LinkMovementMethod.java

@@ -5,5 +5,5 @@ public class LinkMovementMethod extends BaseMovementMethod {
 	public static MovementMethod getInstance() {
 		return new LinkMovementMethod();
 	}
-	
+
 }

src/api-impl/android/util/JsonToken.java

@@ -79,4 +79,4 @@ public enum JsonToken {
 	 * tokens.
 	 */
 	END_DOCUMENT
-}
+}

src/api-impl/android/util/LruCache.java

@@ -358,4 +358,4 @@ public class LruCache<K, V> {
 		return String.format("LruCache[maxSize=%d,hits=%d,misses=%d,hitRate=%d%%]",
 				maxSize, hitCount, missCount, hitPercent);
 	}
-}
+}

src/api-impl/android/util/Property.java

@@ -77,4 +77,4 @@ public abstract class Property<T, V> {
 	public Class<V> getType() {
 		return mType;
 	}
-}
+}

src/api-impl/android/view/AbsSavedState.java

@@ -1,5 +1,5 @@
 package android.view;
 
 public class AbsSavedState {
-	
+
 }