Skip to content

Commit 7b7a55e

Browse files
committed
Revert "Support Instant Run application class"
As Google fixed the issues caused by Instant Run we can revert the fix on our side. http://tools.android.com/recent/androidstudio20beta6availableinthecanarychannel https://groups.google.com/forum/#!topic/adt-dev/lKjGT4QJgEM This reverts commit cc628cd.
1 parent 8dd5fb2 commit 7b7a55e

6 files changed

Lines changed: 1 addition & 142 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ public final class CanonicalNameConstants {
141141
public static final String APPCOMPAT_ACTIVITY = "android.support.v7.app.AppCompatActivity";
142142
public static final String VIEW_PAGER = "android.support.v4.view.ViewPager";
143143
public static final String PAGE_CHANGE_LISTENER = "android.support.v4.view.ViewPager.OnPageChangeListener";
144-
public static final String INSTANT_RUN_APPLICATION = "com.android.tools.fd.runtime.BootstrapApplication";
145144

146145
/*
147146
* Android permission

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AndroidManifestFinder.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.androidannotations.AndroidAnnotationsEnvironment;
3737
import org.androidannotations.Option;
3838
import org.androidannotations.helper.AndroidManifest;
39-
import org.androidannotations.helper.CanonicalNameConstants;
4039
import org.androidannotations.internal.exception.AndroidManifestNotFoundException;
4140
import org.androidannotations.logger.Logger;
4241
import org.androidannotations.logger.LoggerFactory;
@@ -260,12 +259,7 @@ private AndroidManifest parse(File androidManifestFile, boolean libraryProject)
260259
Node applicationNode = applicationNodes.item(0);
261260
Node nameAttribute = applicationNode.getAttributes().getNamedItem("android:name");
262261

263-
if (!hasInstantRunApplication(nameAttribute)) {
264-
applicationClassQualifiedName = manifestNameToValidQualifiedName(applicationPackage, nameAttribute);
265-
} else {
266-
Node plainNameAttribute = applicationNode.getAttributes().getNamedItem("name");
267-
applicationClassQualifiedName = manifestNameToValidQualifiedName(applicationPackage, plainNameAttribute);
268-
}
262+
applicationClassQualifiedName = manifestNameToValidQualifiedName(applicationPackage, nameAttribute);
269263

270264
if (applicationClassQualifiedName == null) {
271265
if (nameAttribute != null) {
@@ -398,8 +392,4 @@ private List<String> extractUsesPermissionNames(NodeList usesPermissionNodes) {
398392
return usesPermissionQualifiedNames;
399393
}
400394

401-
private boolean hasInstantRunApplication(Node nameAttribute) {
402-
return nameAttribute != null && CanonicalNameConstants.INSTANT_RUN_APPLICATION.equals(nameAttribute.getNodeValue());
403-
}
404-
405395
}

‎AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/InstantRunManifestTest.java‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎AndroidAnnotations/androidannotations-core/androidannotations/src/test/java/org/androidannotations/manifest/MyApplication.java‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/manifest/CorrectInstantRunManifest.xml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎AndroidAnnotations/androidannotations-core/androidannotations/src/test/resources/org/androidannotations/manifest/IncorrectInstantRunManifest.xml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)