diff options
| author | Jian Jin <jinjian@google.com> | 2020-03-09 17:22:14 -0700 |
|---|---|---|
| committer | Rodrigo Lagos <rlagos@google.com> | 2020-06-07 18:36:39 -0700 |
| commit | 6c869b81596f666956d9073c15447215b631cd2d (patch) | |
| tree | 2e9f9738d2d349cdaf467179710f3d50139a9b73 | |
| parent | d7d24eebc60d70d1c8ee7e2209be12c9f3c94785 (diff) | |
| download | setupwizard-6c869b81596f666956d9073c15447215b631cd2d.tar.gz | |
Annotate test api and update OWNERS
Bug: 149927175
Test: RunCarSetupWizardLibRoboTests
Change-Id: I2fa41cab7c5600b61b07c918aa2612de3730cc23
Merged-In: I2fa41cab7c5600b61b07c918aa2612de3730cc23
| -rw-r--r-- | OWNERS | 3 | ||||
| -rw-r--r-- | library/main/src/com/android/car/setupwizardlib/BaseSetupWizardActivity.java | 2 | ||||
| -rw-r--r-- | library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java | 1 |
3 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,7 @@ # People who can approve changes for submission. +jdsouza@google.com jinjian@google.com -kevinjm@google.com +sandraalfaro@google.com # TLs rlagos@google.com diff --git a/library/main/src/com/android/car/setupwizardlib/BaseSetupWizardActivity.java b/library/main/src/com/android/car/setupwizardlib/BaseSetupWizardActivity.java index cbf47f1..27da4fd 100644 --- a/library/main/src/com/android/car/setupwizardlib/BaseSetupWizardActivity.java +++ b/library/main/src/com/android/car/setupwizardlib/BaseSetupWizardActivity.java @@ -479,7 +479,7 @@ abstract class BaseSetupWizardActivity extends FragmentActivity { CarWizardManagerHelper.getNextIntent(getIntent(), mResultCode, mResultData); if (forResult) { startActivityForResult(nextIntent, REQUEST_CODE_NEXT); - } else { + } else { startActivity(nextIntent); } } diff --git a/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java b/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java index af5b262..759dd81 100644 --- a/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java +++ b/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java @@ -270,6 +270,7 @@ public class CarDrivingStateMonitor implements } /** Testing only */ + @VisibleForTesting public static void replace(Context context, CarDrivingStateMonitor monitor) { CarHelperRegistry.getRegistry(context).putHelper(CarDrivingStateMonitor.class, monitor); } |