Snap for 6203188 from d82171ecd124b17a48664e00a5c045cd8b4c2ac5 to qt-qpr3-release

Change-Id: Ife85afa072b06364f7355cf6eddc411cbeb04004

7 files changed, 11 insertions, 7 deletions

diff --git a/libraries/app-helpers/interfaces/auto/src/android/platform/helpers/IAutoGooglePlayHelper.java b/libraries/app-helpers/interfaces/auto/src/android/platform/helpers/IAutoGooglePlayHelper.java
index c80360790..d3330db57 100644
--- a/libraries/app-helpers/interfaces/auto/src/android/platform/helpers/IAutoGooglePlayHelper.java
+++ b/libraries/app-helpers/interfaces/auto/src/android/platform/helpers/IAutoGooglePlayHelper.java
@@ -35,28 +35,29 @@ public interface IAutoGooglePlayHelper extends IAppHelper, Scrollable {
     /**
      * Setup expectations: Google Play app is open.
      *
-     * This method is used to install a app.
+     * <p>This method is used to install a app.
      */
     void installApp();
 
     /**
      * Setup expectations: Google Play app is open.
      *
-     * This method is used to cancel a download.
+     * <p>This method is used to cancel a download.
      */
     void cancelDownload();
 
     /**
      * Setup expectations: Google Play app is open.
      *
-     * This method is used to open a installed app.
+     * <p>This method is used to return back to Google Play main page
      */
-    void openApp();
+    void returnToMainPage();
 
     /**
      * Setup expectations: Google Play app is open.
      *
-     * This method is used to return back to Google Play main page
+     * <p>This method is used to open a installed app.
      */
-    void returnToMainPage();
+    @Deprecated
+    void openApp();
 }
diff --git a/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/README.md b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/README.md
new file mode 100644
index 000000000..c496110ae
--- /dev/null
+++ b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/README.md
@@ -0,0 +1,3 @@
+# Greenday Power Configs for Run Level and Test Level Metrics
+
+Configs for a smaller set of power metrics : CPUTimePerFreq, MobileBytesTransfer, RemainingBatteryCapacity and WifiBytesTransfer.
\ No newline at end of file
diff --git a/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/greenday-power-smaller-run-level.pb b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/greenday-power-smaller-run-level.pb
new file mode 100644
index 000000000..dd2698b46
--- /dev/null
+++ b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/greenday-power-smaller-run-level.pb
diff --git a/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/greenday-power-smaller-test-level.pb b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/greenday-power-smaller-test-level.pb
new file mode 100644
index 000000000..43dc7c6d6
--- /dev/null
+++ b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/greenday-power-smaller/greenday-power-smaller-test-level.pb
diff --git a/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/README.md b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/README.md
index 558107aae..e3f313952 100644
--- a/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/README.md
+++ b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/README.md
@@ -1,4 +1,4 @@
 # Remaining Battery Capacity Configs
 
 These configs are used to collect the remaining battery capacity on the device as defined in the
-RemainingBatteryCapacity (Colomb counter) atom.
+RemainingBatteryCapacity (Colomb counter) atom. Also includes configs with uid to package name mapping
diff --git a/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/remaining-battery-capacity-with-uid-run-level.pb b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/remaining-battery-capacity-with-uid-run-level.pb
new file mode 100644
index 000000000..f4a1d0a55
--- /dev/null
+++ b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/remaining-battery-capacity-with-uid-run-level.pb
diff --git a/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/remaining-battery-capacity-with-uid-test-level.pb b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/remaining-battery-capacity-with-uid-test-level.pb
new file mode 100644
index 000000000..4f534e1e8
--- /dev/null
+++ b/libraries/device-collectors/src/main/platform-collectors/res/statsd-configs/remaining-battery-capacity/remaining-battery-capacity-with-uid-test-level.pb