drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 79762a3: location: Move DummyLocationProvider.java and LocationProvid

Browse Source 
Merge commit '79762a3ee34eb8be5549bcb183af844b6f19c266'

* commit '79762a3ee34eb8be5549bcb183af844b6f19c266':
  location: Move DummyLocationProvider.java and LocationProviderImpl.java to the internal package.
This commit is contained in:
Mike Lockwood
2009-04-29 13:35:34 -07:00
committed by The Android Open Source Project
parent 8749fecd99 79762a3ee3
commit 05d0243296
10 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
location/java/android/location/LocationManager.java
View File

@ -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;

4
location/java/android/location/LocationProvider.java
View File

@ -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");

8
location/java/android/location/DummyLocationProvider.java → location/java/com/android/internal/location/DummyLocationProvider.java
View File

@ -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);
}

1
location/java/com/android/internal/location/GpsLocationProvider.java
View File

@ -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;

15
location/java/android/location/LocationProviderImpl.java → location/java/com/android/internal/location/LocationProviderImpl.java
View File

@ -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

1
location/java/com/android/internal/location/LocationProviderProxy.java
View File

@ -21,7 +21,6 @@ import android.location.ILocationManager;
import android.location.ILocationProvider;
import android.location.Location;
import android.location.LocationManager;
import android.location.LocationProviderImpl;
import android.os.Bundle;
import android.os.RemoteException;
import android.util.Log;

1
location/java/com/android/internal/location/MockProvider.java
View File

@ -18,7 +18,6 @@ package com.android.internal.location;
import android.location.ILocationManager;
import android.location.Location;
import android.location.LocationProviderImpl;
import android.os.Bundle;
import android.util.PrintWriterPrinter;

1
location/java/com/android/internal/location/TrackProvider.java
View File

@ -18,7 +18,6 @@ import java.util.StringTokenizer;
import android.location.Criteria;
import android.location.ILocationManager;
import android.location.Location;
import android.location.LocationProviderImpl;
import android.os.Bundle;
import android.util.Config;
import android.util.Log;