diff options
| author | Anthony Chen <ajchen@google.com> | 2018-04-02 13:13:53 -0700 |
|---|---|---|
| committer | Anthony Chen <ajchen@google.com> | 2018-04-03 16:27:02 -0700 |
| commit | 7bd39e929390e754c96e2792efe0deac7b3841e6 (patch) | |
| tree | a5693b0a91c51f7d6ea3c63c4ef8db4989e368da /TrustAgent/src | |
| parent | 06d370c620d3cbde41d3714df0c9344a4f43212b (diff) | |
| download | Car-7bd39e929390e754c96e2792efe0deac7b3841e6.tar.gz | |
Migrate to androidx.* dependencies.
Note, that the EmbeddedKitchenSinkApp has not been migrated because it
depends on car support library. The car support library target is not
yet ready to be migrated.
Also, clean up that app so that it no longer depends on
car-stream-ui-lib.
Test: build and flash
Bug: 77483560
Change-Id: I80f532b7ac2e328b22bf45f0dacc5d2b43a6cb6e
Diffstat (limited to 'TrustAgent/src')
| -rw-r--r-- | TrustAgent/src/com/android/car/trust/CarBleTrustAgent.java | 3 | ||||
| -rw-r--r-- | TrustAgent/src/com/android/car/trust/CarEnrolmentActivity.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/TrustAgent/src/com/android/car/trust/CarBleTrustAgent.java b/TrustAgent/src/com/android/car/trust/CarBleTrustAgent.java index 87b268a316..1e73ab89b7 100644 --- a/TrustAgent/src/com/android/car/trust/CarBleTrustAgent.java +++ b/TrustAgent/src/com/android/car/trust/CarBleTrustAgent.java @@ -31,9 +31,10 @@ import android.os.IBinder; import android.os.UserHandle; import android.os.UserManager; import android.service.trust.TrustAgentService; -import android.support.v4.content.LocalBroadcastManager; import android.util.Log; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import java.util.concurrent.TimeUnit; /** diff --git a/TrustAgent/src/com/android/car/trust/CarEnrolmentActivity.java b/TrustAgent/src/com/android/car/trust/CarEnrolmentActivity.java index 0575ec5e5f..97f7dfccde 100644 --- a/TrustAgent/src/com/android/car/trust/CarEnrolmentActivity.java +++ b/TrustAgent/src/com/android/car/trust/CarEnrolmentActivity.java @@ -35,10 +35,11 @@ import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.preference.PreferenceManager; -import android.support.v4.content.LocalBroadcastManager; import android.util.Log; import android.widget.TextView; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.android.car.trust.CarEnrolmentService.EnrolmentListener; import com.android.car.trust.SimpleBleServer.ConnectionCallback; |