diff options
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | location/lib/Android.bp | 21 | ||||
| -rw-r--r-- | location/lib/Android.mk | 66 | ||||
| -rw-r--r-- | location/lib/api/current.txt | 47 | ||||
| -rw-r--r-- | location/lib/api/removed.txt | 0 | ||||
| -rw-r--r-- | location/lib/api/system-current.txt | 0 | ||||
| -rw-r--r-- | location/lib/api/system-removed.txt | 0 | ||||
| -rw-r--r-- | location/lib/api/test-current.txt | 0 | ||||
| -rw-r--r-- | location/lib/api/test-removed.txt | 0 | ||||
| -rw-r--r-- | location/lib/com.android.location.provider.xml | 20 |
10 files changed, 69 insertions, 86 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index cc0e76205abb..1f6860b2b226 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -244,6 +244,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/core/java/android/os/storage/*) $(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/platformprotos_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.mediadrm.signer.jar) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ****************************************************************** diff --git a/location/lib/Android.bp b/location/lib/Android.bp new file mode 100644 index 000000000000..447195d6d532 --- /dev/null +++ b/location/lib/Android.bp @@ -0,0 +1,21 @@ +// +// Copyright (C) 2018 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. +// + +java_sdk_library { + name: "com.android.location.provider", + srcs: ["java/**/*.java"], + api_packages: ["com.android.location.provider"], +} diff --git a/location/lib/Android.mk b/location/lib/Android.mk deleted file mode 100644 index 6642134ec32b..000000000000 --- a/location/lib/Android.mk +++ /dev/null @@ -1,66 +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) - -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) - -# ==== Stub library =========================================== -include $(CLEAR_VARS) -LOCAL_MODULE := com.android.location.provider-stubs-gen -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_SRC_FILES := $(call all-java-files-under,java) -LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/com.android.location.provider.stubs_intermediates/src -LOCAL_DROIDDOC_OPTIONS:= \ - -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 \ - -stubpackages com.android.location.provider \ - -nodocs -LOCAL_UNINSTALLABLE_MODULE := true -include $(BUILD_DROIDDOC) -com_android_nfc_extras_gen_stamp := $(full_target) - -include $(CLEAR_VARS) -LOCAL_MODULE := com.android.location.provider.stubs -LOCAL_SOURCE_FILES_ALL_GENERATED := true -LOCAL_SDK_VERSION := current -LOCAL_ADDITIONAL_DEPENDENCIES := $(com_android_nfc_extras_gen_stamp) -com_android_nfc_extras_gen_stamp := -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/location/lib/api/current.txt b/location/lib/api/current.txt new file mode 100644 index 000000000000..1e69f162fb07 --- /dev/null +++ b/location/lib/api/current.txt @@ -0,0 +1,47 @@ +package com.android.location.provider { + + public abstract deprecated class FusedProvider { + ctor public FusedProvider(); + method public android.os.IBinder getBinder(); + } + + public abstract class LocationProviderBase { + ctor public LocationProviderBase(java.lang.String, com.android.location.provider.ProviderPropertiesUnbundled); + method public android.os.IBinder getBinder(); + method public abstract void onDisable(); + method public void onDump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]); + method public abstract void onEnable(); + method public abstract int onGetStatus(android.os.Bundle); + method public abstract long onGetStatusUpdateTime(); + method public boolean onSendExtraCommand(java.lang.String, android.os.Bundle); + method public abstract void onSetRequest(com.android.location.provider.ProviderRequestUnbundled, android.os.WorkSource); + method public final void reportLocation(android.location.Location); + field public static final java.lang.String EXTRA_NO_GPS_LOCATION = "noGPSLocation"; + field public static final java.lang.String FUSED_PROVIDER = "fused"; + } + + public final class LocationRequestUnbundled { + method public long getFastestInterval(); + method public long getInterval(); + method public int getQuality(); + method public float getSmallestDisplacement(); + field public static final int ACCURACY_BLOCK = 102; // 0x66 + field public static final int ACCURACY_CITY = 104; // 0x68 + field public static final int ACCURACY_FINE = 100; // 0x64 + field public static final int POWER_HIGH = 203; // 0xcb + field public static final int POWER_LOW = 201; // 0xc9 + field public static final int POWER_NONE = 200; // 0xc8 + } + + public final class ProviderPropertiesUnbundled { + method public static com.android.location.provider.ProviderPropertiesUnbundled create(boolean, boolean, boolean, boolean, boolean, boolean, boolean, int, int); + } + + public final class ProviderRequestUnbundled { + method public long getInterval(); + method public java.util.List<com.android.location.provider.LocationRequestUnbundled> getLocationRequests(); + method public boolean getReportLocation(); + } + +} + diff --git a/location/lib/api/removed.txt b/location/lib/api/removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/location/lib/api/removed.txt diff --git a/location/lib/api/system-current.txt b/location/lib/api/system-current.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/location/lib/api/system-current.txt diff --git a/location/lib/api/system-removed.txt b/location/lib/api/system-removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/location/lib/api/system-removed.txt diff --git a/location/lib/api/test-current.txt b/location/lib/api/test-current.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/location/lib/api/test-current.txt diff --git a/location/lib/api/test-removed.txt b/location/lib/api/test-removed.txt new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/location/lib/api/test-removed.txt diff --git a/location/lib/com.android.location.provider.xml b/location/lib/com.android.location.provider.xml deleted file mode 100644 index 000e68ffc865..000000000000 --- a/location/lib/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> |