Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Xamarin.Android.Build.Debugging.Tasks/Tasks/FastDeploy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,11 @@ public async Task RunInstall ()
return;
}
if (!await IsPackageInstalled (PackageName)) {
LogDiagnostic ($"`pm path {PackageName}` still reports no package after reinstall; continuing — the run-as probe will surface the failure.");
LogDiagnostic ($"`pm path {PackageName}` still reports no package after reinstall.");
LogDiagnosticDataError ("XA0132", Resources.XA0132_PackageNotInstalled);
PrintDiagnostics ();
LogCodedError ("XA0132", Resources.XA0132_PackageNotInstalled);
return;
}
}

Expand Down Expand Up @@ -593,6 +597,11 @@ async Task<bool> IsPackageInstalled (string packageName)
args.Add (packageName);
string output = await Device.RunShellCommand (CancellationToken, args.ToArray ());
LogDiagnostic ($"`pm path {packageName}` returned: {(string.IsNullOrWhiteSpace (output) ? "<no output>" : output.Trim ())}");
return IsPackageInstalledOutput (output);
}

internal static bool IsPackageInstalledOutput (string output)
{
return !string.IsNullOrWhiteSpace (output) &&
output.IndexOf ("package:", StringComparison.OrdinalIgnoreCase) >= 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,5 +211,20 @@ public void IsTransientRunAsStatRace_ReturnsFalseForNonTransientOutput (string o
Assert.IsFalse (FastDeploy.IsTransientRunAsStatRace (output),
$"Expected no transient-race detection for: {output}");
}

[TestCase ("package:/data/app/~~hash/com.example.app-base/base.apk")]
[TestCase ("package:/data/app/~~hash/com.example.app-base/base.apk\npackage:/data/app/~~hash/com.example.app-split/split_config.en.apk")]
public void IsPackageInstalledOutput_ReturnsTrueForPackagePaths (string output)
{
Assert.IsTrue (FastDeploy.IsPackageInstalledOutput (output));
}

[TestCase (null)]
[TestCase ("")]
[TestCase ("Error: package com.example.app was not found")]
public void IsPackageInstalledOutput_ReturnsFalseWithoutPackagePath (string output)
{
Assert.IsFalse (FastDeploy.IsPackageInstalledOutput (output));
}
}
}
Loading