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

am cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0

Browse Source 
* commit 'cc21cc017ba02338a78eca00af6a1a0d3f7ce5bf':
  Allow clearing out the source bounds
This commit is contained in:
Daniel Lehmann
2011-10-12 18:18:08 -07:00
committed by Android Git Automerger
parent b9ee8434e1 cc21cc017b
commit 5247fb38be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/Intent.java
View File

@@ -57,8 +57,8 @@ import java.util.Set;
* *
* <p>An Intent provides a facility for performing late runtime binding between the code in * <p>An Intent provides a facility for performing late runtime binding between the code in
* different applications. Its most significant use is in the launching of activities, where it * different applications. Its most significant use is in the launching of activities, where it
* can be thought of as the glue between activities. It is basically a passive data structure * can be thought of as the glue between activities. It is basically a passive data structure
* holding an abstract description of an action to be performed.</p> * holding an abstract description of an action to be performed.</p>
* *
* <div class="special reference"> * <div class="special reference">
* <h3>Developer Guides</h3> * <h3>Developer Guides</h3>
@@ -2566,7 +2566,7 @@ public class Intent implements Parcelable, Cloneable {
*/ */
public static final String EXTRA_LOCAL_ONLY = public static final String EXTRA_LOCAL_ONLY =
"android.intent.extra.LOCAL_ONLY"; "android.intent.extra.LOCAL_ONLY";
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Intent flags (see mFlags variable). // Intent flags (see mFlags variable).
@@ -5291,7 +5291,7 @@ public class Intent implements Parcelable, Cloneable {
if (r != null) { if (r != null) {
mSourceBounds = new Rect(r); mSourceBounds = new Rect(r);
} else { } else {
r = null; mSourceBounds = null;
} }
} }