am 94e114c9: Moved Market related Checkin Stats enum to Events enum and merged

Merge commit '94e114c951008c831d1a31a2e6773fb40e4e9392'

* commit '94e114c951008c831d1a31a2e6773fb40e4e9392':
  Moved Market related Checkin Stats enum to Events enum and merged

1 files changed, 5 insertions, 37 deletions

diff --git a/core/java/android/provider/Checkin.java b/core/java/android/provider/Checkin.java
index f2c275e..6b491ab 100644
--- a/core/java/android/provider/Checkin.java
+++ b/core/java/android/provider/Checkin.java
@@ -109,6 +109,11 @@ public final class Checkin {
             SYSTEM_TOMBSTONE,
             TEST, 
             BATTERY_DISCHARGE_INFO,
+            MARKET_DOWNLOAD,
+            MARKET_INSTALL,
+            MARKET_REMOVE,
+            MARKET_REFUND,
+            MARKET_UNINSTALL,
         }
     }
 
@@ -147,43 +152,6 @@ public final class Checkin {
             TEST,
             NETWORK_RX_MOBILE,
             NETWORK_TX_MOBILE,
-            MARKET_DOWNLOAD_REQUESTED,
-            MARKET_DOWNLOAD_SCHEDULED,
-            MARKET_DOWNLOAD_CANCELLED_PENDING,
-            MARKET_DOWNLOAD_CANCELLED,
-            MARKET_DOWNLOAD_OK,
-            MARKET_DOWNLOAD_FAILED,
-            MARKET_DOWNLOAD_DECLINED,
-            MARKET_INSTALL_SCHEDULED,
-            MARKET_INSTALL_FAILED,
-            MARKET_INSTALL_OK,
-            MARKET_REMOVE_SCHEDULED,
-            MARKET_REMOVE_MALICIOUS_SCHEDULED,
-            MARKET_REMOVE_ABORTED,
-            MARKET_REMOVE_FAILED,
-            MARKET_REMOVE_OK,
-            MARKET_UNINSTALL_SCHEDULED,
-            MARKET_REFUND_REQUESTED,
-            MARKET_REFUND_OK,
-            MARKET_REFUND_FAILED,
-            MARKET_REASON_ALREADY_EXISTS,
-            MARKET_REASON_INVALID_APK,
-            MARKET_REASON_INSUFFICIENT_STORAGE,
-            MARKET_REASON_DUPLICATE_PACKAGE,
-            MARKET_REASON_UPDATE_INCOMPATIBLE,
-            MARKET_REASON_MISSING_SHARED_LIBRARY,
-            MARKET_REASON_REPLACE_COULDNT_DELETE,
-            MARKET_REASON_PARSE_NOT_APK,
-            MARKET_REASON_PARSE_BAD_MANIFEST,
-            MARKET_REASON_PARSE_NO_CERTIFICATES,
-            MARKET_REASON_PARSE_INCONSISTENT_CERTIFICATES,
-            MARKET_REASON_PARSE_CERTIFICATE_ENCODING,
-            MARKET_REASON_PARSE_BAD_PACKAGE_NAME,
-            MARKET_REASON_PARSE_BAD_SHARED_USER_ID,
-            MARKET_REASON_PARSE_MANIFEST_MALFORMED,
-            MARKET_REASON_PARSE_MANIFEST_EMPTY,
-            MARKET_REASON_UNKNOWN,
-            MARKET_STALE_INSTALL_ATTEMPT,
             PHONE_CDMA_REGISTERED,
             PHONE_CDMA_DATA_ATTEMPTED,
             PHONE_CDMA_DATA_CONNECTED,