Merge Android 13 QPR1
Bug: 261731544
Merged-In: I522742ebcc5908517193381b5f7bad17c73f92a4
Change-Id: I76fca575f2f38a65586a864f84e4f1d5d9ca9073
diff --git a/ClusterHomeSample/AndroidManifest.xml b/ClusterHomeSample/AndroidManifest.xml
index 1dc7eb5..b2ca15f 100644
--- a/ClusterHomeSample/AndroidManifest.xml
+++ b/ClusterHomeSample/AndroidManifest.xml
@@ -21,6 +21,8 @@
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<!-- for IActivityManager.registerTaskStackListener() -->
<uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS"/>
+ <!-- for PackageManager.queryIntentActivitiesAsUser() -->
+ <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
<!-- for ClusterHomeManager -->
<uses-permission android:name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"/>
<!-- for CarInputManager.requestInputEventCapture() -->
diff --git a/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java b/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
index c85fa41..c0001da 100644
--- a/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
+++ b/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java
@@ -35,6 +35,8 @@
import android.app.TaskInfo;
import android.app.TaskStackListener;
import android.car.Car;
+import android.car.CarAppFocusManager;
+import android.car.CarAppFocusManager.OnAppFocusChangedListener;
import android.car.CarOccupantZoneManager;
import android.car.cluster.ClusterActivityState;
import android.car.cluster.ClusterHomeManager;
@@ -46,40 +48,47 @@
import android.car.user.UserLifecycleEventFilter;
import android.content.ComponentName;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.ResolveInfoFlags;
+import android.content.pm.ResolveInfo;
import android.graphics.Rect;
import android.hardware.input.InputManager;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.util.ArraySet;
import android.util.Log;
import android.view.Display;
import android.view.KeyEvent;
+import java.util.ArrayList;
import java.util.List;
public final class ClusterHomeApplication extends Application {
public static final String TAG = "ClusterHome";
- private static final boolean DBG = false;
+ private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
private static final int UI_TYPE_HOME = UI_TYPE_CLUSTER_HOME;
private static final int UI_TYPE_MAPS = UI_TYPE_HOME + 1;
private static final int UI_TYPE_MUSIC = UI_TYPE_HOME + 2;
private static final int UI_TYPE_PHONE = UI_TYPE_HOME + 3;
private static final int UI_TYPE_START = UI_TYPE_MAPS;
- private static final byte HOME_AVAILABILITY = 1;
- private static final byte MAPS_AVAILABILITY = 1;
- private static final byte PHONE_AVAILABILITY = 1;
- private static final byte MUSIC_AVAILABILITY = 1;
+ private static final byte UI_UNAVAILABLE = 0;
+ private static final byte UI_AVAILABLE = 1;
+ private PackageManager mPackageManager;
private IActivityTaskManager mAtm;
private InputManager mInputManager;
private ClusterHomeManager mHomeManager;
private CarUserManager mUserManager;
private CarInputManager mCarInputManager;
+ private CarAppFocusManager mAppFocusManager;
private ClusterState mClusterState;
private byte mUiAvailability[];
private int mUserLifeCycleEvent = USER_LIFECYCLE_EVENT_TYPE_STARTING;
- private ComponentName[] mClusterActivities;
+ private ArrayList<ComponentName> mClusterActivities = new ArrayList<>();
+ private int mDefaultClusterActivitySize = 0;
private int mLastLaunchedUiType = UI_TYPE_CLUSTER_NONE;
private int mLastReportedUiType = UI_TYPE_CLUSTER_NONE;
@@ -87,15 +96,16 @@
@Override
public void onCreate() {
super.onCreate();
- mClusterActivities = new ComponentName[] {
- new ComponentName(getApplicationContext(), ClusterHomeActivity.class),
- ComponentName.unflattenFromString(
- getString(R.string.config_clusterMapActivity)),
- ComponentName.unflattenFromString(
- getString(R.string.config_clusterMusicActivity)),
- ComponentName.unflattenFromString(
- getString(R.string.config_clusterPhoneActivity)),
- };
+ mClusterActivities.add(UI_TYPE_HOME,
+ new ComponentName(getApplicationContext(), ClusterHomeActivity.class));
+ mClusterActivities.add(UI_TYPE_MAPS,
+ ComponentName.unflattenFromString(getString(R.string.config_clusterMapActivity)));
+ mClusterActivities.add(UI_TYPE_MUSIC,
+ ComponentName.unflattenFromString(getString(R.string.config_clusterMusicActivity)));
+ mClusterActivities.add(UI_TYPE_PHONE,
+ ComponentName.unflattenFromString(getString(R.string.config_clusterPhoneActivity)));
+ mDefaultClusterActivitySize = mClusterActivities.size();
+ mPackageManager = getApplicationContext().getPackageManager();
mAtm = ActivityTaskManager.getService();
try {
mAtm.registerTaskStackListener(mTaskStackListener);
@@ -111,6 +121,8 @@
mHomeManager = (ClusterHomeManager) car.getCarManager(Car.CLUSTER_HOME_SERVICE);
mUserManager = (CarUserManager) car.getCarManager(Car.CAR_USER_SERVICE);
mCarInputManager = (CarInputManager) car.getCarManager(Car.CAR_INPUT_SERVICE);
+ mAppFocusManager = (CarAppFocusManager) car.getCarManager(
+ Car.APP_FOCUS_SERVICE);
initClusterHome();
});
}
@@ -126,7 +138,7 @@
if (!mClusterState.on) {
mHomeManager.requestDisplay(UI_TYPE_HOME);
}
- mUiAvailability = buildUiAvailability();
+ mUiAvailability = buildUiAvailability(ActivityManager.getCurrentUser());
mHomeManager.reportState(mClusterState.uiType, UI_TYPE_CLUSTER_NONE, mUiAvailability);
mHomeManager.registerClusterStateListener(getMainExecutor(), mClusterHomeCalback);
@@ -137,6 +149,9 @@
.addEventType(USER_LIFECYCLE_EVENT_TYPE_UNLOCKED).build();
mUserManager.addListener(getMainExecutor(), filter, mUserLifecycleListener);
+ mAppFocusManager.addFocusListener(mAppFocusChangedListener,
+ CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+
int r = mCarInputManager.requestInputEventCapture(
DISPLAY_TYPE_INSTRUMENT_CLUSTER,
new int[]{CarInputManager.INPUT_TYPE_ALL_INPUTS},
@@ -175,7 +190,7 @@
return;
}
mLastLaunchedUiType = uiType;
- ComponentName activity = mClusterActivities[uiType];
+ ComponentName activity = mClusterActivities.get(uiType);
Intent intent = new Intent(ACTION_MAIN).setComponent(activity);
if (mClusterState.bounds != null && mClusterState.insets != null) {
@@ -195,11 +210,53 @@
mHomeManager.startFixedActivityModeAsUser(intent, options.toBundle(), userId);
}
- private byte[] buildUiAvailability() {
- // TODO(b/183115088): populate uiAvailability based on the package availability
- return new byte[] {
- HOME_AVAILABILITY, MAPS_AVAILABILITY, PHONE_AVAILABILITY, MUSIC_AVAILABILITY
- };
+ private void add3PNavigationActivities(int currentUser) {
+ // Clean up the 3P Navigations from the previous user.
+ mClusterActivities.subList(mDefaultClusterActivitySize, mClusterActivities.size()).clear();
+
+ ArraySet<String> clusterPackages = new ArraySet<>();
+ for (int i = mDefaultClusterActivitySize - 1; i >= 0; --i) {
+ clusterPackages.add(mClusterActivities.get(i).getPackageName());
+ }
+ Intent intent = new Intent(Intent.ACTION_MAIN).addCategory(Car.CAR_CATEGORY_NAVIGATION);
+ List<ResolveInfo> resolveList = mPackageManager.queryIntentActivitiesAsUser(
+ intent, ResolveInfoFlags.of(PackageManager.GET_RESOLVED_FILTER),
+ UserHandle.of(currentUser));
+ for (int i = resolveList.size() - 1; i >= 0; --i) {
+ ActivityInfo activityInfo = resolveList.get(i).activityInfo;
+ if (DBG) Log.d(TAG, "Found: " + activityInfo.packageName + "/" + activityInfo.name);
+ // Some package can have multiple navigation Activities, we choose the default one only.
+ if (clusterPackages.contains(activityInfo.packageName)) {
+ if (DBG) {
+ Log.d(TAG, "Skip this, because another Activity in the package is registered.");
+ };
+ continue;
+ }
+ mClusterActivities.add(new ComponentName(activityInfo.packageName, activityInfo.name));
+ }
+ mUiAvailability = buildUiAvailability(currentUser);
+ }
+
+ private byte[] buildUiAvailability(int currentUser) {
+ byte[] availability = new byte[mClusterActivities.size()];
+ Intent intent = new Intent(ACTION_MAIN);
+ for (int i = mClusterActivities.size() - 1; i >= 0; --i) {
+ ComponentName clusterActivity = mClusterActivities.get(i);
+ if (clusterActivity.getPackageName().equals(getPackageName())) {
+ // Assume that all Activities in ClusterHome are available.
+ availability[i] = UI_AVAILABLE;
+ continue;
+ }
+ intent.setComponent(clusterActivity);
+ ResolveInfo resolveInfo = mPackageManager.resolveActivityAsUser(
+ intent, PackageManager.MATCH_DEFAULT_ONLY, currentUser);
+ availability[i] = resolveInfo == null ? UI_UNAVAILABLE : UI_AVAILABLE;
+ if (DBG) {
+ Log.d(TAG, "availability=" + availability[i] + ", activity=" + clusterActivity
+ + ", userId=" + currentUser);
+ }
+ }
+ return availability;
}
private final ClusterStateListener mClusterHomeCalback = new ClusterStateListener() {
@@ -255,8 +312,8 @@
}
private int identifyTopTask(TaskInfo taskInfo) {
- for (int i = mClusterActivities.length - 1; i >=0; --i) {
- if (mClusterActivities[i].equals(taskInfo.topActivity)) {
+ for (int i = mClusterActivities.size() - 1; i >=0; --i) {
+ if (mClusterActivities.get(i).equals(taskInfo.topActivity)) {
return i;
}
}
@@ -269,9 +326,11 @@
mUserLifeCycleEvent = event.getEventType();
if (mUserLifeCycleEvent == USER_LIFECYCLE_EVENT_TYPE_STARTING) {
startClusterActivity(UI_TYPE_HOME);
- } else if (UI_TYPE_HOME != UI_TYPE_START
- && mUserLifeCycleEvent == USER_LIFECYCLE_EVENT_TYPE_UNLOCKED) {
- startClusterActivity(UI_TYPE_START);
+ } else if (mUserLifeCycleEvent == USER_LIFECYCLE_EVENT_TYPE_UNLOCKED) {
+ add3PNavigationActivities(event.getUserId());
+ if (UI_TYPE_START != UI_TYPE_HOME) {
+ startClusterActivity(UI_TYPE_START);
+ }
}
};
@@ -287,11 +346,55 @@
if (DBG) Log.d(TAG, "onKeyEvent: " + keyEvent);
if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_MENU) {
if (keyEvent.getAction() != KeyEvent.ACTION_DOWN) return;
- int nextUiType = (mLastLaunchedUiType + 1) % mUiAvailability.length;
+ int nextUiType;
+ do {
+ nextUiType = (mLastLaunchedUiType + 1) % mUiAvailability.length;
+ } while (mUiAvailability[nextUiType] == UI_UNAVAILABLE);
startClusterActivity(nextUiType);
return;
}
// Use Android InputManager to forward KeyEvent.
mInputManager.injectInputEvent(keyEvent, INJECT_INPUT_EVENT_MODE_ASYNC);
}
+
+ private OnAppFocusChangedListener mAppFocusChangedListener = new OnAppFocusChangedListener() {
+ @Override
+ public void onAppFocusChanged(int appType, boolean active) {
+ if (!active || appType != CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION) {
+ return;
+ }
+ int navigationUi = getFocusedNavigationUi();
+ if (navigationUi != UI_TYPE_CLUSTER_NONE) {
+ startClusterActivity(navigationUi);
+ }
+ }
+ };
+
+ private int getFocusedNavigationUi() {
+ List<String> focusOwnerPackageNames = mAppFocusManager.getAppTypeOwner(
+ CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+ if (focusOwnerPackageNames == null || focusOwnerPackageNames.isEmpty()) {
+ Log.e(TAG, "Can't find the navigation owner");
+ return UI_TYPE_CLUSTER_NONE;
+ }
+ for (int i = 0; i < focusOwnerPackageNames.size(); ++i) {
+ String focusOwnerPackage = focusOwnerPackageNames.get(i);
+ for (int j = mClusterActivities.size() - 1; j >= 0; --j) {
+ if (mUiAvailability[j] == UI_UNAVAILABLE) {
+ continue;
+ }
+ if (mClusterActivities.get(j).getPackageName().equals(focusOwnerPackage)) {
+ if (DBG) {
+ Log.d(TAG, "Found focused NavigationUI: " + j
+ + ", package=" + focusOwnerPackage);
+ }
+ return j;
+ }
+ }
+ }
+ Log.e(TAG, "Can't find the navigation UI for "
+ + String.join(", ", focusOwnerPackageNames) + ".");
+ return UI_TYPE_CLUSTER_NONE;
+ }
+
}
diff --git a/ClusterOsDouble/src/com/android/car/cluster/osdouble/ClusterOsDoubleActivity.java b/ClusterOsDouble/src/com/android/car/cluster/osdouble/ClusterOsDoubleActivity.java
index 8ba7eb3..3671b5d 100644
--- a/ClusterOsDouble/src/com/android/car/cluster/osdouble/ClusterOsDoubleActivity.java
+++ b/ClusterOsDouble/src/com/android/car/cluster/osdouble/ClusterOsDoubleActivity.java
@@ -20,13 +20,12 @@
import static android.car.cluster.ClusterHomeManager.UI_TYPE_CLUSTER_HOME;
import static android.car.cluster.ClusterHomeManager.UI_TYPE_CLUSTER_NONE;
import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;
-import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED;
import static com.android.car.cluster.osdouble.ClusterOsDoubleApplication.TAG;
import android.car.Car;
-import android.car.cluster.navigation.NavigationState.NavigationStateProto;
import android.car.VehiclePropertyIds;
+import android.car.cluster.navigation.NavigationState.NavigationStateProto;
import android.car.hardware.CarPropertyValue;
import android.car.hardware.property.CarPropertyManager;
import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback;
@@ -36,6 +35,7 @@
import android.hardware.display.VirtualDisplay;
import android.os.Bundle;
import android.util.ArrayMap;
+import android.util.IntArray;
import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
@@ -83,19 +83,23 @@
private static final int VENDOR_CLUSTER_DISPLAY_STATE = toVendorId(
VehiclePropertyIds.CLUSTER_DISPLAY_STATE);
+ // For the detail, please refer to vehicle/2.0/types.hal.
+ private static final int REPORT_STATE_MAIN_UI_INDEX = 9;
+ private static final int REPORT_STATE_UI_AVAILABILITY_INDEX = 11;
+
private DisplayManager mDisplayManager;
private CarPropertyManager mPropertyManager;
private SurfaceView mSurfaceView;
private Rect mBounds;
private Insets mInsets;
- private VirtualDisplay mVirtualDisplay;
+ private static VirtualDisplay sVirtualDisplay;
private ClusterViewModel mClusterViewModel;
private final ArrayMap<Sensors.Gear, View> mGearsToIcon = new ArrayMap<>();
private final ArrayList<View> mUiToButton = new ArrayList<>();
int mCurrentUi = UI_TYPE_CLUSTER_HOME;
- int mTotalUiSize;
+ private final IntArray mUiAvailability = new IntArray();
private NavStateController mNavStateController;
@@ -143,15 +147,6 @@
findViewById(R.id.navigation_state), imageResolver);
}
- @Override
- protected void onDestroy() {
- if (mVirtualDisplay != null) {
- mVirtualDisplay.release();
- mVirtualDisplay = null;
- }
- super.onDestroy();
- }
-
private final SurfaceHolder.Callback mSurfaceViewCallback = new SurfaceHolder.Callback() {
@Override
public void surfaceCreated(SurfaceHolder holder) {
@@ -173,10 +168,10 @@
// Adds some empty space in the boundary of the display to verify if mBounds works.
mBounds.inset(/* dx= */ 12, /* dy= */ 12);
mInsets = Insets.of(obscuredWidth, obscuredHeight, obscuredWidth, obscuredHeight);
- if (mVirtualDisplay == null) {
- mVirtualDisplay = createVirtualDisplay(holder.getSurface(), width, height);
+ if (sVirtualDisplay == null) {
+ sVirtualDisplay = createVirtualDisplay(holder.getSurface(), width, height);
} else {
- mVirtualDisplay.setSurface(holder.getSurface());
+ sVirtualDisplay.setSurface(holder.getSurface());
}
}
@@ -185,7 +180,7 @@
Log.i(TAG, "surfaceDestroyed, holder: " + holder + ", detaching surface from"
+ " display, surface: " + holder.getSurface());
// detaching surface is similar to turning off the display
- mVirtualDisplay.setSurface(null);
+ sVirtualDisplay.setSurface(null);
}
};
@@ -234,15 +229,17 @@
if (values.length < 11) {
throw new IllegalArgumentException("Insufficient size of CLUSTER_REPORT_STATE");
}
- // mainUI is the 10th element, refer to vehicle/2.0/types.hal.
- int mainUi = (Integer) values[9];
- if (mainUi >= 0 && mainUi < mTotalUiSize) {
- selectUiButton(mainUi);
+ int mainUi = (Integer) values[REPORT_STATE_MAIN_UI_INDEX];
+ int totalUiSize = values.length - REPORT_STATE_UI_AVAILABILITY_INDEX;
+ mUiAvailability.resize(totalUiSize);
+ for (int i = 0; i < totalUiSize; ++i) {
+ mUiAvailability.set(i, (Byte) values[i + REPORT_STATE_UI_AVAILABILITY_INDEX]);
}
+ selectUiButton(mainUi);
}
private void selectUiButton(int mainUi) {
- for (int i = 0; i < mTotalUiSize; ++i) {
+ for (int i = mUiToButton.size() - 1; i >= 0; --i) {
View button = mUiToButton.get(i);
button.setSelected(i == mainUi);
}
@@ -265,7 +262,6 @@
sendDisplayState();
}
-
private static int toVendorId(int propId) {
return (propId & ~MASK) | VENDOR;
}
@@ -300,7 +296,6 @@
private void registerUi(View view) {
int currentUi = mUiToButton.size();
mUiToButton.add(view);
- mTotalUiSize = mUiToButton.size();
view.setOnTouchListener((v, event) -> {
if (event.getAction() == MotionEvent.ACTION_DOWN) {
Log.d(TAG, "onTouch: " + currentUi);
@@ -329,7 +324,11 @@
public boolean onKeyDown(int keyCode, KeyEvent event) {
Log.d(TAG, "onKeyDown: " + keyCode);
if (keyCode == KeyEvent.KEYCODE_MENU) {
- switchUi((mCurrentUi + 1) % mTotalUiSize);
+ int nextUi = mCurrentUi;
+ do {
+ nextUi = (nextUi + 1) % mUiAvailability.size();
+ } while (mUiAvailability.get(nextUi) == 0);
+ switchUi(nextUi);
return true;
}
return super.onKeyDown(keyCode, event);
diff --git a/DirectRenderingCluster/AndroidManifest.xml b/DirectRenderingCluster/AndroidManifest.xml
index 6f1ce2b..809fa3f 100644
--- a/DirectRenderingCluster/AndroidManifest.xml
+++ b/DirectRenderingCluster/AndroidManifest.xml
@@ -20,7 +20,7 @@
android:process="android.car.cluster"
android:sharedUserId="android.uid.cluster">
- <uses-sdk android:targetSdkVersion="25" android:minSdkVersion="29"/>
+ <uses-sdk android:targetSdkVersion="30"/>
<protected-broadcast android:name="android.car.cluster.NAVIGATION_STATE_UPDATE"/>
@@ -53,7 +53,11 @@
<!-- Required to query packages in Android 11+ -->
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+ <!-- Required to use PhoneStateListener.onCallStateChanged() -->
+ <uses-permission android:name="android.permission.READ_CALL_LOG" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <!-- Required to display media information. -->
+ <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>
<application android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
