Merge "Allow authority to be set from build configuration - DO NOT MERGE" into... (21fa0866) · Commits · e / os / android_packages_apps_DeskClock

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ LOCAL_SDK_VERSION := current
		LOCAL_PACKAGE_NAME := DeskClock
		LOCAL_OVERRIDES_PACKAGES := AlarmClock

		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_SRC_FILES := $(call all-java-files-under, src gen)

		LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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.
		*/

		package com.android.deskclock;

		public final class BuildConfig {
		public static final String APPLICATION_ID = "com.android.deskclock";
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package com.android.deskclock.provider;
		import android.net.Uri;
		import android.provider.BaseColumns;

		import com.android.deskclock.BuildConfig;

		/**
		* <p>
		* The contract between the clock provider and desk clock. Contains
		@@ -41,7 +43,7 @@ public final class ClockContract {
		* This authority is used for writing to or querying from the clock
		* provider.
		*/
		public static final String AUTHORITY = "com.android.deskclock";
		public static final String AUTHORITY = BuildConfig.APPLICATION_ID;

		/**
		* This utility class cannot be instantiated