Merge "Fix activity has leaked ServiceConnection errors" into pi-car-dev
diff --git a/car-apps-common/src/com/android/car/apps/common/CarUxRestrictionsUtil.java b/car-apps-common/src/com/android/car/apps/common/CarUxRestrictionsUtil.java
index ed219ae..219bf59 100644
--- a/car-apps-common/src/com/android/car/apps/common/CarUxRestrictionsUtil.java
+++ b/car-apps-common/src/com/android/car/apps/common/CarUxRestrictionsUtil.java
@@ -38,6 +38,8 @@
* This class must be a singleton because only one listener can be registered with
* {@link CarUxRestrictionsManager} at a time, as documented in
* {@link CarUxRestrictionsManager#registerListener}.
+ *
+ * @deprecated Use {@link com.android.car.ui.utils.CarUxRestrictionsUtil} instead
*/
public class CarUxRestrictionsUtil {
private static final String TAG = "CarUxRestrictionsUtil";
@@ -63,7 +65,7 @@
}
};
- mCarApi = Car.createCar(context);
+ mCarApi = Car.createCar(context.getApplicationContext());
mObservers = Collections.newSetFromMap(new WeakHashMap<>());
try {
diff --git a/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java b/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
index 3a05111..7e5b79c 100644
--- a/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
+++ b/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
@@ -28,7 +28,7 @@
* <p>By default, the {@link Toolbar} eats all touches on it. This view will override
* {@link #onTouchEvent(MotionEvent)} and return {@code false} if configured to allow pass through.
*
- * @deprecated Use {@link com.android.car.ui.Toolbar} instead
+ * @deprecated Use {@link com.android.car.ui.toolbar.Toolbar} instead
*/
@Deprecated
public class ClickThroughToolbar extends Toolbar {
diff --git a/car-ui-lib/src/com/android/car/ui/utils/CarUxRestrictionsUtil.java b/car-ui-lib/src/com/android/car/ui/utils/CarUxRestrictionsUtil.java
index af65780..7930d88 100644
--- a/car-ui-lib/src/com/android/car/ui/utils/CarUxRestrictionsUtil.java
+++ b/car-ui-lib/src/com/android/car/ui/utils/CarUxRestrictionsUtil.java
@@ -66,7 +66,7 @@
}
};
- mCarApi = Car.createCar(context);
+ mCarApi = Car.createCar(context.getApplicationContext());
mObservers = Collections.newSetFromMap(new WeakHashMap<>());
try {
