Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2009-08-21 10:19:09 -07:00
parent c813129fe7 34d7fd715f
commit 1afb1cd387
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -4013,7 +4013,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
* @param resultCode Result code, if any, from this Activity. * @param resultCode Result code, if any, from this Activity.
* @param resultData Result data (Intent), if any, from this Activity. * @param resultData Result data (Intent), if any, from this Activity.
* *
* @result Returns true if the activity successfully finished, or false if it is still running. * @return Returns true if the activity successfully finished, or false if it is still running.
*/ */
public final boolean finishActivity(IBinder token, int resultCode, Intent resultData) { public final boolean finishActivity(IBinder token, int resultCode, Intent resultData) {
// Refuse possible leaked file descriptors // Refuse possible leaked file descriptors

2
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -960,7 +960,7 @@ public class WifiManager {
* *
* If this MulticastLock is not reference-counted, the first call to * If this MulticastLock is not reference-counted, the first call to
* {@code release} (after the radio was multicast locked using * {@code release} (after the radio was multicast locked using
* {@linke #acquire}) will unlock the multicast, and subsequent calls * {@link #acquire}) will unlock the multicast, and subsequent calls
* will be ignored. * will be ignored.
* *
* Note that if any other Wifi Multicast Locks are still outstanding * Note that if any other Wifi Multicast Locks are still outstanding