diff --git a/Android.mk b/Android.mk index a3c8c7a9..9439f5b8 100644 --- a/Android.mk +++ b/Android.mk @@ -23,7 +23,7 @@ LOCAL_PATH := $(call my-dir) # R.java file as a prerequisite. cm_platform_res := APPS/org.cyanogenmod.platform-res_intermediates/src -# List of packages used in cm-api-stubs and cm-system-api-stubs +# List of packages used in cm-api-stubs cm_stub_packages := cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.content:cyanogenmod.externalviews:cyanogenmod.hardware:cyanogenmod.media:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.providers:cyanogenmod.platform:cyanogenmod.power:cyanogenmod.themes:cyanogenmod.util:cyanogenmod.weather:cyanogenmod.weatherservice # The CyanogenMod Platform Framework Library @@ -209,7 +209,7 @@ cmplat_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES cmplat_docs_LOCAL_DROIDDOC_SOURCE_PATH := \ $(cmplat_docs_src_files) -intermediates.COMMON := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS), org.cyanogenmod.platform.sdk,,COMMON) +intermediates.COMMON := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),org.cyanogenmod.platform.sdk,,COMMON) # ==== the api stubs and current.xml =========================== include $(CLEAR_VARS) @@ -244,38 +244,6 @@ $(full_target): $(cm_framework_built) $(gen) $(INTERNAL_CM_PLATFORM_API_FILE): $(full_target) $(call dist-for-goals,sdk,$(INTERNAL_CM_PLATFORM_API_FILE)) -# ==== the system api stubs =================================== -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - $(cmplat_docs_src_files) -LOCAL_INTERMEDIATE_SOURCES:= $(cmplat_LOCAL_INTERMEDIATE_SOURCES) -LOCAL_JAVA_LIBRARIES:= $(cmplat_docs_java_libraries) -LOCAL_MODULE_CLASS:= $(cmplat_docs_LOCAL_MODULE_CLASS) -LOCAL_DROIDDOC_SOURCE_PATH:= $(cmplat_docs_LOCAL_DROIDDOC_SOURCE_PATH) -LOCAL_ADDITIONAL_JAVA_DIR:= $(intermediates.COMMON)/src - -LOCAL_MODULE := cm-system-api-stubs - -LOCAL_DROIDDOC_OPTIONS:=\ - -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/cmsdk_system_stubs_current_intermediates/src \ - -stubpackages $(cm_stub_packages) \ - -showAnnotation android.annotation.SystemApi \ - -exclude org.cyanogenmod.platform.internal \ - -api $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE) \ - -removedApi $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE) \ - -nodocs - -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:= build/tools/droiddoc/templates-sdk - -LOCAL_UNINSTALLABLE_MODULE := true - -include $(BUILD_DROIDDOC) - -# $(gen), i.e. framework.aidl, is also needed while building against the current stub. -$(full_target): $(cm_framework_built) $(gen) -$(INTERNAL_CM_PLATFORM_API_FILE): $(full_target) -$(call dist-for-goals,sdk,$(INTERNAL_CM_PLATFORM_API_FILE)) # Documentation # =========================================================== diff --git a/api/cm_current.txt b/api/cm_current.txt index a93f52fc..0a9d60ea 100644 --- a/api/cm_current.txt +++ b/api/cm_current.txt @@ -832,7 +832,7 @@ package cyanogenmod.profiles { field public static final int PROFILE_CONNECTION_SYNC = 5; // 0x5 field public static final int PROFILE_CONNECTION_WIFI = 1; // 0x1 field public static final int PROFILE_CONNECTION_WIFIAP = 2; // 0x2 - field public static final int PROFILE_CONNECTION_WIMAX = 3; // 0x3 + field public static final deprecated int PROFILE_CONNECTION_WIMAX = 3; // 0x3 } public static class ConnectionSettings.BooleanState { diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java index 917d553d..322fb5f1 100644 --- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java +++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java @@ -236,17 +236,20 @@ public class CMTelephonyManagerService extends CMSystemService { Log.d(TAG, "Setting the subscription " + subId + " to inactive (false) or active (true): " + state); } + /* if (state) { SubscriptionManager.activateSubId(subId); } else { SubscriptionManager.deactivateSubId(subId); } + */ } private boolean isDataConnectionSelectedOnSub(int subId) { boolean validSubscriptionId = SubscriptionManager.isValidSubscriptionId(subId); if (validSubscriptionId) { + /* if (subId == SubscriptionManager.getDefaultDataSubId()) { if (localLOGD) { Log.d(TAG, "Data connection selected for subscription " + subId); @@ -258,6 +261,8 @@ public class CMTelephonyManagerService extends CMSystemService { } return false; } + */ + return true; } else { Log.w(TAG, "Invalid subscription identifier: " + subId); return false; diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java index 83ce8015..b7f1239b 100644 --- a/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java +++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/WeatherManagerServiceBroker.java @@ -103,7 +103,7 @@ public class WeatherManagerServiceBroker extends BrokerableCMSystemService (sunrise + TWILIGHT_ADJUSTMENT_TIME)) { - return 1.0f; - } - - if (now <= (sunset + TWILIGHT_ADJUSTMENT_TIME)) { - return MathUtils.lerp(1.0f, 0.0f, - (float)(now - sunset) / TWILIGHT_ADJUSTMENT_TIME); - } - - if (now >= sunrise) { - return MathUtils.lerp(1.0f, 0.0f, - (float)((sunrise + TWILIGHT_ADJUSTMENT_TIME) - now) / TWILIGHT_ADJUSTMENT_TIME); - } - - return 0.0f; - } - /** * Determine the color temperature we should use for the display based on * the position of the sun. @@ -321,9 +293,7 @@ public class ColorTemperatureController extends LiveDisplayFeature { final TwilightState twilight = getTwilight(); if (twilight != null) { - final long now = System.currentTimeMillis(); - adjustment = adj(now, twilight.getYesterdaySunset(), twilight.getTodaySunrise()) * - adj(now, twilight.getTodaySunset(), twilight.getTomorrowSunrise()); + adjustment = twilight.getAmount(); } return (int)MathUtils.lerp(mNightTemperature, mDayTemperature, adjustment); diff --git a/cm/res/Android.mk b/cm/res/Android.mk index 4f3bec97..587014c1 100644 --- a/cm/res/Android.mk +++ b/cm/res/Android.mk @@ -27,7 +27,7 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res) # since these resources will be used by many apps. # 0x3f/one less than app id -LOCAL_AAPT_FLAGS += -x 63 +LOCAL_AAPT_FLAGS += -x LOCAL_MODULE_TAGS := optional diff --git a/cm/res/AndroidManifest.xml b/cm/res/AndroidManifest.xml index 8eee210e..030db108 100644 --- a/cm/res/AndroidManifest.xml +++ b/cm/res/AndroidManifest.xml @@ -46,7 +46,6 @@ android:label="@string/permlab_modifyNetworkSettings" android:description="@string/permdesc_modifyNetworkSettings" android:icon="@drawable/ic_launcher_cyanogenmod" - androidprv:allowViaWhitelist="true" android:protectionLevel="signature|privileged" /> @@ -185,8 +184,7 @@ + android:protectionLevel="signature|privileged" /> @@ -226,8 +224,7 @@ + android:protectionLevel="signature|privileged" />