Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d0ae39 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 532679a5 to master"

parents 7ef97435 e61cad32

core/java/android/app/ApplicationErrorReport.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/content/Intent.java

+1 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,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.

core/java/android/os/StrictMode.java

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,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";

core/java/android/provider/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -2644,10 +2644,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";

docs/html/design/building-blocks/progress.html

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ available space.</p> 
      <li class="value-1"><h4>Activity bar (shown with the Holo Dark theme)</h4>

        <p>



An indeterminate activity bar is used at the start of an application download because Market hasn't

An indeterminate activity bar is used at the start of an application download because Google Play hasn't

been able to contact the server yet, and it's not possible to determine how long it will take for

the download to begin.