| commit | 56de05bc1186cf9620fb44e321cfb39f940842d4 | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Sun May 18 16:19:04 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun May 18 16:19:05 2014 +0000 |
| tree | b5b36466995bae170497b6fc606df301775318a1 | |
| parent | 1ada28e54049eae58a1870a46f92a85eb412d668 [diff] | |
| parent | 591a19fcc5bad724f9e75c5355b6fc3d5fa968c8 [diff] |
Merge "Adjust minimum screen size for watches in CTS" into klp-modular-dev
diff --git a/tests/tests/app/src/android/app/cts/ActionBarActivity.java b/tests/tests/app/src/android/app/cts/ActionBarActivity.java index 11cee03..dc65cb2 100644 --- a/tests/tests/app/src/android/app/cts/ActionBarActivity.java +++ b/tests/tests/app/src/android/app/cts/ActionBarActivity.java
@@ -25,6 +25,8 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); ActionBar bar = getActionBar(); - bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); + if (bar != null) { + bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); + } } }
diff --git a/tests/tests/app/src/android/app/cts/ActionBarTest.java b/tests/tests/app/src/android/app/cts/ActionBarTest.java index 796cd74..75e7807 100644 --- a/tests/tests/app/src/android/app/cts/ActionBarTest.java +++ b/tests/tests/app/src/android/app/cts/ActionBarTest.java
@@ -40,6 +40,9 @@ @UiThreadTest public void testAddTab() { + if (mBar == null) { + return; + } assertEquals(0, mBar.getTabCount()); Tab t1 = createTab("Tab 1");