diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-05-13 04:48:42 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-05-13 04:54:40 -0700 |
| commit | 37c4b96e0bdcb35412c0e55df144bf56888ed2e1 (patch) | |
| tree | f867a2db67db0456529155ca557b649a5c7f8d0a | |
| parent | 7267e32ca494198c1eda51ab8290ad42dac40d2d (diff) | |
| download | vendor_cmsdk-37c4b96e0bdcb35412c0e55df144bf56888ed2e1.zip vendor_cmsdk-37c4b96e0bdcb35412c0e55df144bf56888ed2e1.tar.gz vendor_cmsdk-37c4b96e0bdcb35412c0e55df144bf56888ed2e1.tar.bz2 | |
CMSDK: Don't share a namespace with the library.
Otherwise PackageParser will skip you.
W/ResourceType( 3077): ResTable_typeSpec entry count inconsistent: given 6, previously 1003
I/PackageManager( 3077): /system/framework/org.cyanogenmod.platform-res.apk changed; collecting certs
W/PackageManager( 3077): Failed to parse /system/framework/org.cyanogenmod.platform-res.apk:
Application package org.cyanogenmod.platform already installed. Skipping duplicate.
Change-Id: Iddea111f4c9bbe69939266ce5c6902d176407b14
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java | 6 | ||||
| -rw-r--r-- | cm/res/AndroidManifest.xml | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -54,8 +54,8 @@ LOCAL_SRC_FILES += \ $(call all-Iaidl-files-under, $(cyanogenmod_app_src)) LOCAL_INTERMEDIATE_SOURCES := \ - $(cm_platform_res)/org/cyanogenmod/platform/R.java \ - $(cm_platform_res)/org/cyanogenmod/platform/Manifest.java \ + $(cm_platform_res)/cyanogenmod/platform/R.java \ + $(cm_platform_res)/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 c4184ea..2dd21ac 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( - org.cyanogenmod.platform.Manifest.permission.PUBLISH_CUSTOM_TILE, + cyanogenmod.platform.Manifest.permission.PUBLISH_CUSTOM_TILE, "StatusBarManagerService"); } private void enforceBindCustomTileListener() { mContext.enforceCallingOrSelfPermission( - org.cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE, + cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE, "StatusBarManagerService"); } @@ -369,7 +369,7 @@ public class CMStatusBarManagerService extends SystemService { //TODO: Implement this in the future //c.secureSettingName = Settings.Secure.ENABLED_CUSTOM_TILE_LISTENERS; c.bindPermission = - org.cyanogenmod.platform.Manifest.permission.BIND_CUSTOM_TILE_LISTENER_SERVICE; + 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 54a2b66..8a52e54 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="org.cyanogenmod.platform" + package="cyanogenmod.platform" coreApp="true" android:sharedUserId="android.uid.system" android:sharedUserLabel="@string/cyanogenmod_system_label"> |