Revert "Fix failing testSlicedStateCountMetric"
This reverts commit e9372b0c8d11f98fa711103c362124d853eda7f3.
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_rvc-dev&target=test_suites_arm64&lkgb=6825950&lkbb=6826041&fkbb=6826041, bug 168241007.
Bug: 168241007
Change-Id: I6f214a94af39e652564912a832873e752947bd86
diff --git a/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml b/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml
index 9defdc6..2b479bd 100644
--- a/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml
+++ b/hostsidetests/statsd/apps/statsdapp/AndroidManifest.xml
@@ -36,7 +36,6 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
<application android:label="@string/app_name">
<uses-library android:name="android.test.runner" />
diff --git a/hostsidetests/statsd/apps/statsdapp/src/com/android/server/cts/device/statsd/AtomTests.java b/hostsidetests/statsd/apps/statsdapp/src/com/android/server/cts/device/statsd/AtomTests.java
index eb28a1e..e4d473b 100644
--- a/hostsidetests/statsd/apps/statsdapp/src/com/android/server/cts/device/statsd/AtomTests.java
+++ b/hostsidetests/statsd/apps/statsdapp/src/com/android/server/cts/device/statsd/AtomTests.java
@@ -17,6 +17,7 @@
package com.android.server.cts.device.statsd;
import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+
import static com.google.common.truth.Truth.assertWithMessage;
import android.accounts.Account;
@@ -67,18 +68,22 @@
import android.os.SystemClock;
import android.os.VibrationEffect;
import android.os.Vibrator;
-import android.provider.Settings;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
import android.util.StatsEvent;
import android.util.StatsLog;
+
import androidx.annotation.NonNull;
import androidx.test.InstrumentationRegistry;
+
import com.android.compatibility.common.util.ShellIdentityUtils;
import com.android.utils.blob.DummyBlobData;
-import com.android.utils.blob.FakeBlobData;
+
import com.google.common.io.BaseEncoding;
+
+import org.junit.Test;
+
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Arrays;
@@ -88,7 +93,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer;
-import org.junit.Test;
public class AtomTests {
private static final String TAG = AtomTests.class.getSimpleName();
@@ -254,38 +258,23 @@
int uid = Process.myUid();
int whatAtomId = 9_999;
- // Get the current setting for bluetooth background scanning.
- // Set to 0 if the setting is not found or an error occurs.
- int initialBleScanGlobalSetting = Settings.Global.getInt(
- InstrumentationRegistry.getTargetContext().getContentResolver(),
- Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
-
- // Turn off bluetooth background scanning.
- Settings.Global.putInt(InstrumentationRegistry.getTargetContext().getContentResolver(),
- Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
-
// Change state to State.ON.
bleScanner.startScan(null, scanSettings, scanCallback);
- sleep(6_000);
+ sleep(500);
writeSliceByBleScanStateChangedAtom(whatAtomId, uid, false, false, false);
writeSliceByBleScanStateChangedAtom(whatAtomId, uid, false, false, false);
-
bluetoothAdapter.disable();
- sleep(6_000);
+ sleep(1500);
// Trigger State.RESET so that new state is State.OFF.
if (!bluetoothAdapter.enable()) {
Log.e(TAG, "Could not enable bluetooth to trigger state reset");
return;
}
- sleep(6_000); // Wait for Bluetooth to fully turn on.
+ sleep(3_000); // Wait for Bluetooth to fully turn on.
writeSliceByBleScanStateChangedAtom(whatAtomId, uid, false, false, false);
writeSliceByBleScanStateChangedAtom(whatAtomId, uid, false, false, false);
writeSliceByBleScanStateChangedAtom(whatAtomId, uid, false, false, false);
-
- // Set bluetooth background scanning to original setting.
- Settings.Global.putInt(InstrumentationRegistry.getTargetContext().getContentResolver(),
- Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, initialBleScanGlobalSetting);
});
}
