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

Commit 70af3cdb authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "docs: resolve bugs from external tracker" into jb-mr1-dev

parents 13ef4e43 6aad9950

core/java/android/appwidget/AppWidgetManager.java

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class AppWidgetManager { 
    public static final String EXTRA_CUSTOM_SORT = "customSort";



    /**

     * A sentiel value that the AppWidget manager will never return as a appWidgetId.

     * A sentinel value that the AppWidget manager will never return as a appWidgetId.

     */

    public static final int INVALID_APPWIDGET_ID = 0;

core/java/android/os/FileObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.HashMap; 
 *

 * <p>Each FileObserver instance monitors a single file or directory.

 * If a directory is monitored, events will be triggered for all files and

 * subdirectories (recursively) inside the monitored directory.</p>

 * subdirectories inside the monitored directory.</p>

 *

 * <p>An event mask is used to specify which changes or actions to report.

 * Event type constants are used to describe the possible changes in the

core/java/android/webkit/package.html

+3 −3
Original line number Diff line number Diff line 
<html>

<body>

Provides tools for browsing the web.

<p>The only classes or interfaces in this package intended for use by SDK

developers are WebView, BroswerCallbackAdapter, BrowserCallback, and CookieManager.

<p>Provides tools for browsing the web.

<p>For more information about building apps with web-based content, see the

<a href="{@docRoot}guide/webapps/overview.html">Web Apps Overview</a>.

</body>

</html>
 
 No newline at end of file

docs/html/google/play/billing/billing_integrate.jd

+9 −8
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ public void onCreate(Bundle savedInstanceState) { 
<pre>

&#64;Override

public void onDestroy() {

    super.onDestroy();

    if (mServiceConn != null) {

        unbindService(mServiceConn);

    }

docs/html/guide/topics/connectivity/wifip2p.jd

+11 −11
Original line number Diff line number Diff line
@@ -237,16 +237,16 @@ page.title=Wi-Fi Direct 
 */

public class WiFiDirectBroadcastReceiver extends BroadcastReceiver {



    private WifiP2pManager manager;

    private Channel channel;

    private MyWiFiActivity activity;

    private WifiP2pManager mManager;

    private Channel mChannel;

    private MyWiFiActivity mActivity;



    public WiFiDirectBroadcastReceiver(WifiP2pManager manager, Channel channel,

            MyWifiActivity activity) {

        super();

        this.manager = manager;

        this.channel = channel;

        this.activity = activity;

        this.mManager = manager;

        this.mChannel = channel;

        this.mActivity = activity;

    }



    &#064;Override
@@ -333,7 +333,7 @@ protected void onCreate(Bundle savedInstanceState){ 
    ...

    mManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);

    mChannel = mManager.initialize(this, getMainLooper(), null);

    mReceiver = new WiFiDirectBroadcastReceiver(manager, channel, this);

    mReceiver = new WiFiDirectBroadcastReceiver(mManager, mChannel, this);

    ...

}

</pre>
@@ -397,7 +397,7 @@ protected void onPause() { 
  that the discovery process succeeded and does not provide any information about the actual peers

  that it discovered, if any:</p>

  <pre>

manager.discoverPeers(channel, new WifiP2pManager.ActionListener() {

mManager.discoverPeers(channel, new WifiP2pManager.ActionListener() {

    &#064;Override

    public void onSuccess() {

        ...
@@ -425,8 +425,8 @@ if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { 
    // request available peers from the wifi p2p manager. This is an

    // asynchronous call and the calling activity is notified with a

    // callback on PeerListListener.onPeersAvailable()

    if (manager != null) {

        manager.requestPeers(channel, myPeerListListener);

    if (mManager != null) {

        mManager.requestPeers(mChannel, myPeerListListener);

    }

}

</pre>
@@ -453,7 +453,7 @@ if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { 
WifiP2pDevice device;

WifiP2pConfig config = new WifiP2pConfig();

config.deviceAddress = device.deviceAddress;

manager.connect(channel, config, new ActionListener() {

mManager.connect(mChannel, config, new ActionListener() {



    &#064;Override

    public void onSuccess() {