| author | Ting Li <ting.li@amlogic.com> | 2017-02-10 06:57:26 (GMT) |
|---|---|---|
| committer | Ting Li <ting.li@amlogic.com> | 2017-02-10 06:57:26 (GMT) |
| commit | f6a0c11ac2e21dd113af6f9036632e805698df25 (patch) | |
| tree | 5644311f35287f9872f08a3a00e129b634e22f76 | |
| parent | b1c189271a36739ece7275edb930c483bdf9353d (diff) | |
| download | OTAUpgrade2-f6a0c11ac2e21dd113af6f9036632e805698df25.zip OTAUpgrade2-f6a0c11ac2e21dd113af6f9036632e805698df25.tar.gz OTAUpgrade2-f6a0c11ac2e21dd113af6f9036632e805698df25.tar.bz2 | |
pd#136759 compile error on M
Change-Id: I87b0b4f61c66ed025c4e7c15782403041a734d8f
| -rw-r--r-- | Android.mk | 16 | ||||
| -rw-r--r-- | src/com/droidlogic/otaupgrade/LoaderReceiver.java | 24 |
2 files changed, 30 insertions, 10 deletions
@@ -4,10 +4,20 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := libota LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, src) -ifneq ($(PLATFORM_SDK_VERSION),23) - LOCAL_SRC_FILES += $(TOP)/src/android/os/IUpdateEngineCallback.aidl +ifeq ($(PLATFORM_SDK_VERSION),23) + LOCAL_SRC_FILES := $(TOP)/src/com/droidlogic/otaupgrade/BackupActivity.java \ + $(TOP)/src/com/droidlogic/otaupgrade/BadMovedSDcard.java \ + $(TOP)/src/com/droidlogic/otaupgrade/FileSelector.java \ + $(TOP)/src/com/droidlogic/otaupgrade/InstallPackage.java \ + $(TOP)/src/com/droidlogic/otaupgrade/LoaderReceiver.java \ + $(TOP)/src/com/droidlogic/otaupgrade/MainActivity.java \ + $(TOP)/src/com/droidlogic/otaupgrade/PrefUtils.java \ + $(TOP)/src/com/droidlogic/otaupgrade/UpdateActivity.java \ + $(TOP)/src/com/droidlogic/otaupgrade/UpdateService.java +else + LOCAL_SRC_FILES := $(call all-java-files-under, src)\ + $(call all-Iaidl-files-under, src) endif LOCAL_PACKAGE_NAME := OTAUpgrade LOCAL_CERTIFICATE := platform diff --git a/src/com/droidlogic/otaupgrade/LoaderReceiver.java b/src/com/droidlogic/otaupgrade/LoaderReceiver.java index 1f58473..b1cb0a0 100644 --- a/src/com/droidlogic/otaupgrade/LoaderReceiver.java +++ b/src/com/droidlogic/otaupgrade/LoaderReceiver.java @@ -63,10 +63,15 @@ public class LoaderReceiver extends BroadcastReceiver { mPref = new PrefUtils ( mContext );
getBackUpFileName();
if ( intent.getAction().equals ( Intent.ACTION_BOOT_COMPLETED ) ||
- intent.getAction().equals ( RESTOREDATA ) ) {
- Intent abcheck = new Intent(mContext, ABCheckUpService.class);
- abcheck.putExtra(ABCheckUpService.REASON,ABCheckUpService.REASON_COMPLETE);
- mContext.startService (abcheck);
+ intent.getAction().equals ( RESTOREDATA ) ) {
+ try{
+ Class abcheckService = Class.forName("com.droidlogic.otaupgrade.ABCheckUpService");
+ Intent abcheck = new Intent(mContext, abcheckService);
+ abcheck.putExtra("reason","complete");
+ mContext.startService (abcheck);
+ } catch(ClassNotFoundException ex) {
+ ex.printStackTrace();
+ }
if (intent.getAction().equals ( Intent.ACTION_BOOT_COMPLETED )) {
mPref.clearData();
}
@@ -104,9 +109,14 @@ public class LoaderReceiver extends BroadcastReceiver { mContext.startService ( new Intent (
UpdateService.ACTION_AUTOCHECK ) );
}
- Intent abupdate = new Intent(mContext, ABCheckUpService.class);
- abupdate.putExtra(ABCheckUpService.REASON,ABCheckUpService.REASON_UPDATE);
- mContext.startService (abupdate);
+ try{
+ Class abcheckService = Class.forName("com.droidlogic.otaupgrade.ABCheckUpService");
+ Intent abupdate = new Intent(mContext, abcheckService);
+ abupdate.putExtra("reason","complete");
+ mContext.startService (abupdate);
+ } catch(ClassNotFoundException ex) {
+ ex.printStackTrace();
+ }
}
}
}
|