Merge "Implement IdeaAndroidProject#getTargetSdkVersion." into studio-1.4-dev automerge: bfb179a

automerge: 291e6d0

* commit '291e6d0764b33e242defc0dedc277cce227d2099':
  Implement IdeaAndroidProject#getTargetSdkVersion.

2 files changed, 8 insertions, 4 deletions

diff --git a/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java b/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
index 4dc8b63d3eb..b6930c1e0e1 100644
--- a/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
+++ b/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
@@ -242,7 +242,11 @@ public class IdeaAndroidProject implements AndroidModel, Serializable {
   @Nullable
   @Override
   public AndroidVersion getTargetSdkVersion() {
-    throw new UnsupportedOperationException("Not yet implemented.");
+    ApiVersion targetSdkVersion = getSelectedVariant().getMergedFlavor().getTargetSdkVersion();
+      if (targetSdkVersion != null) {
+        return new AndroidVersion(targetSdkVersion.getApiLevel(), targetSdkVersion.getCodename());
+      }
+    return null;
   }
 
   @NotNull
diff --git a/android/src/com/android/tools/idea/model/AndroidModuleInfo.java b/android/src/com/android/tools/idea/model/AndroidModuleInfo.java
index 8944c28bd49..4868a835078 100644
--- a/android/src/com/android/tools/idea/model/AndroidModuleInfo.java
+++ b/android/src/com/android/tools/idea/model/AndroidModuleInfo.java
@@ -104,11 +104,11 @@ public class AndroidModuleInfo {
 
   @NotNull
   public AndroidVersion getTargetSdkVersion() {
-    IdeaAndroidProject androidModel = myFacet.getAndroidModel();
+    AndroidModel androidModel = myFacet.getAndroidModel();
     if (androidModel != null) {
-      ApiVersion targetSdkVersion = androidModel.getSelectedVariant().getMergedFlavor().getTargetSdkVersion();
+      AndroidVersion targetSdkVersion = androidModel.getTargetSdkVersion();
       if (targetSdkVersion != null) {
-        return new AndroidVersion(targetSdkVersion.getApiLevel(), targetSdkVersion.getCodename());
+        return targetSdkVersion;
       }
       // Else: not specified in gradle files; fall back to manifest
     }