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

Merge "Kill service before trying to cancel notifications."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-09 01:31:28 +00:00
committed by Android (Google) Code Review
parent 51b4aa90aa 2c0f3a372c
commit c57da63030
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
View File

@@ -588,6 +588,10 @@ public class BugreportReceiverTest extends InstrumentationTestCase {
}
private void cancelExistingNotifications() {
// Must kill service first, because notifications from a foreground service cannot be
// canceled.
killService();
NotificationManager nm = NotificationManager.from(mContext);
StatusBarNotification[] activeNotifications = nm.getActiveNotifications();
if (activeNotifications.length == 0) {
@@ -899,6 +903,26 @@ public class BugreportReceiverTest extends InstrumentationTestCase {
fail("Service status didn't change to " + expectRunning);
}
private void killService() {
String service = BugreportProgressService.class.getName();
if (!isServiceRunning(service)) return;
Log.w(TAG, "Service '" + service + "' is still running, killing it");
silentlyExecuteShellCommand("am stopservice com.android.shell/.BugreportProgressService");
waitForService(false);
}
private void silentlyExecuteShellCommand(String cmd) {
Log.w(TAG, "silentlyExecuteShellCommand: '" + cmd + "'");
try {
UiDevice.getInstance(getInstrumentation()).executeShellCommand(cmd);
} catch (IOException e) {
Log.w(TAG, "error executing shell comamand '" + cmd + "'", e);
}
}
private void createTextFile(String path, String content) throws IOException {
Log.v(TAG, "createFile(" + path + ")");
try (Writer writer = new BufferedWriter(new OutputStreamWriter(