[DO NOT MERGE] Improve the error msg when started not for result

This makes sure that if the association request callback IntentResult
s accidentally started not for result, the resulting exception is
metioning it explicitly.

Test: Ensure the error message when calling the IntentSender not for result
  explicitly mentions the requirement for the activity to be called for result.
Bug: 30932767

Change-Id: I950f262af43c555fb20dd5e49e935e476f24bba8
This commit is contained in:
Eugene Susla
2017-03-27 16:57:40 -07:00
committed by Svetoslav Ganov
parent 728ce60465
commit 5423b4e0a8

View File

@@ -34,6 +34,7 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.companiondevicemanager.DeviceDiscoveryService.DeviceFilterPair;
import com.android.internal.util.Preconditions;
public class DeviceChooserActivity extends Activity {
@@ -92,8 +93,11 @@ public class DeviceChooserActivity extends Activity {
private CharSequence getCallingAppName() {
try {
final PackageManager packageManager = getPackageManager();
String callingPackage = Preconditions.checkStringNotEmpty(
getCallingPackage(),
"This activity must be called for result");
return packageManager.getApplicationLabel(
packageManager.getApplicationInfo(getCallingPackage(), 0));
packageManager.getApplicationInfo(callingPackage, 0));
} catch (PackageManager.NameNotFoundException e) {
throw new RuntimeException(e);
}