diff options
Diffstat (limited to 'packages/CompanionDeviceManager/src')
3 files changed, 47 insertions, 15 deletions
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java index e00533422072..23dc4ed9efa9 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionAssociationActivity.java @@ -19,6 +19,7 @@ package com.android.companiondevicemanager; import static android.companion.CompanionDeviceManager.RESULT_CANCELED; import static android.companion.CompanionDeviceManager.RESULT_DISCOVERY_TIMEOUT; import static android.companion.CompanionDeviceManager.RESULT_INTERNAL_ERROR; +import static android.companion.CompanionDeviceManager.RESULT_SECURITY_ERROR; import static android.companion.CompanionDeviceManager.RESULT_USER_REJECTED; import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; @@ -33,6 +34,7 @@ import static com.android.companiondevicemanager.CompanionDeviceResources.PROFIL import static com.android.companiondevicemanager.CompanionDeviceResources.PROFILE_TITLES; import static com.android.companiondevicemanager.CompanionDeviceResources.SUPPORTED_PROFILES; import static com.android.companiondevicemanager.CompanionDeviceResources.SUPPORTED_SELF_MANAGED_PROFILES; +import static com.android.companiondevicemanager.Utils.RESULT_CODE_TO_REASON; import static com.android.companiondevicemanager.Utils.getApplicationLabel; import static com.android.companiondevicemanager.Utils.getHtmlFromResources; import static com.android.companiondevicemanager.Utils.getIcon; @@ -51,6 +53,7 @@ import android.companion.AssociatedDevice; import android.companion.AssociationInfo; import android.companion.AssociationRequest; import android.companion.CompanionDeviceManager; +import android.companion.Flags; import android.companion.IAssociationRequestCallback; import android.content.Intent; import android.content.pm.PackageManager; @@ -231,7 +234,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements boolean forCancelDialog = intent.getBooleanExtra(EXTRA_FORCE_CANCEL_CONFIRMATION, false); if (forCancelDialog) { Slog.i(TAG, "Cancelling the user confirmation"); - cancel(RESULT_CANCELED); + cancel(RESULT_CANCELED, null); return; } @@ -243,10 +246,15 @@ public class CompanionAssociationActivity extends FragmentActivity implements if (appCallback == null) { return; } - Slog.e(TAG, "More than one AssociationRequests are processing."); try { - appCallback.onFailure(RESULT_INTERNAL_ERROR); + if (Flags.associationFailureCode()) { + appCallback.onFailure( + RESULT_SECURITY_ERROR, "More than one AssociationRequests are processing."); + } else { + appCallback.onFailure( + RESULT_INTERNAL_ERROR, "More than one AssociationRequests are processing."); + } } catch (RemoteException ignore) { } } @@ -257,7 +265,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements // TODO: handle config changes without cancelling. if (!isDone()) { - cancel(RESULT_CANCELED); // will finish() + cancel(RESULT_CANCELED, null); // will finish() } } @@ -331,7 +339,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements && CompanionDeviceDiscoveryService.getScanResult().getValue().isEmpty()) { synchronized (LOCK) { if (sDiscoveryStarted) { - cancel(RESULT_DISCOVERY_TIMEOUT); + cancel(RESULT_DISCOVERY_TIMEOUT, null); } } } @@ -371,7 +379,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements mCdmServiceReceiver.send(RESULT_CODE_ASSOCIATION_APPROVED, data); } - private void cancel(int failureCode) { + private void cancel(int errorCode, @Nullable CharSequence error) { if (isDone()) { Slog.w(TAG, "Already done: " + (mApproved ? "Approved" : "Cancelled")); return; @@ -385,13 +393,14 @@ public class CompanionAssociationActivity extends FragmentActivity implements // First send callback to the app directly... try { - Slog.i(TAG, "Sending onFailure to app due to failureCode=" + failureCode); - mAppCallback.onFailure(failureCode); + CharSequence errorMessage = error != null + ? error : RESULT_CODE_TO_REASON.get(errorCode); + mAppCallback.onFailure(errorCode, errorMessage); } catch (RemoteException ignore) { } // ... then set result and finish ("sending" onActivityResult()). - setResultAndFinish(null, failureCode); + setResultAndFinish(null, errorCode); } private void setResultAndFinish(@Nullable AssociationInfo association, int resultCode) { @@ -436,7 +445,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements } } catch (PackageManager.NameNotFoundException e) { Slog.e(TAG, "Package u" + userId + "/" + packageName + " not found."); - cancel(RESULT_INTERNAL_ERROR); + cancel(RESULT_INTERNAL_ERROR, e.getMessage()); return; } @@ -624,7 +633,7 @@ public class CompanionAssociationActivity extends FragmentActivity implements // Disable the button, to prevent more clicks. v.setEnabled(false); - cancel(RESULT_USER_REJECTED); + cancel(RESULT_USER_REJECTED, null); } private void onShowHelperDialog(View view) { @@ -749,8 +758,8 @@ public class CompanionAssociationActivity extends FragmentActivity implements }; @Override - public void onShowHelperDialogFailed() { - cancel(RESULT_INTERNAL_ERROR); + public void onShowHelperDialogFailed(CharSequence errorMessage) { + cancel(RESULT_INTERNAL_ERROR, errorMessage); } @Override diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java index fe0e021b363c..5797bcabba08 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java @@ -58,7 +58,7 @@ public class CompanionVendorHelperDialogFragment extends DialogFragment { private Button mButton; interface CompanionVendorHelperDialogListener { - void onShowHelperDialogFailed(); + void onShowHelperDialogFailed(CharSequence error); void onHelperDialogDismissed(); } @@ -114,7 +114,7 @@ public class CompanionVendorHelperDialogFragment extends DialogFragment { appLabel = getApplicationLabel(getContext(), packageName, userId); } catch (PackageManager.NameNotFoundException e) { Log.e(TAG, "Package u" + userId + "/" + packageName + " not found."); - mListener.onShowHelperDialogFailed(); + mListener.onShowHelperDialogFailed(e.getMessage()); return; } diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java index 8c14f8037e64..2f971321d905 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/Utils.java @@ -16,6 +16,15 @@ package com.android.companiondevicemanager; +import static android.companion.CompanionDeviceManager.REASON_CANCELED; +import static android.companion.CompanionDeviceManager.REASON_DISCOVERY_TIMEOUT; +import static android.companion.CompanionDeviceManager.REASON_USER_REJECTED; +import static android.companion.CompanionDeviceManager.RESULT_CANCELED; +import static android.companion.CompanionDeviceManager.RESULT_DISCOVERY_TIMEOUT; +import static android.companion.CompanionDeviceManager.RESULT_USER_REJECTED; + +import static java.util.Collections.unmodifiableMap; + import android.annotation.NonNull; import android.annotation.StringRes; import android.content.Context; @@ -31,6 +40,9 @@ import android.os.Parcel; import android.os.ResultReceiver; import android.text.Html; import android.text.Spanned; +import android.util.ArrayMap; + +import java.util.Map; /** * Utilities. @@ -40,6 +52,17 @@ class Utils { "android.companion.vendor_icon"; private static final String COMPANION_DEVICE_ACTIVITY_VENDOR_NAME = "android.companion.vendor_name"; + // This map solely the common error messages that occur during the Association + // creation process. + static final Map<Integer, String> RESULT_CODE_TO_REASON; + static { + final Map<Integer, String> map = new ArrayMap<>(); + map.put(RESULT_CANCELED, REASON_CANCELED); + map.put(RESULT_USER_REJECTED, REASON_USER_REJECTED); + map.put(RESULT_DISCOVERY_TIMEOUT, REASON_DISCOVERY_TIMEOUT); + + RESULT_CODE_TO_REASON = unmodifiableMap(map); + } /** * Convert an instance of a "locally-defined" ResultReceiver to an instance of |