Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79762a3e authored by Mike Lockwood's avatar Mike Lockwood
Browse files

location: Move DummyLocationProvider.java and LocationProviderImpl.java to the internal package. 



Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent eedf815a

location/java/android/location/LocationManager.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.os.Message; 
import android.util.Config;

import android.util.Log;



import com.android.internal.location.DummyLocationProvider;



import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

location/java/android/location/LocationProvider.java

+3 −1
Original line number Diff line number Diff line
@@ -47,8 +47,10 @@ public abstract class LocationProvider { 
     * consist only of the characters [a-zA-Z0-9].

     *

     * @throws IllegalArgumentException if name contains an illegal character

     *

     * {@hide}

     */

    LocationProvider(String name) {

    public LocationProvider(String name) {

        if (name.matches(BAD_CHARS_REGEX)) {

            throw new IllegalArgumentException("name " + name +

                " contains an illegal character");

location/java/android/location/DummyLocationProvider.java→location/java/com/android/internal/location/DummyLocationProvider.java

+5 −3
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
 * limitations under the License.

 */



package android.location;

package com.android.internal.location;



import android.location.LocationProvider;



/**

 * A stub implementation of LocationProvider used by LocationManager.
@@ -24,7 +26,7 @@ package android.location; 
 * 

 * {@hide}

 */

class DummyLocationProvider extends LocationProvider {

public class DummyLocationProvider extends LocationProvider {



    private static final String TAG = "DummyLocationProvider";
@@ -39,7 +41,7 @@ class DummyLocationProvider extends LocationProvider { 
    int mPowerRequirement;

    int mAccuracy;



    /* package */ DummyLocationProvider(String name) {

    public DummyLocationProvider(String name) {

        super(name);

    }

location/java/com/android/internal/location/GpsLocationProvider.java

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.location.ILocationManager; 
import android.location.Location;

import android.location.LocationManager;

import android.location.LocationProvider;

import android.location.LocationProviderImpl;

import android.net.ConnectivityManager;

import android.net.SntpClient;

import android.os.Bundle;

location/java/android/location/LocationProviderImpl.java→location/java/com/android/internal/location/LocationProviderImpl.java

+9 −6
Original line number Diff line number Diff line
@@ -14,7 +14,15 @@ 
 * limitations under the License.

 */



package android.location;

package com.android.internal.location;



import android.location.ILocationManager;

import android.location.Location;

import android.location.LocationProvider;

import android.os.Bundle;

import android.os.RemoteException;

import android.util.Config;

import android.util.Log;



import java.io.BufferedReader;

import java.io.File;
@@ -24,11 +32,6 @@ import java.util.ArrayList; 
import java.util.HashMap;

import java.util.List;



import android.os.Bundle;

import android.os.RemoteException;

import android.util.Config;

import android.util.Log;



/**

 * An abstract superclass for location provider implementations.

 * Location provider implementations are typically instantiated by the