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

Merge "docs: fixing several minor documentation bugs" into pi-dev

Browse Source 
am: 82b0d17b39

Change-Id: Ieb1447c0d7cda629338de8d6e03f46670d8ed0b0
This commit is contained in:
kopriva
2018-09-20 16:55:47 -07:00
committed by android-build-merger
parent fc5c86fda8 82b0d17b39
commit f6b27fbff0
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/DatePickerDialog.java
View File

@@ -239,7 +239,7 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
* @param year the selected year
* @param month the selected month (0-11 for compatibility with
* {@link Calendar#MONTH})
* @param dayOfMonth th selected day of the month (1-31, depending on
* @param dayOfMonth the selected day of the month (1-31, depending on
* month)
*/
void onDateSet(DatePicker view, int year, int month, int dayOfMonth);

4
core/java/android/content/res/package.html
View File

@@ -1,7 +1,7 @@
<HTML>
<BODY>
<p>Contains classes for accessing application resources,
such as raw asset files, colors, drawables, media or other other files
such as raw asset files, colors, drawables, media, or other files
in the package, plus important device configuration details
(orientation, input types, etc.) that affect how the application may behave.</p>
@@ -9,4 +9,4 @@ in the package, plus important device configuration details
href="{@docRoot}guide/topics/resources/index.html">Application Resources</a> guide.</p>
{@more}
</BODY>
</HTML>
</HTML>

2
core/java/android/hardware/camera2/utils/CloseableLock.java
View File

@@ -290,7 +290,7 @@ public class CloseableLock implements AutoCloseable {
/**
* Release a single lock that was acquired.
*
* <p>Any other other that is blocked and trying to acquire a lock will get a chance
* <p>Any other thread that is blocked and trying to acquire a lock will get a chance
* to acquire the lock.</p>
*
* @throws IllegalStateException if no locks were acquired, or if the lock was already closed

4
core/java/android/view/animation/DecelerateInterpolator.java
View File

@@ -41,8 +41,8 @@ public class DecelerateInterpolator extends BaseInterpolator implements NativeIn
* Constructor
*
* @param factor Degree to which the animation should be eased. Setting factor to 1.0f produces
* an upside-down y=x^2 parabola. Increasing factor above 1.0f makes exaggerates the
* ease-out effect (i.e., it starts even faster and ends evens slower)
* an upside-down y=x^2 parabola. Increasing factor above 1.0f exaggerates the
* ease-out effect (i.e., it starts even faster and ends evens slower).
*/
public DecelerateInterpolator(float factor) {
mFactor = factor;

2
location/java/android/location/Address.java
View File

@@ -363,7 +363,7 @@ public class Address implements Parcelable {
* or null if it is unknown.
*
* @throws IllegalStateException if this Address has not been assigned
* a latitude.
* a phone number.
*/
public String getPhone() {
return mPhone;

2
telephony/java/android/telephony/SmsMessage.java
View File

@@ -603,7 +603,7 @@ public class SmsMessage {
/**
* Returns the message body as a String, if it exists and is text based.
* @return message body is there is one, otherwise null
* @return message body if there is one, otherwise null
*/
public String getMessageBody() {
return mWrappedSmsMessage.getMessageBody();