aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2015-05-19 13:27:17 -0700
committerAdnan Begovic <adnan@cyngn.com>2015-05-19 13:27:17 -0700
commit8c36c41ff6a99943a28a8280653cb89a6e4978af (patch)
treeacc2701ee3ee2113d982e3e0b320a6c545a2b2ee
parent2217bb419785e842c4a60900029db671cbed258c (diff)
downloadvendor_cmsdk-8c36c41ff6a99943a28a8280653cb89a6e4978af.zip
vendor_cmsdk-8c36c41ff6a99943a28a8280653cb89a6e4978af.tar.gz
vendor_cmsdk-8c36c41ff6a99943a28a8280653cb89a6e4978af.tar.bz2
CMSDK: Update code comments for permission changes.
Change-Id: I1aac7721244a510acb967f5995303ab9d57a11d3
-rw-r--r--Android.mk6
-rw-r--r--src/java/cyanogenmod/app/CMStatusBarManager.java18
-rw-r--r--src/java/cyanogenmod/app/CustomTileListenerService.java4
3 files changed, 19 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index 1e6c217..8175f6c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,11 +53,14 @@ LOCAL_SRC_FILES := \
LOCAL_SRC_FILES += \
$(call all-Iaidl-files-under, $(cyanogenmod_app_src))
-LOCAL_INTERMEDIATE_SOURCES := \
+cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
$(cm_platform_res)/cyanogenmod/platform/R.java \
$(cm_platform_res)/cyanogenmod/platform/Manifest.java \
$(cm_platform_res)/org/cyanogenmod/platform/internal/R.java
+LOCAL_INTERMEDIATE_SOURCES := \
+ $(cmsdk_LOCAL_INTERMEDIATE_SOURCES)
+
# Include aidl files from cyanogenmod.app namespace as well as internal src aidl files
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
@@ -120,6 +123,7 @@ cmplat.docs.java_libraries := \
include $(CLEAR_VARS)
LOCAL_MODULE := org.cyanogenmod.platform.sdk
+LOCAL_INTERMEDIATE_SOURCES:=$(cmsdk_LOCAL_INTERMEDIATE_SOURCES)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE_TAGS := optional
diff --git a/src/java/cyanogenmod/app/CMStatusBarManager.java b/src/java/cyanogenmod/app/CMStatusBarManager.java
index d5fa68f..481be29 100644
--- a/src/java/cyanogenmod/app/CMStatusBarManager.java
+++ b/src/java/cyanogenmod/app/CMStatusBarManager.java
@@ -84,7 +84,8 @@ public class CMStatusBarManager {
* the same id has already been posted by your application and has not yet been removed, it
* will be replaced by the updated information.
*
- * You will need the android.permission.PUBLISH_CUSTOM_TILE to utilize this functionality.
+ * You will need the cyanogenmod.permission.PUBLISH_CUSTOM_TILE
+ * to utilize this functionality.
*
* @param id An identifier for this customTile unique within your
* application.
@@ -100,7 +101,8 @@ public class CMStatusBarManager {
* the same tag and id has already been posted by your application and has not yet been
* removed, it will be replaced by the updated information.
*
- * You will need the android.permission.PUBLISH_CUSTOM_TILE to utilize this functionality.
+ * You will need the cyanogenmod.permission.PUBLISH_CUSTOM_TILE
+ * to utilize this functionality.
*
* @param tag A string identifier for this custom tile. May be {@code null}.
* @param id An identifier for this custom tile. The pair (tag, id) must be unique
@@ -132,7 +134,8 @@ public class CMStatusBarManager {
* Similar to {@link cyanogenmod.app.CMStatusBarManager#publishTile(int id, cyanogenmod.app.CustomTile)},
* however lets you specify a {@link android.os.UserHandle}
*
- * You will need the android.permission.PUBLISH_CUSTOM_TILE to utilize this functionality.
+ * You will need the cyanogenmod.permission.PUBLISH_CUSTOM_TILE
+ * to utilize this functionality.
*
* @param tag A string identifier for this custom tile. May be {@code null}.
* @param id An identifier for this custom tile. The pair (tag, id) must be unique
@@ -164,7 +167,8 @@ public class CMStatusBarManager {
/**
* Remove a custom tile that's currently published to the StatusBarPanel.
*
- * You will need the android.permission.PUBLISH_CUSTOM_TILE to utilize this functionality.
+ * You will need the cyanogenmod.permission.PUBLISH_CUSTOM_TILE
+ * to utilize this functionality.
*
* @param id The identifier for the custom tile to be removed.
*/
@@ -175,7 +179,8 @@ public class CMStatusBarManager {
/**
* Remove a custom tile that's currently published to the StatusBarPanel.
*
- * You will need the android.permission.PUBLISH_CUSTOM_TILE to utilize this functionality.
+ * You will need the cyanogenmod.platform.PUBLISH_CUSTOM_TILE
+ * to utilize this functionality.
*
* @param tag The string identifier for the custom tile to be removed.
* @param id The identifier for the custom tile to be removed.
@@ -199,7 +204,8 @@ public class CMStatusBarManager {
* Similar to {@link cyanogenmod.app.CMStatusBarManager#removeTile(String tag, int id)}
* however lets you specific a {@link android.os.UserHandle}
*
- * You will need the android.permission.PUBLISH_CUSTOM_TILE to utilize this functionality.
+ * You will need the cyanogenmod.platform.PUBLISH_CUSTOM_TILE
+ * to utilize this functionality.
*
* @param tag The string identifier for the custom tile to be removed.
* @param id The identifier for the custom tile to be removed.
diff --git a/src/java/cyanogenmod/app/CustomTileListenerService.java b/src/java/cyanogenmod/app/CustomTileListenerService.java
index 1cd8d2d..9d2929a 100644
--- a/src/java/cyanogenmod/app/CustomTileListenerService.java
+++ b/src/java/cyanogenmod/app/CustomTileListenerService.java
@@ -35,12 +35,12 @@ import org.cyanogenmod.internal.statusbar.IStatusBarCustomTileHolder;
* A service that receives calls from the system when new custom tiles are
* posted or removed.
* <p>To extend this class, you must declare the service in your manifest file with
- * the TODO: add permission
+ * the cyanogenmod.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE
* and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p>
* <pre>
* &lt;service android:name=".CustomTileListener"
* android:label="&#64;string/service_name"
- * android:permission="TODO: Add me">
+ * android:permission="cyanogenmod.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE">
* &lt;intent-filter>
* &lt;action android:name="cyanogenmod.app.CustomTileListenerService" />
* &lt;/intent-filter>