diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2012-01-27 17:56:49 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2012-03-05 22:02:35 -0800 |
| commit | 4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219 (patch) | |
| tree | 30364eba130764c5ebc4d8bfa9878199d57acd32 /core/java | |
| parent | e606cb460272cd99bac05b4477a5e489827b368b (diff) | |
| download | frameworks_base-4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219.zip frameworks_base-4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219.tar.gz frameworks_base-4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219.tar.bz2 | |
Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ApplicationErrorReport.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 2 | ||||
| -rw-r--r-- | core/java/android/nfc/NdefRecord.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/StrictMode.java | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/app/ApplicationErrorReport.java b/core/java/android/app/ApplicationErrorReport.java index 588125d..ebf4261 100644 --- a/core/java/android/app/ApplicationErrorReport.java +++ b/core/java/android/app/ApplicationErrorReport.java @@ -98,7 +98,7 @@ public class ApplicationErrorReport implements Parcelable { /** * 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 @@ public class Intent implements Parcelable, Cloneable { /** * 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 @@ public final class NdefRecord implements Parcelable { * 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 @@ import java.util.concurrent.atomic.AtomicInteger; * 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 @@ public final class Settings { /** * 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"; |