Merge "Fix @links in reference docs." into nyc-mr1-dev (3366d4be) · Commits · e / os / android_frameworks_base

cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -808,7 +808,7 @@ public class UiObject {
		*
		* @return Rect
		* @throws UiObjectNotFoundException
		* @see {@link #getBounds()}
		* @see #getBounds()
		* @since API Level 17
		*/
		public Rect getVisibleBounds() throws UiObjectNotFoundException {

cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ public class UiAutomationShellWrapper {
		* actions such as dialing 911 or posting messages to public forums, etc.
		*
		* @param isSet True to set as monkey test. False to set as regular functional test (default).
		* @see {@link ActivityManager#isUserAMonkey()}
		* @see ActivityManager#isUserAMonkey()
		*/
		public void setRunAsMonkey(boolean isSet) {
		IActivityManager am = ActivityManagerNative.getDefault();

core/java/android/accounts/AbstractAccountAuthenticator.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -707,7 +707,7 @@ public abstract class AbstractAccountAuthenticator {
		* @param account the account to clone, will never be null
		* @return a Bundle result or null if the result is to be returned via the response.
		* @throws NetworkErrorException
		* @see {@link #addAccountFromCredentials(AccountAuthenticatorResponse, Account, Bundle)}
		* @see #addAccountFromCredentials(AccountAuthenticatorResponse, Account, Bundle)
		*/
		public Bundle getAccountCredentialsForCloning(final AccountAuthenticatorResponse response,
		final Account account) throws NetworkErrorException {
		@@ -732,7 +732,7 @@ public abstract class AbstractAccountAuthenticator {
		* provided by {@link #getAccountCredentialsForCloning(AccountAuthenticatorResponse, Account)}.
		* @return a Bundle result or null if the result is to be returned via the response.
		* @throws NetworkErrorException
		* @see {@link #getAccountCredentialsForCloning(AccountAuthenticatorResponse, Account)}
		* @see #getAccountCredentialsForCloning(AccountAuthenticatorResponse, Account)
		*/
		public Bundle addAccountFromCredentials(final AccountAuthenticatorResponse response,
		Account account,

core/java/android/app/Activity.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -4210,7 +4210,7 @@ public class Activity extends ContextThemeWrapper
		* @param requestCode If >= 0, this code will be returned in
		* onActivityResult() when the activity exits.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @throws android.content.ActivityNotFoundException
		@@ -4419,7 +4419,7 @@ public class Activity extends ContextThemeWrapper
		* <var>flagsMask</var>
		* @param extraFlags Always set to 0.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details. If options
		* have also been supplied by the IntentSender, options given here will
		* override any that conflict with those given by the IntentSender.
		@@ -4504,7 +4504,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @param intent The intent to start.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @throws android.content.ActivityNotFoundException
		@@ -4553,7 +4553,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @param intents The intents to start.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @throws android.content.ActivityNotFoundException
		@@ -4602,7 +4602,7 @@ public class Activity extends ContextThemeWrapper
		* <var>flagsMask</var>
		* @param extraFlags Always set to 0.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details. If options
		* have also been supplied by the IntentSender, options given here will
		* override any that conflict with those given by the IntentSender.
		@@ -4662,7 +4662,7 @@ public class Activity extends ContextThemeWrapper
		* onActivityResult() when the activity exits, as described in
		* {@link #startActivityForResult}.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @return If a new activity was launched then true is returned; otherwise
		@@ -4739,7 +4739,7 @@ public class Activity extends ContextThemeWrapper
		* your own activity; the only changes you can make are to the extras
		* inside of it.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @return Returns a boolean indicating whether there was another Activity
		@@ -4794,7 +4794,7 @@ public class Activity extends ContextThemeWrapper
		* @param intent The intent to start.
		* @param requestCode Reply request code. < 0 if reply is not requested.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @throws android.content.ActivityNotFoundException
		@@ -4847,7 +4847,7 @@ public class Activity extends ContextThemeWrapper
		* @param intent The intent to start.
		* @param requestCode Reply request code. < 0 if reply is not requested.
		* @param options Additional options for how the Activity should be started.
		* See {@link android.content.Context#startActivity(Intent, Bundle)
		* See {@link android.content.Context#startActivity(Intent, Bundle)}
		* Context.startActivity(Intent, Bundle)} for more details.
		*
		* @throws android.content.ActivityNotFoundException

core/java/android/app/ActivityManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2175,13 +2175,13 @@ public class ActivityManager {
		public static final int FLAG_FOREGROUND = 1<<1;

		/**
		* Bit for {@link #flags): set if the service is running in a
		* Bit for {@link #flags}: set if the service is running in a
		* core system process.
		*/
		public static final int FLAG_SYSTEM_PROCESS = 1<<2;

		/**
		* Bit for {@link #flags): set if the service is running in a
		* Bit for {@link #flags}: set if the service is running in a
		* persistent process.
		*/
		public static final int FLAG_PERSISTENT_PROCESS = 1<<3;