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

Commit 43e33f28 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Move files internal to LocationManagerService from framework.jar to services.jar 



Change-Id: I3dbb40210d87708e0bff46729f707d4ab8e29e42
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 96a2b308

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ LOCAL_SRC_FILES:= \ 
	android_server_BluetoothA2dpService.cpp \

	android_message_digest_sha1.cpp \

	android_ddm_DdmHandleNativeHeap.cpp \

	android_location_GpsLocationProvider.cpp \

	com_android_internal_os_ZygoteInit.cpp \

	com_android_internal_graphics_NativeUtils.cpp \

	android_backup_BackupDataInput.cpp \

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ extern int register_android_server_BluetoothEventLoop(JNIEnv *env); 
extern int register_android_server_BluetoothA2dpService(JNIEnv* env);

extern int register_android_ddm_DdmHandleNativeHeap(JNIEnv *env);

extern int register_com_android_internal_os_ZygoteInit(JNIEnv* env);

extern int register_android_location_GpsLocationProvider(JNIEnv* env);

extern int register_android_backup_BackupDataInput(JNIEnv *env);

extern int register_android_backup_BackupDataOutput(JNIEnv *env);

extern int register_android_backup_FileBackupHelperBase(JNIEnv *env);
@@ -1267,7 +1266,6 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_server_BluetoothA2dpService),

    REG_JNI(register_android_message_digest_sha1),

    REG_JNI(register_android_ddm_DdmHandleNativeHeap),

    REG_JNI(register_android_location_GpsLocationProvider),

    REG_JNI(register_android_backup_BackupDataInput),

    REG_JNI(register_android_backup_BackupDataOutput),

    REG_JNI(register_android_backup_FileBackupHelperBase),

location/java/android/location/LocationManager.java

+31 −0
Original line number Diff line number Diff line
@@ -117,6 +117,37 @@ public class LocationManager { 
     */

    public static final String KEY_LOCATION_CHANGED = "location";



    /**

     * Broadcast intent action indicating that the GPS has either been

     * enabled or disabled. An intent extra provides this state as a boolean,

     * where {@code true} means enabled.

     * @see #EXTRA_GPS_ENABLED

     *

     * {@hide}

     */

    public static final String GPS_ENABLED_CHANGE_ACTION =

        "android.location.GPS_ENABLED_CHANGE";



    /**

     * Broadcast intent action indicating that the GPS has either started or

     * stopped receiving GPS fixes. An intent extra provides this state as a

     * boolean, where {@code true} means that the GPS is actively receiving fixes.

     * @see #EXTRA_GPS_ENABLED

     *

     * {@hide}

     */

    public static final String GPS_FIX_CHANGE_ACTION =

        "android.location.GPS_FIX_CHANGE";



    /**

     * The lookup key for a boolean that indicates whether GPS is enabled or

     * disabled. {@code true} means GPS is enabled. Retrieve it with

     * {@link android.content.Intent#getBooleanExtra(String,boolean)}.

     *

     * {@hide}

     */

    public static final String EXTRA_GPS_ENABLED = "enabled";



    // Map from LocationListeners to their associated ListenerTransport objects

    private HashMap<LocationListener,ListenerTransport> mListeners =

        new HashMap<LocationListener,ListenerTransport>();

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+12 −12
Original line number Diff line number Diff line
@@ -94,18 +94,18 @@ public class GpsNetInitiatedHandler { 
        

    public static class GpsNiNotification

    {

        int notificationId;

        int niType;

        boolean needNotify;

        boolean needVerify;

        boolean privacyOverride;

        int timeout;

        int defaultResponse;

        String requestorId;

        String text;

        int requestorIdEncoding;

        int textEncoding;

        Bundle extras;

        public int notificationId;

        public int niType;

        public boolean needNotify;

        public boolean needVerify;

        public boolean privacyOverride;

        public int timeout;

        public int defaultResponse;

        public String requestorId;

        public String text;

        public int requestorIdEncoding;

        public int textEncoding;

        public Bundle extras;

    };

    

    public static class GpsNiResponse {

preloaded-classes

+0 −2
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ android.location.ILocationManager$Stub 
android.location.ILocationManager$Stub$Proxy

android.location.Location

android.location.LocationManager

android.location.LocationProviderInterface

android.media.AudioFormat

android.media.AudioManager

android.media.AudioRecord
@@ -633,7 +632,6 @@ com.android.internal.appwidget.IAppWidgetService$Stub 
com.android.internal.content.SyncStateContentProviderHelper

com.android.internal.graphics.NativeUtils

com.android.internal.location.DummyLocationProvider

com.android.internal.location.GpsLocationProvider

com.android.internal.logging.AndroidHandler

com.android.internal.os.AndroidPrintStream

com.android.internal.os.BinderInternal