Merge "Add gps_debug.conf module" (f7453158) · Commits · e / os / android_frameworks_base

Android.bp

+3 −1

Original line number	Diff line number	Diff line
		@@ -731,8 +731,10 @@ java_defaults {
		"netd_aidl_interface-java",
		],

		// Loaded with System.loadLibrary by android.view.textclassifier
		required: [
		// TODO: remove gps_debug when the build system propagates "required" properly.
		"gps_debug.conf",
		// Loaded with System.loadLibrary by android.view.textclassifier
		"libmedia2_jni",
		],

services/core/Android.bp

+10 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,10 @@ java_library_static {
		"android.hardware.tv.cec-V1.0-java",
		],

		required: [
		"gps_debug.conf",
		],

		static_libs: [
		"time_zone_distro",
		"time_zone_distro_installer",
		@@ -69,3 +73,9 @@ java_library {
		name: "services.core",
		static_libs: ["services.core.priorityboosted"],
		}


		prebuilt_etc {
		name: "gps_debug.conf",
		src: "java/com/android/server/location/gps_debug.conf",
		}

services/core/java/com/android/server/location/gps_debug.conf

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		# Sample file for use for on device debug override only
		# Prefer frameworks/base/core/res/res/values/config.xml and
		# frameworks/base/core/res/res/values-mcc-mnc/config.xml

		################################
		##### AGPS server settings #####
		################################
		# FOR SUPL SUPPORT, set the following
		# SUPL_HOST=supl.google.com or IP
		# SUPL_PORT=7275

		# supl version 2.0
		# SUPL_VER=0x20000

		#SUPL_MODE is a bit mask set in config.xml per carrier by default.
		#If it is uncommented here, this value will overwrite the value from
		#config.xml.
		#MSA=0X2
		#MSB=0X1
		#SUPL_MODE=1

		# Emergency SUPL, 1=enable, 0=disable
		#SUPL_ES=0

		#Choose PDN for Emergency SUPL
		#1 - Use emergency PDN
		#0 - Use regular SUPL PDN for Emergency SUPL
		#USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0

		####################################
		# LTE Positioning Profile Settings
		####################################
		# 0: Enable RRLP on LTE(Default)
		# 1: Enable LPP_User_Plane on LTE
		# 2: Enable LPP_Control_Plane
		# 3: Enable both LPP_User_Plane and LPP_Control_Plane
		#LPP_PROFILE = 2

		##################################################
		# Select Positioning Protocol on A-GLONASS system
		##################################################
		# 0x1: RRC CPlane
		# 0x2: RRLP UPlane
		# 0x4: LLP Uplane
		#A_GLONASS_POS_PROTOCOL_SELECT = 0

		# Below bit mask configures how GPS functionalities
		# should be locked when user turns off GPS on Settings
		# Set bit 0x1 if MO GPS functionalities are to be locked
		# Set bit 0x2 if NI GPS functionalities are to be locked
		# default - non is locked for backward compatibility
		#GPS_LOCK = 0