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

Commit 8ea254a8 authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Allow authority to be set from build configuration - DO NOT MERGE 

Bug: 22790001
Change-Id: I558c6d15316c9391ae57b96b7324ebdf1eddc29e
(cherry picked from commit 09e29779)
parent 5173cc57

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,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-design

gen/com/android/deskclock/BuildConfig.java

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

}

src/com/android/deskclock/provider/ClockContract.java

+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
@@ -40,7 +42,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