Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Not send switch intents if there is no real intent" into oc-dev

Browse Source 
am: 82331f7f73

Change-Id: Ief39b33a90bbc6d9428006baccd6b293572d17f3
This commit is contained in:
Philip P. Moltmann
2017-04-03 23:51:02 +00:00
committed by android-build-merger
parent d6da0d25cb 82331f7f73
commit 09b5ec8ee1
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
View File

@@ -1039,18 +1039,34 @@ class UsbProfileGroupSettingsManager {
* Start the appropriate package when an device/accessory got attached.
*
* @param intent The intent to start the package
* @param matches The available resolutions of the intent
* @param rawMatches The available resolutions of the intent
* @param defaultActivity The default activity for the device (if set)
* @param device The device if a device was attached
* @param accessory The accessory if a device was attached
*/
private void resolveActivity(@NonNull Intent intent, @NonNull ArrayList<ResolveInfo> matches,
private void resolveActivity(@NonNull Intent intent, @NonNull ArrayList<ResolveInfo> rawMatches,
@Nullable ActivityInfo defaultActivity, @Nullable UsbDevice device,
@Nullable UsbAccessory accessory) {
int count = matches.size();
final int numRawMatches = rawMatches.size();
// The raw matches contain the activities that can be started but also the intents to switch
// between the profiles
int numParentActivityMatches = 0;
int numNonParentActivityMatches = 0;
for (int i = 0; i < numRawMatches; i++) {
final ResolveInfo rawMatch = rawMatches.get(i);
if (!rawMatch.getComponentInfo().name.equals(FORWARD_INTENT_TO_MANAGED_PROFILE)) {
if (UserHandle.getUserHandleForUid(
rawMatch.activityInfo.applicationInfo.uid).equals(mParentUser)) {
numParentActivityMatches++;
} else {
numNonParentActivityMatches++;
}
}
}
// don't show the resolver activity if there are no choices available
if (count == 0) {
if (numParentActivityMatches + numNonParentActivityMatches == 0) {
if (accessory != null) {
String uri = accessory.getUri();
if (uri != null && uri.length() > 0) {
@@ -1073,6 +1089,21 @@ class UsbProfileGroupSettingsManager {
return;
}
// If only one profile has activity matches, we need to remove all switch intents
ArrayList<ResolveInfo> matches;
if (numParentActivityMatches == 0 || numNonParentActivityMatches == 0) {
matches = new ArrayList<>(numParentActivityMatches + numNonParentActivityMatches);
for (int i = 0; i < numRawMatches; i++) {
ResolveInfo rawMatch = rawMatches.get(i);
if (!rawMatch.getComponentInfo().name.equals(FORWARD_INTENT_TO_MANAGED_PROFILE)) {
matches.add(rawMatch);
}
}
} else {
matches = rawMatches;
}
if (defaultActivity != null) {
UsbUserSettingsManager defaultRIUserSettings = mSettingsManager.getSettingsForUser(
UserHandle.getUserId(defaultActivity.applicationInfo.uid));
@@ -1101,7 +1132,7 @@ class UsbProfileGroupSettingsManager {
resolverIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
UserHandle user;
if (count == 1) {
if (matches.size() == 1) {
ResolveInfo rInfo = matches.get(0);
// start UsbConfirmActivity if there is only one choice