Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java
index 588125d..ebf42619 100644
--- a/core/java/android/app/ApplicationErrorReport.java
+++ b/core/java/android/app/ApplicationErrorReport.java
@@ -98,7 +98,7 @@
/**
* Package name of the application which installed the application this
* report pertains to.
- * This identifies which Market the application came from.
+ * This identifies which market the application came from.
*/
public String installerPackageName;
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index e3b1f54..34966bb 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1136,7 +1136,7 @@
/**
* Activity Action: The user pressed the "Report" button in the crash/ANR dialog.
* This intent is delivered to the package which installed the application, usually
- * the Market.
+ * Google Play.
* <p>Input: No data is specified. The bug report is passed in using
* an {@link #EXTRA_BUG_REPORT} field.
* <p>Output: Nothing.
diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
index 26571ff..0f1f060 100644
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -364,7 +364,7 @@
* Ice Cream Sandwich.
* <p>
* If none of the applications are installed on the device,
- * a Market link will be opened to the first application.
+ * a Google Play link to the first application will be opened.
* <p>
* Note that Android application records do not overrule
* applications that have called
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java
index 99f58a0..43a4a6c 100644
--- a/core/java/android/os/StrictMode.java
+++ b/core/java/android/os/StrictMode.java
@@ -106,7 +106,7 @@
* effort mechanism. Notably, disk or network access from JNI calls
* won't necessarily trigger it. Future versions of Android may catch
* more (or fewer) operations, so you should never leave StrictMode
- * enabled in shipping applications on the Android Market.
+ * enabled in applications distributed on Google Play.
*/
public final class StrictMode {
private static final String TAG = "StrictMode";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1243251..d7fab37 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2593,10 +2593,10 @@
/**
* Whether the package installer should allow installation of apps downloaded from
- * sources other than the Android Market (vending machine).
+ * sources other than Google Play.
*
* 1 = allow installing from other sources
- * 0 = only allow installing from the Android Market
+ * 0 = only allow installing from Google Play
*/
public static final String INSTALL_NON_MARKET_APPS = "install_non_market_apps";