Merge "Revert "Move location provider lib to frameworks/ex - 2""

8 files changed, 0 insertions, 637 deletions

diff --git a/location/Android.mk b/location/Android.mk
deleted file mode 100644
index e4e98ca..0000000
--- a/location/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2010 The Android Open Source Project
-#
-# 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-# the library
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= com.android.location.provider
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-            $(call all-subdir-java-files) \
-            $(call all-aidl-files-under, src)
-
-include $(BUILD_JAVA_LIBRARY)
-
-
-# ====  com.google.location.xml lib def  ========================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := com.android.location.provider.xml
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE_CLASS := ETC
-
-# This will install the file in /system/etc/permissions
-#
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
-include $(BUILD_PREBUILT)
diff --git a/location/README.txt b/location/README.txt
deleted file mode 100644
index 400a7dd..0000000
--- a/location/README.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-This library (com.android.location.provider.jar) is a shared java library
-containing classes required by unbundled location providers.
-
---- Rules of this library ---
-o This library is effectively a PUBLIC API for unbundled location providers
-  that may be distributed outside the system image. So it MUST BE API STABLE.
-  You can add but not remove. The rules are the same as for the
-  public platform SDK API.
-o This library can see and instantiate internal platform classes (such as
-  ProviderRequest.java), but it must not expose them in any public method
-  (or by extending them via inheritance). This would break clients of the
-  library because they cannot see the internal platform classes.
-
-This library is distributed in the system image, and loaded as
-a shared library. So you can change the implementation, but not
-the interface. In this way it is like framework.jar.
-
---- Why does this library exists? ---
-
-Unbundled location providers (such as the NetworkLocationProvider)
-can not use internal platform classes.
-
-So ideally all of these classes would be part of the public platform SDK API,
-but that doesn't seem like a great idea when only applications with a special
-signature can implement this API.
-
-The compromise is this library.
-
-It wraps internal platform classes (like ProviderRequest) with a stable
-API that does not leak the internal classes.
diff --git a/location/com.android.location.provider.xml b/location/com.android.location.provider.xml
deleted file mode 100644
index 000e68f..0000000
--- a/location/com.android.location.provider.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     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.
--->
-
-<permissions>
-    <library name="com.android.location.provider"
-            file="/system/framework/com.android.location.provider.jar" />
-</permissions>
diff --git a/location/src/com/android/location/provider/GeocodeProvider.java b/location/src/com/android/location/provider/GeocodeProvider.java
deleted file mode 100644
index d7a34af..0000000
--- a/location/src/com/android/location/provider/GeocodeProvider.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * 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.android.location.provider;
-
-import android.os.IBinder;
-
-import android.location.Address;
-import android.location.GeocoderParams;
-import android.location.IGeocodeProvider;
-
-import java.util.List;
-
-/**
- * Base class for geocode providers implemented as unbundled services.
- *
- * <p>Geocode providers can be implemented as services and return the result of
- * {@link GeocodeProvider#getBinder()} in its getBinder() method.
- *
- * <p>IMPORTANT: This class is effectively a public API for unbundled
- * applications, and must remain API stable. See README.txt in the root
- * of this package for more information.
- */
-public abstract class GeocodeProvider {
-
-    private IGeocodeProvider.Stub mProvider = new IGeocodeProvider.Stub() {
-        public String getFromLocation(double latitude, double longitude, int maxResults,
-                GeocoderParams params, List<Address> addrs) {
-            return GeocodeProvider.this.onGetFromLocation(latitude, longitude, maxResults,
-                    params, addrs);
-        }
-
-        public String getFromLocationName(String locationName,
-                double lowerLeftLatitude, double lowerLeftLongitude,
-                double upperRightLatitude, double upperRightLongitude, int maxResults,
-                GeocoderParams params, List<Address> addrs) {
-            return GeocodeProvider.this.onGetFromLocationName(locationName, lowerLeftLatitude,
-                    lowerLeftLongitude, upperRightLatitude, upperRightLongitude,
-                    maxResults, params, addrs);
-        }
-    };
-
-    /**
-     * This method is overridden to implement the
-     * {@link android.location.Geocoder#getFromLocation(double, double, int)} method.
-     * Classes implementing this method should not hold a reference to the params parameter.
-     */
-    public abstract String onGetFromLocation(double latitude, double longitude, int maxResults,
-            GeocoderParams params, List<Address> addrs);
-
-    /**
-     * This method is overridden to implement the
-     * {@link android.location.Geocoder#getFromLocationName(String, int, double, double, double, double)} method.
-     * Classes implementing this method should not hold a reference to the params parameter.
-     */
-    public abstract String onGetFromLocationName(String locationName,
-            double lowerLeftLatitude, double lowerLeftLongitude,
-            double upperRightLatitude, double upperRightLongitude, int maxResults,
-            GeocoderParams params, List<Address> addrs);
-
-    /**
-     * Returns the Binder interface for the geocode provider.
-     * This is intended to be used for the onBind() method of
-     * a service that implements a geocoder service.
-     *
-     * @return the IBinder instance for the provider
-     */
-    public IBinder getBinder() {
-        return mProvider;
-    }
-}
diff --git a/location/src/com/android/location/provider/LocationProviderBase.java b/location/src/com/android/location/provider/LocationProviderBase.java
deleted file mode 100644
index 8a5a739..0000000
--- a/location/src/com/android/location/provider/LocationProviderBase.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * 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.android.location.provider;
-
-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
-import java.io.PrintWriter;
-
-import android.content.Context;
-import android.location.ILocationManager;
-import android.location.Location;
-import android.location.LocationManager;
-import android.location.LocationRequest;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.WorkSource;
-import android.util.Log;
-
-import com.android.internal.location.ILocationProvider;
-import com.android.internal.location.ProviderProperties;
-import com.android.internal.location.ProviderRequest;
-
-/**
- * Base class for location providers implemented as unbundled services.
- *
- * <p>The network location provider must export a service with action
- * "com.android.location.service.v2.NetworkLocationProvider"
- * and a valid minor version in a meta-data field on the service, and
- * then return the result of {@link #getBinder()} on service binding.
- *
- * <p>The fused location provider must export a service with action
- * "com.android.location.service.FusedLocationProvider"
- * and a valid minor version in a meta-data field on the service, and
- * then return the result of {@link #getBinder()} on service binding.
- *
- * <p>IMPORTANT: This class is effectively a public API for unbundled
- * applications, and must remain API stable. See README.txt in the root
- * of this package for more information.
- */
-public abstract class LocationProviderBase {
-    private final String TAG;
-
-    protected final ILocationManager mLocationManager;
-    private final ProviderProperties mProperties;
-    private final IBinder mBinder;
-
-    /**
-     * Bundle key for a version of the location containing no GPS data.
-     * Allows location providers to flag locations as being safe to
-     * feed to LocationFudger.
-     */
-    public static final String EXTRA_NO_GPS_LOCATION = Location.EXTRA_NO_GPS_LOCATION;
-
-    /**
-     * Name of the Fused location provider.
-     *
-     * <p>This provider combines inputs for all possible location sources
-     * to provide the best possible Location fix.
-     */
-    public static final String FUSED_PROVIDER = LocationManager.FUSED_PROVIDER;
-
-    private final class Service extends ILocationProvider.Stub {
-        @Override
-        public void enable() {
-            onEnable();
-        }
-        @Override
-        public void disable() {
-            onDisable();
-        }
-        @Override
-        public void setRequest(ProviderRequest request, WorkSource ws) {
-            onSetRequest(new ProviderRequestUnbundled(request), ws);
-        }
-        @Override
-        public ProviderProperties getProperties() {
-            return mProperties;
-        }
-        @Override
-        public int getStatus(Bundle extras) {
-            return onGetStatus(extras);
-        }
-        @Override
-        public long getStatusUpdateTime() {
-            return onGetStatusUpdateTime();
-        }
-        @Override
-        public boolean sendExtraCommand(String command, Bundle extras) {
-            return onSendExtraCommand(command, extras);
-        }
-        @Override
-        public void dump(FileDescriptor fd, String[] args) {
-            PrintWriter pw = new PrintWriter(new FileOutputStream(fd));
-            onDump(fd, pw, args);
-            pw.flush();
-        }
-    }
-
-    public LocationProviderBase(String tag, ProviderPropertiesUnbundled properties) {
-        TAG = tag;
-        IBinder b = ServiceManager.getService(Context.LOCATION_SERVICE);
-        mLocationManager = ILocationManager.Stub.asInterface(b);
-        mProperties = properties.getProviderProperties();
-        mBinder = new Service();
-    }
-
-    public IBinder getBinder() {
-        return mBinder;
-    }
-
-    /**
-     * Used by the location provider to report new locations.
-     *
-     * @param location new Location to report
-     *
-     * Requires the android.permission.INSTALL_LOCATION_PROVIDER permission.
-     */
-    public final void reportLocation(Location location) {
-        try {
-            mLocationManager.reportLocation(location, false);
-        } catch (RemoteException e) {
-            Log.e(TAG, "RemoteException", e);
-        } catch (Exception e) {
-            // never crash provider, might be running in a system process
-            Log.e(TAG, "Exception", e);
-        }
-    }
-
-    /**
-     * Enable the location provider.
-     * <p>The provider may initialize resources, but does
-     * not yet need to report locations.
-     */
-    public abstract void onEnable();
-
-    /**
-     * Disable the location provider.
-     * <p>The provider must release resources, and stop
-     * performing work. It may no longer report locations.
-     */
-    public abstract void onDisable();
-
-    /**
-     * Set the {@link ProviderRequest} requirements for this provider.
-     * <p>Each call to this method overrides all previous requests.
-     * <p>This method might trigger the provider to start returning
-     * locations, or to stop returning locations, depending on the
-     * parameters in the request.
-     */
-    public abstract void onSetRequest(ProviderRequestUnbundled request, WorkSource source);
-
-    /**
-     * Dump debug information.
-     */
-    public void onDump(FileDescriptor fd, PrintWriter pw, String[] args) {
-    }
-
-    /**
-     * Returns a information on the status of this provider.
-     * <p>{@link android.location.LocationProvider#OUT_OF_SERVICE} is returned if the provider is
-     * out of service, and this is not expected to change in the near
-     * future; {@link android.location.LocationProvider#TEMPORARILY_UNAVAILABLE} is returned if
-     * the provider is temporarily unavailable but is expected to be
-     * available shortly; and {@link android.location.LocationProvider#AVAILABLE} is returned
-     * if the provider is currently available.
-     *
-     * <p>If extras is non-null, additional status information may be
-     * added to it in the form of provider-specific key/value pairs.
-     */
-    public abstract int onGetStatus(Bundle extras);
-
-    /**
-     * Returns the time at which the status was last updated. It is the
-     * responsibility of the provider to appropriately set this value using
-     * {@link android.os.SystemClock#elapsedRealtime SystemClock.elapsedRealtime()}.
-     * there is a status update that it wishes to broadcast to all its
-     * listeners. The provider should be careful not to broadcast
-     * the same status again.
-     *
-     * @return time of last status update in millis since last reboot
-     */
-    public abstract long onGetStatusUpdateTime();
-
-    /**
-     * Implements addditional location provider specific additional commands.
-     *
-     * @param command name of the command to send to the provider.
-     * @param extras optional arguments for the command (or null).
-     * The provider may optionally fill the extras Bundle with results from the command.
-     *
-     * @return true if the command succeeds.
-     */
-    public boolean onSendExtraCommand(String command, Bundle extras) {
-        // default implementation
-        return false;
-    }
-}
diff --git a/location/src/com/android/location/provider/LocationRequestUnbundled.java b/location/src/com/android/location/provider/LocationRequestUnbundled.java
deleted file mode 100644
index 41fd769..0000000
--- a/location/src/com/android/location/provider/LocationRequestUnbundled.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * 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.android.location.provider;
-
-import android.location.LocationRequest;
-
-/**
- * This class is an interface to LocationRequests for unbundled applications.
- *
- * <p>IMPORTANT: This class is effectively a public API for unbundled
- * applications, and must remain API stable. See README.txt in the root
- * of this package for more information.
- */
-public final class LocationRequestUnbundled {
-    /**
-     * Returned by {@link #getQuality} when requesting the most accurate locations available.
-     *
-     * <p>This may be up to 1 meter accuracy, although this is implementation dependent.
-     */
-    public static final int ACCURACY_FINE = LocationRequest.ACCURACY_FINE;
-
-    /**
-     * Returned by {@link #getQuality} when requesting "block" level accuracy.
-     *
-     * <p>Block level accuracy is considered to be about 100 meter accuracy,
-     * although this is implementation dependent. Using a coarse accuracy
-     * such as this often consumes less power.
-     */
-    public static final int ACCURACY_BLOCK = LocationRequest.ACCURACY_BLOCK;
-
-    /**
-     * Returned by {@link #getQuality} when requesting "city" level accuracy.
-     *
-     * <p>City level accuracy is considered to be about 10km accuracy,
-     * although this is implementation dependent. Using a coarse accuracy
-     * such as this often consumes less power.
-     */
-    public static final int ACCURACY_CITY = LocationRequest.ACCURACY_CITY;
-
-    /**
-     * Returned by {@link #getQuality} when requiring no direct power impact (passive locations).
-     *
-     * <p>This location request will not trigger any active location requests,
-     * but will receive locations triggered by other applications. Your application
-     * will not receive any direct power blame for location work.
-     */
-    public static final int POWER_NONE = LocationRequest.POWER_NONE;
-
-    /**
-     * Returned by {@link #getQuality} when requesting low power impact.
-     *
-     * <p>This location request will avoid high power location work where
-     * possible.
-     */
-    public static final int POWER_LOW = LocationRequest.POWER_LOW;
-
-    /**
-     * Returned by {@link #getQuality} when allowing high power consumption for location.
-     *
-     * <p>This location request will allow high power location work.
-     */
-    public static final int POWER_HIGH = LocationRequest.POWER_HIGH;
-
-    private final LocationRequest delegate;
-
-    LocationRequestUnbundled(LocationRequest delegate) {
-        this.delegate = delegate;
-    }
-
-    /**
-     * Get the desired interval of this request, in milliseconds.
-     *
-     * @return desired interval in milliseconds, inexact
-     */
-    public long getInterval() {
-        return delegate.getInterval();
-    }
-
-    /**
-     * Get the fastest interval of this request, in milliseconds.
-     *
-     * <p>The system will never provide location updates faster
-     * than the minimum of {@link #getFastestInterval} and
-     * {@link #getInterval}.
-     *
-     * @return fastest interval in milliseconds, exact
-     */
-    public long getFastestInterval() {
-        return delegate.getFastestInterval();
-    }
-
-    /**
-     * Get the quality of the request.
-     *
-     * @return an accuracy or power constant
-     */
-    public int getQuality() {
-        return delegate.getQuality();
-    }
-
-    /**
-     * Get the minimum distance between location updates, in meters.
-     *
-     * @return minimum distance between location updates in meters
-     */
-    public float getSmallestDisplacement() {
-        return delegate.getSmallestDisplacement();
-    }
-
-    @Override
-    public String toString() {
-      return delegate.toString();
-    }
-}
diff --git a/location/src/com/android/location/provider/ProviderPropertiesUnbundled.java b/location/src/com/android/location/provider/ProviderPropertiesUnbundled.java
deleted file mode 100644
index 9ee4df2..0000000
--- a/location/src/com/android/location/provider/ProviderPropertiesUnbundled.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * 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.android.location.provider;
-
-import com.android.internal.location.ProviderProperties;
-
-/**
- * This class is an interface to Provider Properties for unbundled applications.
- *
- * <p>IMPORTANT: This class is effectively a public API for unbundled
- * applications, and must remain API stable. See README.txt in the root
- * of this package for more information.
- */
-public final class ProviderPropertiesUnbundled {
-    private final ProviderProperties mProperties;
-
-    public static ProviderPropertiesUnbundled create(boolean requiresNetwork,
-            boolean requiresSatellite, boolean requiresCell, boolean hasMonetaryCost,
-            boolean supportsAltitude, boolean supportsSpeed, boolean supportsBearing,
-            int powerRequirement, int accuracy) {
-        return new ProviderPropertiesUnbundled(new ProviderProperties(requiresNetwork,
-                requiresSatellite, requiresCell, hasMonetaryCost, supportsAltitude, supportsSpeed,
-                supportsBearing, powerRequirement, accuracy));
-    }
-
-    private ProviderPropertiesUnbundled(ProviderProperties properties) {
-        mProperties = properties;
-    }
-
-    public ProviderProperties getProviderProperties() {
-        return mProperties;
-    }
-
-    @Override
-    public String toString() {
-        return mProperties.toString();
-    }
-}
diff --git a/location/src/com/android/location/provider/ProviderRequestUnbundled.java b/location/src/com/android/location/provider/ProviderRequestUnbundled.java
deleted file mode 100644
index ad3d1df..0000000
--- a/location/src/com/android/location/provider/ProviderRequestUnbundled.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * 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.android.location.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.location.LocationRequest;
-
-import com.android.internal.location.ProviderRequest;
-
-/**
- * This class is an interface to Provider Requests for unbundled applications.
- *
- * <p>IMPORTANT: This class is effectively a public API for unbundled
- * applications, and must remain API stable. See README.txt in the root
- * of this package for more information.
- */
-public final class ProviderRequestUnbundled {
-    private final ProviderRequest mRequest;
-
-    public ProviderRequestUnbundled(ProviderRequest request) {
-        mRequest = request;
-    }
-
-    public boolean getReportLocation() {
-        return mRequest.reportLocation;
-    }
-
-    public long getInterval() {
-        return mRequest.interval;
-    }
-
-    /**
-     * Never null.
-     */
-    public List<LocationRequestUnbundled> getLocationRequests() {
-        List<LocationRequestUnbundled> result = new ArrayList<LocationRequestUnbundled>(
-                mRequest.locationRequests.size());
-        for (LocationRequest r : mRequest.locationRequests) {
-          result.add(new LocationRequestUnbundled(r));
-        }
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return mRequest.toString();
-    }
-}