diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java | 7 | ||||
| -rw-r--r-- | cm/res/AndroidManifest.xml | 2 |
3 files changed, 7 insertions, 6 deletions
@@ -54,8 +54,8 @@ LOCAL_SRC_FILES += \ $(call all-Iaidl-files-under, $(cyanogenmod_app_src)) LOCAL_INTERMEDIATE_SOURCES := \ - $(cm_platform_res)/cyanogenmod/R.java \ - $(cm_platform_res)/cyanogenmod/Manifest.java \ + $(cm_platform_res)/org/cyanogenmod/platform/R.java \ + $(cm_platform_res)/org/cyanogenmod/platform/Manifest.java \ $(cm_platform_res)/org/cyanogenmod/platform/internal/R.java # Include aidl files from cyanogenmod.app namespace as well as internal src aidl files diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java index 70904db..c4184ea 100644 --- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java +++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java @@ -338,13 +338,13 @@ public class CMStatusBarManagerService extends SystemService { private void enforceCustomTilePublish() { mContext.enforceCallingOrSelfPermission( - cyanogenmod.Manifest.permission.PUBLISH_CUSTOM_TILE, + org.cyanogenmod.platform.Manifest.permission.PUBLISH_CUSTOM_TILE, "StatusBarManagerService"); } private void enforceBindCustomTileListener() { mContext.enforceCallingOrSelfPermission( - cyanogenmod.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE, + org.cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE, "StatusBarManagerService"); } @@ -368,7 +368,8 @@ public class CMStatusBarManagerService extends SystemService { c.serviceInterface = CustomTileListenerService.SERVICE_INTERFACE; //TODO: Implement this in the future //c.secureSettingName = Settings.Secure.ENABLED_CUSTOM_TILE_LISTENERS; - c.bindPermission = cyanogenmod.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE; + c.bindPermission = + org.cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE; //TODO: Implement this in the future //c.settingsAction = Settings.ACTION_CUSTOM_TILE_LISTENER_SETTINGS; c.clientLabel = R.string.custom_tile_listener_binding_label; diff --git a/cm/res/AndroidManifest.xml b/cm/res/AndroidManifest.xml index 69b15f2..54a2b66 100644 --- a/cm/res/AndroidManifest.xml +++ b/cm/res/AndroidManifest.xml @@ -17,7 +17,7 @@ */ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="cyanogenmod" + package="org.cyanogenmod.platform" coreApp="true" android:sharedUserId="android.uid.system" android:sharedUserLabel="@string/cyanogenmod_system_label"> |