am f012b777: Merge "Fix some doc issues." into klp-dev (8029493f) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -20,13 +20,10 @@ package android {
		field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";
		field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";
		field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
		field public static final java.lang.String BIND_CALL_SERVICE = "android.permission.BIND_CALL_SERVICE";
		field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
		field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
		field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
		field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
		field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
		field public static final java.lang.String BIND_PRINT_SPOOLER_SERVICE = "android.permission.BIND_PRINT_SPOOLER_SERVICE";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";
		@@ -79,7 +76,6 @@ package android {
		field public static final java.lang.String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
		field public static final java.lang.String MANAGE_ACCOUNTS = "android.permission.MANAGE_ACCOUNTS";
		field public static final java.lang.String MANAGE_APP_TOKENS = "android.permission.MANAGE_APP_TOKENS";
		field public static final java.lang.String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";
		field public static final java.lang.String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
		field public static final java.lang.String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
		field public static final java.lang.String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";

core/java/android/app/Activity.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -1455,12 +1455,14 @@ public class Activity extends ContextThemeWrapper
		}

		/**
		* Report to the system that your app is now fully drawn. This is only used
		* to help instrument app launch times, so that the app can report when it is
		* fully in a usable state; without this, all the system can determine is when
		* its window is first drawn and displayed. To participate in app launch time
		* Report to the system that your app is now fully drawn, purely for diagnostic
		* purposes (calling it does not impact the visible behavior of the activity).
		* This is only used to help instrument application launch times, so that the
		* app can report when it is fully in a usable state; without this, the only thing
		* the system itself can determine is the point at which the activity's window
		* is <em>first</em> drawn and displayed. To participate in app launch time
		* measurement, you should always call this method after first launch (when
		* {@link #onCreate(android.os.Bundle)} is called) at the point where you have
		* {@link #onCreate(android.os.Bundle)} is called), at the point where you have
		* entirely drawn your UI and populated with all of the significant data. You
		* can safely call this method any time after first launch as well, in which case
		* it will simply be ignored.

core/java/android/app/ActivityManager.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -1463,7 +1463,10 @@ public class ActivityManager {

		/**
		* Permits an application to erase its own data from disk. This is equivalent to
		* the user choosing to clear the app's data from within the device settings UI.
		* the user choosing to clear the app's data from within the device settings UI. It
		* erases all dynamic data associated with the app -- its private data and data in its
		* private area on external storage -- but does not remove the installed application
		* itself, nor any OBB files.
		*
		* @return {@code true} if the application successfully requested that the application's
		* data be erased; {@code false} otherwise.
		@@ -2253,7 +2256,9 @@ public class ActivityManager {
		* not be done on a UI thread. The data will be written to the given file
		* descriptor as text. An application must hold the
		* {@link android.Manifest.permission#DUMP} permission to make this call.
		* @param fd The file descriptor that the dump should be written to.
		* @param fd The file descriptor that the dump should be written to. The file
		* descriptor is <em>not</em> closed by this function; the caller continues to
		* own it.
		* @param packageName The name of the package that is to be dumped.
		*/
		public void dumpPackageState(FileDescriptor fd, String packageName) {

core/java/android/content/IntentFilter.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -722,6 +722,14 @@ public class IntentFilter implements Parcelable {
		* included in the filter, then an Intent's data must match one of
		* them. If no scheme specific parts are included, then only the scheme must match.
		*
		* <p>The "scheme specific part" that this matches against is the string returned
		* by {@link android.net.Uri#getSchemeSpecificPart() Uri.getSchemeSpecificPart}.
		* For Uris that contain a path, this kind of matching is not generally of interest,
		* since {@link #addDataAuthority(String, String)} and
		* {@link #addDataPath(String, int)} can provide a better mechanism for matching
		* them. However, for Uris that do not contain a path, the authority and path
		* are empty, so this is the only way to match against the non-scheme part.</p>
		*
		* @param ssp Either a raw string that must exactly match the scheme specific part
		* path, or a simple pattern, depending on <var>type</var>.
		* @param type Determines how <var>ssp</var> will be compared to

core/res/AndroidManifest.xml

+10 −5

Original line number	Diff line number	Diff line
		@@ -773,7 +773,8 @@
		android:description="@string/permdesc_bluetoothAdmin"
		android:label="@string/permlab_bluetoothAdmin" />

		<!-- Allows applications to pair bluetooth devices without user interaction -->
		<!-- Allows applications to pair bluetooth devices without user interaction.
		This is not available to third party applications. -->
		<permission android:name="android.permission.BLUETOOTH_PRIVILEGED"
		android:permissionGroup="android.permission-group.BLUETOOTH_NETWORK"
		android:protectionLevel="system\|signature"
		@@ -1110,7 +1111,8 @@
		android:description="@string/permdesc_use_sip"
		android:label="@string/permlab_use_sip" />

		<!-- Allows an application to request CallHandlerService implementations. -->
		<!-- Allows an application to request CallHandlerService implementations.
		@hide -->
		<permission android:name="android.permission.BIND_CALL_SERVICE"
		android:permissionGroup="android.permission-group.PHONE_CALLS"
		android:protectionLevel="system\|signature"
		@@ -1956,13 +1958,15 @@

		<!-- Must be required by a {@link android.nfc.cardemulation.HostApduService}
		or {@link android.nfc.cardemulation.OffHostApduService} to ensure that only
		the system can bind to it. -->
		the system can bind to it.
		@hide -->
		<permission android:name="android.permission.BIND_NFC_SERVICE"
		android:label="@string/permlab_bindNfcService"
		android:description="@string/permdesc_bindNfcService"
		android:protectionLevel="signature" />

		<!-- Must be required by the PrintSpooler to ensure that only the system can bind to it. -->
		<!-- Must be required by the PrintSpooler to ensure that only the system can bind to it.
		@hide -->
		<permission android:name="android.permission.BIND_PRINT_SPOOLER_SERVICE"
		android:label="@string/permlab_bindPrintSpoolerService"
		android:description="@string/permdesc_bindPrintSpoolerService"
		@@ -1997,7 +2001,8 @@
		android:protectionLevel="signature" />

		<!-- Required to add or remove another application as a device admin.
		<p/>Not for use by third-party applications. -->
		<p>Not for use by third-party applications.
		@hide -->
		<permission android:name="android.permission.MANAGE_DEVICE_ADMINS"
		android:label="@string/permlab_manageDeviceAdmins"
		android:description="@string/permdesc_manageDeviceAdmins"