diff options
author | Xavier Ducrohet <xav@android.com> | 2014-06-20 10:24:42 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-20 10:24:42 +0000 |
commit | 9315defea1c5786f06e3d246340d1c9718f249bc (patch) | |
tree | b392b99b03d7f2fe917c0277b3f33e644c5b0a64 | |
parent | 8c5626f391ccc4db327f46afbe0ee6d61415a8bc (diff) | |
parent | ab5755ae17c228f38ce22273ea81a9d5731682ac (diff) | |
download | swt-android-cts-5.0_r4.tar.gz |
am ab5755ae: am 1a81b50b: Merge "SDK Manager: always display Build Tools previews." into idea133 automerge: 83cb2eeandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
* commit 'ab5755ae17c228f38ce22273ea81a9d5731682ac':
SDK Manager: always display Build Tools previews.
3 files changed, 48 insertions, 33 deletions
diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogic.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogic.java index 01ea803..75bf6d6 100755 --- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogic.java +++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogic.java @@ -34,10 +34,10 @@ import com.android.sdklib.internal.repository.updater.PkgItem; import com.android.sdklib.internal.repository.updater.PkgItem.PkgState; import com.android.sdklib.repository.FullRevision; import com.android.sdklib.repository.FullRevision.PreviewComparison; -import com.android.utils.SparseArray; import com.android.sdkuilib.internal.repository.SwtUpdaterData; import com.android.sdkuilib.internal.repository.ui.PackagesPageIcons; import com.android.utils.Pair; +import com.android.utils.SparseArray; import com.google.common.collect.Maps; import java.util.ArrayList; @@ -265,7 +265,9 @@ public class PackagesDiffLogic { break; } } - if (p instanceof SystemImagePackage && item.getState() == PkgState.INSTALLED) { + if (p instanceof SystemImagePackage && + ((SystemImagePackage) p).isPlatform() && + item.getState() == PkgState.INSTALLED) { hasSysImg = true; break; } @@ -297,7 +299,9 @@ public class PackagesDiffLogic { // No system image in the platform, try a system image package for (PkgItem item : items) { Package p = item.getMainPackage(); - if (p instanceof SystemImagePackage && item.getState() == PkgState.NEW) { + if (p instanceof SystemImagePackage && + ((SystemImagePackage) p).isPlatform() && + item.getState() == PkgState.NEW) { item.setChecked(true); } } @@ -595,7 +599,11 @@ public class PackagesDiffLogic { if (!enablePreviews && newPkg.getRevision().isPreview()) { // This is a preview and previews are not enabled. Ignore the package. - continue nextPkg; + // Starting with Tools 23, we explicitly allows Build-Tools RC packages to + // always be visible so only RCs for Tools & Platform-Tools will be hidden. + if (!(newPkg instanceof BuildToolPackage)) { + continue nextPkg; + } } for (PkgCategory cat : cats) { diff --git a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java index c4e3a81..1235bf6 100755 --- a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java +++ b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/core/PackagesDiffLogicTest.java @@ -1471,19 +1471,26 @@ public class PackagesDiffLogicTest extends TestCase { new MockToolPackage(src1, new FullRevision(4, 0, 0, 1), 3), // Tools 4 rc1 new MockPlatformToolPackage(src1, new FullRevision(3, 0, 0)), // Plat-T 3 new MockPlatformToolPackage(src1, new FullRevision(5, 0, 0, 1)), // Plat-T 5 rc1 + new MockBuildToolPackage(src1, new FullRevision(6, 0, 0)), + new MockBuildToolPackage(src1, new FullRevision(7, 0, 0, 1)) }); m.updateEnd(true /*sortByApi*/); assertEquals( - "PkgCategoryApi <API=TOOLS, label=Tools, #items=2>\n" + + "PkgCategoryApi <API=TOOLS, label=Tools, #items=3>\n" + "-- <NEW, pkg:Android SDK Tools, revision 2>\n" + "-- <NEW, pkg:Android SDK Platform-tools, revision 3>\n" + + "-- <NEW, pkg:Android SDK Build-tools, revision 6>\n" + + "PkgCategoryApi <API=TOOLS-PREVIEW, label=Tools (Preview Channel), #items=1>\n" + + "-- <NEW, pkg:Android SDK Build-tools, revision 7 rc1>\n" + "PkgCategoryApi <API=EXTRAS, label=Extras, #items=0>\n", getTree(m, true /*displaySortByApi*/)); assertEquals( - "PkgCategorySource <source=repo1 (1.example.com), #items=2>\n" + + "PkgCategorySource <source=repo1 (1.example.com), #items=4>\n" + "-- <NEW, pkg:Android SDK Tools, revision 2>\n" + - "-- <NEW, pkg:Android SDK Platform-tools, revision 3>\n", + "-- <NEW, pkg:Android SDK Platform-tools, revision 3>\n" + + "-- <NEW, pkg:Android SDK Build-tools, revision 7 rc1>\n" + + "-- <NEW, pkg:Android SDK Build-tools, revision 6>\n", getTree(m, false /*displaySortByApi*/)); } diff --git a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java index bbefe25..a21dda5 100755 --- a/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java +++ b/sdkmanager/sdkuilib/src/test/java/com/android/sdkuilib/internal/repository/ui/SdkManagerUpgradeTest.java @@ -98,20 +98,20 @@ public class SdkManagerUpgradeTest extends SdkManagerTestCase { actual = pageImpl.getMockTreeDisplay(); assertEquals( - "[] Tools | | | \n" + - " L_[] Android SDK Tools | | 1.0.1 | Update available: rev. 20.0.3\n" + - " L_[] Android SDK Platform-tools | | 17.1.2 | Update available: rev. 18 \n" + - " L_[] Android SDK Build-tools | | 18 | Not installed \n" + - " L_[] Android SDK Build-tools | | 3.0.1 | Installed \n" + - " L_[] Android SDK Build-tools | | 3 | Installed \n" + - "[] Tools (Preview Channel) | | | \n" + + "[] Tools | | | \n" + + " L_[] Android SDK Tools | | 1.0.1 | Update available: rev. 20.0.3 \n" + + " L_[] Android SDK Platform-tools | | 17.1.2 | Update available: rev. 18 \n" + + " L_[] Android SDK Build-tools | | 18 | Not installed \n" + + " L_[] Android SDK Build-tools | | 3.0.1 | Installed \n" + + " L_[] Android SDK Build-tools | | 3 | Installed \n" + + "[] Tools (Preview Channel) | | | \n" + // Note: locally installed previews are always shown, even when enable previews is false. - " L_[] Android SDK Build-tools | | 18.3.4 rc5 | Installed \n" + - "[] Android 0.0 (API 0) | | | \n" + - " L_[] SDK Platform | | 1 | Installed \n" + - " L_[] Sys-Img v0 for (Tag 1, armeabi) | | 0 | Installed \n" + - " L_[] Sources for Android SDK | | 0 | Installed \n" + - "[] Extras | | | ", + " L_[] Android SDK Build-tools | | 18.3.4 rc5 | Update available: rev. 18.3.4 rc15\n" + + "[] Android 0.0 (API 0) | | | \n" + + " L_[] SDK Platform | | 1 | Installed \n" + + " L_[] Sys-Img v0 for (Tag 1, armeabi) | | 0 | Installed \n" + + " L_[] Sources for Android SDK | | 0 | Installed \n" + + "[] Extras | | | ", actual); assertEquals( @@ -139,19 +139,19 @@ public class SdkManagerUpgradeTest extends SdkManagerTestCase { actual = pageImpl.getMockTreeDisplay(); assertEquals( - "[] Tools | | | \n" + - " L_[] Android SDK Tools | | 1.0.1 | Update available: rev. 20.0.3\n" + - " L_[] Android SDK Platform-tools | | 17.1.2 | Update available: rev. 18 \n" + - " L_[] Android SDK Build-tools | | 18 | Not installed \n" + - " L_[] Android SDK Build-tools | | 3.0.1 | Installed \n" + - " L_[] Android SDK Build-tools | | 3 | Installed \n" + - "[] Tools (Preview Channel) | | | \n" + - " L_[] Android SDK Build-tools | | 18.3.4 rc5 | Installed \n" + - "[] Android 0.0 (API 0) | | | \n" + - " L_[] SDK Platform | | 1 | Installed \n" + - " L_[] Sys-Img v0 for (Tag 1, armeabi) | | 0 | Installed \n" + - " L_[] Sources for Android SDK | | 0 | Installed \n" + - "[] Extras | | | ", + "[] Tools | | | \n" + + " L_[] Android SDK Tools | | 1.0.1 | Update available: rev. 20.0.3 \n" + + " L_[] Android SDK Platform-tools | | 17.1.2 | Update available: rev. 18 \n" + + " L_[] Android SDK Build-tools | | 18 | Not installed \n" + + " L_[] Android SDK Build-tools | | 3.0.1 | Installed \n" + + " L_[] Android SDK Build-tools | | 3 | Installed \n" + + "[] Tools (Preview Channel) | | | \n" + + " L_[] Android SDK Build-tools | | 18.3.4 rc5 | Update available: rev. 18.3.4 rc15\n" + + "[] Android 0.0 (API 0) | | | \n" + + " L_[] SDK Platform | | 1 | Installed \n" + + " L_[] Sys-Img v0 for (Tag 1, armeabi) | | 0 | Installed \n" + + " L_[] Sources for Android SDK | | 0 | Installed \n" + + "[] Extras | | | ", actual); assertEquals( |