Merge "docs: API diff report 22 to 23" into mnc-dev
diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java
index 0cafff8..c934e8d 100644
--- a/core/java/android/content/ClipData.java
+++ b/core/java/android/content/ClipData.java
@@ -609,6 +609,23 @@
b.append("NULL");
}
}
+
+ /** @hide */
+ public void toShortSummaryString(StringBuilder b) {
+ if (mHtmlText != null) {
+ b.append("HTML");
+ } else if (mText != null) {
+ b.append("TEXT");
+ } else if (mUri != null) {
+ b.append("U:");
+ b.append(mUri);
+ } else if (mIntent != null) {
+ b.append("I:");
+ mIntent.toShortString(b, true, true, true, true);
+ } else {
+ b.append("NULL");
+ }
+ }
}
/**
@@ -884,6 +901,19 @@
}
}
+ /** @hide */
+ public void toShortStringShortItems(StringBuilder b, boolean first) {
+ if (mItems.size() > 0) {
+ if (!first) {
+ b.append(' ');
+ }
+ mItems.get(0).toShortString(b);
+ if (mItems.size() > 1) {
+ b.append(" ...");
+ }
+ }
+ }
+
@Override
public int describeContents() {
return 0;
diff --git a/core/java/android/content/ClipDescription.java b/core/java/android/content/ClipDescription.java
index be35f08..e988516 100644
--- a/core/java/android/content/ClipDescription.java
+++ b/core/java/android/content/ClipDescription.java
@@ -201,14 +201,7 @@
/** @hide */
public boolean toShortString(StringBuilder b) {
- boolean first = true;
- for (int i=0; i<mMimeTypes.length; i++) {
- if (!first) {
- b.append(' ');
- }
- first = false;
- b.append(mMimeTypes[i]);
- }
+ boolean first = !toShortStringTypesOnly(b);
if (mLabel != null) {
if (!first) {
b.append(' ');
@@ -221,6 +214,19 @@
return !first;
}
+ /** @hide */
+ public boolean toShortStringTypesOnly(StringBuilder b) {
+ boolean first = true;
+ for (int i=0; i<mMimeTypes.length; i++) {
+ if (!first) {
+ b.append(' ');
+ }
+ first = false;
+ b.append(mMimeTypes[i]);
+ }
+ return !first;
+ }
+
@Override
public int describeContents() {
return 0;
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index ec443cd..87d52e4 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -7533,14 +7533,19 @@
if (!first) {
b.append(' ');
}
- first = false;
+ b.append("clip={");
if (clip) {
- b.append("clip={");
mClipData.toShortString(b);
- b.append('}');
} else {
- b.append("(has clip)");
+ if (mClipData.getDescription() != null) {
+ first = !mClipData.getDescription().toShortStringTypesOnly(b);
+ } else {
+ first = true;
+ }
+ mClipData.toShortStringShortItems(b, first);
}
+ first = false;
+ b.append('}');
}
if (extras && mExtras != null) {
if (!first) {
diff --git a/docs/html/preview/features/power-mgmt.jd b/docs/html/preview/features/power-mgmt.jd
new file mode 100644
index 0000000..da66181
--- /dev/null
+++ b/docs/html/preview/features/power-mgmt.jd
@@ -0,0 +1,121 @@
+page.title=Power-Saving Optimizations
+page.keywords=preview,sdk,compatibility
+sdk.platform.apiLevel=MNC
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+
+<ol class="hide-nested">
+ <li><a href="#behavior-doze">Doze</a></li>
+ <li><a href="#behavior-app-standby">App Standby</a></li>
+</ol>
+
+<h2>API Differences</h2>
+<ol>
+<li><a href="{@docRoot}preview/download.html">API level 22 to M Preview »</a> </li>
+</ol>
+
+
+<h2>See Also</h2>
+<ol>
+<li><a href="{@docRoot}preview/api-overview.html">M Developer Preview API Overview</a> </li>
+</ol>
+
+</div>
+</div>
+
+<p>Android M Preview helps prolong battery life by introducing new power-saving optimizations:
+<em>Doze</em> mode improves the sleep efficiency of idle devices. <em>App Standby</em> prevents apps
+from eating up power while idle.</p>
+
+<h2 id="behavior-doze">Doze</h2>
+<p>If a user leaves a device unplugged and stationary for a period of time, with the screen off,
+the device enters Doze mode. Doze attempts to keep the system in a sleep state as long as the
+device remains undisturbed. In this mode, devices periodically resume normal operations for brief periods of time so that the system can perform app syncing and any other pending operations.</p>
+
+<p>The following restrictions apply to your apps while in Doze:</p>
+<ul>
+<li>Network access is disabled, unless your app receives a high-priority
+<a href="https://developers.google.com/cloud-messaging/" class="external-link">
+Google Cloud Messaging</a> tickle.</li>
+<li>The system ignores <a href="{@docRoot}reference/android/os/PowerManager.WakeLock.html">
+Wake locks</a>.</li>
+<li>Alarms scheduled using the {@link android.app.AlarmManager} class are deferred, unless you have
+exempted them using the
+{@link android.app.AlarmManager#setAndAllowWhileIdle setAndAllowWhileIdle()} method.</li>
+<li>The system does not perform Wi-Fi scans.</li>
+<li>The system does not permit syncs or jobs for your sync adapters.</li>
+<li>The system does not allow {@link android.app.job.JobScheduler} to run.</li>
+</ul>
+</p>
+<p>When the device exits Doze mode, it executes any jobs and syncs that are pending.</p>
+
+<h3>Testing apps with Doze</h3>
+
+<p>You can test Doze mode by connecting your development host to a device running the M Preview,
+and calling the following commands:
+</p>
+<pre class="no-prettyprint">
+$ adb shell dumpsys battery unplug
+$ adb shell dumpsys deviceidle step
+$ adb shell dumpsys deviceidle -h
+</pre>
+<p class="note"><strong>Note</strong>: As of M Preview 3 release,
+<a href="https://developers.google.com/cloud-messaging/" class="external-link">
+Google Cloud Messaging</a> (GCM) lets you designate
+<a href="https://developers.google.com/cloud-messaging/downstream#setting-the-priority-of-a-message">
+high-priority messages</a>. If your app receives a high-priority GCM message</a>, the system grants
+brief network access even when the device is dozing.
+</p>
+
+<p>See the
+<a href="{@docRoot}preview/testing/guide.html#doze-standby">Testing Guide</a> for tips on how
+to test Doze in your apps. </p>
+
+<h2 id="behavior-app-standby">App Standby</h2>
+<p>App Standby allows the system to determine that an app is idle when the user is not actively
+using it. The system makes this determination when the user does not touch the app for a certain
+period of time, and none of the following conditions applies:</p>
+
+<ul>
+<li>The user explicitly launches the app.</li>
+<li>The app has a process currently in the foreground (either as an activity or foreground service,
+or in use by another activity or foreground service).</li>
+<li>The app generates a notification that users see on the lock screen or in the
+notification tray.</li>
+<li>The user explicitly asks for the app to be exempt from optimizations,
+via the Settings app.</li>
+</ul>
+
+<p>When the user plugs the device into a power supply, the system releases apps from the standby
+state, allowing them to freely access the network and to execute any pending jobs and syncs. If the
+device is idle for long periods of time, the system allows idle apps network access around once a
+day.</p>
+
+<h3>Testing apps with App Standby</h3>
+<p>You can test App Standby by connecting your development host to a device running the M Preview,
+and calling the following commands:
+</p>
+<pre class="no-prettyprint">
+$ adb shell dumpsys battery unplug
+$ adb shell am set-idle <packageName> true
+$ adb shell am set-idle <packageName> false
+$ adb shell am get-idle <packageName>
+</pre>
+
+<p class="note"><strong>Note</strong>:
+As of M Preview 3 release,
+<a href="https://developers.google.com/cloud-messaging/" class="external-link">
+Google Cloud Messaging</a> (GCM) lets you
+designate
+<a href="https://developers.google.com/cloud-messaging/downstream#setting-the-priority-of-a-message">
+high-priority messages</a>. If your app receives high-priority GCM messages, the system grants
+brief network access even when the app is idle.
+</p>
+
+<p>See the
+<a href="{@docRoot}preview/testing/guide.html#doze-standby">Testing Guide</a> for tips on how
+to test App Standby in your apps. </p>
diff --git a/docs/html/preview/features/runtime-permissions.jd b/docs/html/preview/features/runtime-permissions.jd
index 765a3d5..8ab7619 100644
--- a/docs/html/preview/features/runtime-permissions.jd
+++ b/docs/html/preview/features/runtime-permissions.jd
@@ -180,12 +180,13 @@
<h3 id="perm-groups">Permission groups</h3>
<p>
- Related permissions are divided into <em>permission groups</em> to
- allow users to grant related permissions to an app in a single action.
- The user only has to grant permission once per app for each permission group.
- If the app subsequently requests a permission from the same permission
- group, the system automatically grants the permission without any action from
- the user. The system calls your app's <code>onRequestPermissionsResult()</code>
+ Related permissions are divided into <em>permission groups</em> to allow
+ users to grant related permissions to an app in a single action. The user
+ only has to grant permission once per app for each permission group. If the
+ app subsequently requests a permission from the same permission group, the
+ system automatically grants the permission without any action from the user.
+ The system calls your app's {@link
+ android.app.Activity#onRequestPermissionsResult onRequestPermissionsResult()}
method just as if the user had granted permission through the dialog box.
</p>
@@ -376,7 +377,8 @@
<p>
If the app is running on a device with the M Developer Preview,
<code><uses-permission-sdk-m></code> behaves the same as
- <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
+ <code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"
+ ><uses-permission></a></code>.
The system does not prompt the user to grant any permissions when they install
the app, and the app requests permissions as they are needed.
</p>
@@ -411,17 +413,26 @@
{@link android.os.Build.VERSION#CODENAME CODENAME} is <code>"MNC"</code>.
</p>
+<p>
+ Alternatively, you can use the new methods introduced with revision 23 of the
+ v4 and v13 support libraries. The support library methods behave
+ appropriately whether or not the app is running on the M Developer Preview.
+ For more information, see <a href="#support-lib">Support library methods for
+ handling permissions</a>.
+</p>
+
<h4 id="check-for-permission">Check if the app has the needed permission</h4>
-<p>When the user tries to do something that requires a permission, the app
+<p>
+ When the user tries to do something that requires a permission, the app
checks to see if it currently has permission to perform this operation. To do
- this, the app calls
- <code>Context.checkSelfPermission(<i>permission_name</i>)</code>. The app
- should perform this check even if it knows the user has already granted that
- permission,
- since the user can revoke an app's permissions at any time. For example, if a
- user wants to use an app to take a picture, the app calls
- <code>Context.checkSelfPermission(Manifest.permission.CAMERA)</code>.</p>
+ this, the app calls {@link android.content.Context#checkSelfPermission
+ checkSelfPermission()}. The app should perform this check even if it knows
+ the user has already granted that permission, since the user can revoke an
+ app's permissions at any time. For example, if a user wants to use an app to
+ take a picture, the app calls
+ <code>Context.checkSelfPermission(Manifest.permission.CAMERA)</code>.
+</p>
<p class="table-caption" id="permission-groups">
<strong>Table 1.</strong> Permissions and permission groups.</p>
@@ -469,10 +480,7 @@
<code>android.permission.WRITE_CONTACTS</code>
</li>
<li>
- <code>android.permission.READ_PROFILE</code>
- </li>
- <li>
- <code>android.permission.WRITE_PROFILE</code>
+ <code>android.permission.GET_ACCOUNTS</code>
</li>
</ul>
</td>
@@ -540,11 +548,6 @@
<code>android.permission.BODY_SENSORS</code>
</li>
</ul>
- <ul>
- <li>
- <code>android.permission.USE_FINGERPRINT</code>
- </li>
- </ul>
</td>
</tr>
@@ -605,33 +608,33 @@
<p>
To help find the situations where you need to provide extra explanation, the
- system provides the
- <code>Activity.shouldShowRequestPermissionRationale(String)</code>
- method. This
- method returns <code>true</code> if the app has requested this permission
- previously and the user denied the request.
- That indicates that you should probably explain to the
- user why you need the permission.
+ system provides the {@link
+ android.app.Activity#shouldShowRequestPermissionRationale
+ shouldShowRequestPermissionRationale()} method. This method returns
+ <code>true</code> if the app has requested this permission previously and the
+ user denied the request. That indicates that you should probably explain to
+ the user why you need the permission.
</p>
<p>
- If the user turned down the permission request in the
- past and chose the <em>Don't ask again</em> option in the permission request system
- dialog, this method returns <code>false</code>. The method also returns
- <code>false</code> if the device policy prohibits the app from having that
- permission.
+ If the user turned down the permission request in the past and chose the
+ <em>Don't ask again</em> option in the permission request system dialog, this
+ method returns <code>false</code>. The method also returns <code>false</code>
+ if the device policy prohibits the app from having that permission.
</p>
+
+
<h4 id="request-permissions">Request permissions if necessary</h4>
<p>If the app doesn't already have the permission it needs, the app calls the
- <code>Activity.requestPermissions(String[], int)</code> method to
+ {@link android.app.Activity#requestPermissions requestPermissions()} method to
request the appropriate permission or permissions. The app passes the
permission or permissions it wants, and also an integer "request code".
This method functions asynchronously: it returns right away, and after
the user responds to the dialog box, the system calls the app's callback
method with the results, passing the same "request code" that the app passed
- to <code>requestPermissions()</code>.</p>
+ to {@link android.app.Activity#requestPermissions requestPermissions()}.</p>
<p>The following code code checks if the app has permission to read the
user's contacts, and requests the permission if necessary:</p>
@@ -656,17 +659,27 @@
}
</pre>
+<p class="note">
+ <strong>Note:</strong> When your app calls the framework's {@link
+ android.app.Activity#requestPermissions requestPermissions()} method, the
+ system shows a standard dialog box to the user. Your app <em>cannot</em>
+ configure or alter that dialog box. If you need to provide any information or
+ explanation to the user, you should do that <em>before</em> you call {@link
+ android.app.Activity#requestPermissions requestPermissions()}, as described
+ in <a href="#explain-need">Explain why the app needs permissions</a>.
+</p>
+
<h4 id="handle-response">Handle the permissions request response</h4>
<p>
When an app requests permissions, the system presents a dialog box to the
- user. When the user responds, the system invokes your app's
- <code>Activity.onRequestPermissionsResult(int, String[], int[])</code>
- passing it the user response. Your app needs to override that method. The
- callback is passed the same request code you passed to
- <code>requestPermissions()</code>. For example, if an app requests
- <code>READ_CONTACTS</code> access it might have the following callback
- method:
+ user. When the user responds, the system invokes your app's {@link
+ android.app.Activity#onRequestPermissionsResult} passing it the user
+ response. Your app needs to override that method. The callback is passed the
+ same request code you passed to {@link
+ android.app.Activity#requestPermissions requestPermissions()}. For example,
+ if an app requests <code>READ_CONTACTS</code> access it might have the
+ following callback method:
</p>
<pre>
@@ -703,11 +716,13 @@
<p>
When the system asks the user to grant a permission, the user has the option
of telling the system not to ask for that permission again. In that case,
- when an app uses <code>requestPermissions()</code> to ask for that permission,
- the system immediately denies the request. In this case, the system calls
- your <code>onRequestPermissionsResult()</code> the same way it would if the
- user had explicitly rejected your request again. For this reason, your app
- cannot assume that any direct interaction with the user has taken place.
+ when an app uses {@link android.app.Activity#requestPermissions
+ requestPermissions()} to ask for that permission, the system immediately
+ denies the request. In this case, the system calls your {@link
+ android.app.Activity#onRequestPermissionsResult onRequestPermissionsResult()}
+ the same way it would if the user had explicitly rejected your request again.
+ For this reason, your app cannot assume that any direct interaction with the
+ user has taken place.
</p>
<h2 id="testing">Testing Runtime Permissions</h2>
@@ -847,11 +862,12 @@
</h3>
<p>
- The permissions dialog shown by the system when you call
- <code>requestPermissions()</code> says what permission your app wants, but
- doesn't say why. In some cases, the user may find that puzzling.
- It's a good idea to explain to the user why your app wants the permissions
- before calling <code>requestPermissions()</code>.
+ The permissions dialog shown by the system when you call {@link
+ android.app.Activity#requestPermissions requestPermissions()} says what
+ permission your app wants, but doesn't say why. In some cases, the user may
+ find that puzzling. It's a good idea to explain to the user why your app
+ wants the permissions before calling {@link
+ android.app.Activity#requestPermissions requestPermissions()}.
</p>
<p>
@@ -860,7 +876,7 @@
contain location information, and would be puzzled why their photography app
wanted to know the location. So in this case, it's a good idea for the app to
tell the user about this feature <em>before</em> calling
- <code>requestPermissions()</code>.
+ {@link android.app.Activity#requestPermissions requestPermissions()}.
</p>
<p>
@@ -869,13 +885,124 @@
can explain what permissions are needed. For example, the photography app's
tutorial can demonstrate its "share photos with your contacts" feature, then
tell the user that they need to give permission for the app to see the user's
- contacts. The app can then call <code>requestPermissions()</code> to ask the
- user for that access. Of course, not every user is going to follow the
- tutorial, so you still need to check for and request permissions during the
- app's normal operation.
+ contacts. The app can then call {@link
+ android.app.Activity#requestPermissions requestPermissions()} to ask the user
+ for that access. Of course, not every user is going to follow the tutorial,
+ so you still need to check for and request permissions during the app's
+ normal operation.
</p>
-<h3 id="normal">Normal Permissions</h3>
+<h3 id="support-lib">Support library methods for handling permissions</h3>
+
+<p>
+ Revision 23 of the v4 and v13 support libraries provide several new methods
+ for managing permissions. The support library methods work properly on any
+ device that can use those libraries. Thus, if you use the support library
+ methods, you do not need to check whether your app is running on a device
+ with the M Developer Preview. If an app is installed on a device running the
+ M Preview, the support library methods behave the same as their framework
+ equivalents. If the device is running an earlier version of Android, the
+ methods behave appropriately, as described below.
+</p>
+
+<p>
+ The v4 support library provides the following permissions methods:
+</p>
+
+<dl>
+ <dt>
+ {@link android.support.v4.content.ContextCompat#checkSelfPermission
+ ContextCompat.checkSelfPermission()}
+ </dt>
+
+ <dd>
+ Returns <code>true</code> if the app has the specified permission, whether
+ or not the device is using the M Preview.
+ </dd>
+
+ <dt>
+ {@link android.support.v4.app.ActivityCompat#requestPermissions
+ ActivityCompat.requestPermissions()}
+ </dt>
+
+ <dd>
+ If the device is not running the M Preview, invokes the callback
+ method in {@link
+ android.support.v4.app.ActivityCompat.OnRequestPermissionsResultCallback}.
+ Passes {@link android.content.pm.PackageManager#PERMISSION_GRANTED
+ PERMISSION_GRANTED} if the app already has the specified permission, or
+ {@link android.content.pm.PackageManager#PERMISSION_DENIED
+ PERMISSION_DENIED} if it does not.
+ </dd>
+
+ <dt>
+ {@link
+ android.support.v4.app.ActivityCompat#shouldShowRequestPermissionRationale
+ ActivityCompat.shouldShowRequestPermissionRationale()}
+ </dt>
+
+ <dd>
+ If the device is not running the M Preview, always returns
+ <code>false</code>.
+ </dd>
+</dl>
+
+<p>
+ The v4 support library also contains the
+ {@link android.support.v4.content.PermissionChecker}
+ class, which provides several static utility methods for apps that use IPC to
+ provide services for other apps. For example,
+ {@link android.support.v4.content.PermissionChecker#checkCallingPermission
+ PermissionChecker.checkCallingPermission()}
+ checks whether an IPC
+ made by a particular package has a specified permission.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> If your app acts on behalf of third-party apps to call
+ platform methods that require runtime permissions on behalf of a third-party
+ app, you should use the appropriate {@link
+ android.support.v4.content.PermissionChecker} methods to ensure that the
+ other app is allowed to perform the operation. The platform has a
+ compatibility mode that allows users to revoke a legacy app's access to
+ permission-protected methods. If the user revokes access in compatibility
+ mode the app's permissions are not actually revoked; instead, access to the
+ APIs is restricted. The {@link android.support.v4.content.PermissionChecker}
+ methods verify app permissions in both normal and legacy modes.
+</p>
+
+<p>
+ The v13 support library provides the following permissions methods:
+</p>
+
+<dl>
+ <dt>
+ {@link android.support.v13.app.FragmentCompat#requestPermissions
+ FragmentCompat.requestPermissions()}
+ </dt>
+
+ <dd>
+ If the device is not running the M Preview, invokes the callback
+ method in <code>FragmentCompat.OnRequestPermissionsResultCallback</code>.
+ Passes {@link android.content.pm.PackageManager#PERMISSION_GRANTED
+ PERMISSION_GRANTED} if the app already has the specified permission, or
+ {@link android.content.pm.PackageManager#PERMISSION_DENIED
+ PERMISSION_DENIED} if it does not.
+ </dd>
+
+ <dt>
+ {@link
+ android.support.v13.app.FragmentCompat#shouldShowRequestPermissionRationale
+ FragmentCompat.shouldShowRequestPermissionRationale()}
+ </dt>
+
+ <dd>
+ If the device is not running the M Preview, always returns
+ <code>false</code>.
+ </dd>
+</dl>
+
+<h3 id="normal">Normal permissions</h3>
<p>
Many permissions are designated as {@link
@@ -898,11 +1025,12 @@
</p>
<p>
- If your app declares that it needs normal permissions, the app does not need to
- call <code>Activity.checkSelfPermission()</code> or
- <code>Activity.requestPermissions()</code> for
- those permissions. Since you declared the permissions in the manifest, you
- can be sure your app was granted those permissions at install time.
+ If your app declares that it needs normal permissions, the app does not need
+ to call {@link android.content.Context#checkSelfPermission
+ checkSelfPermission()} or {@link android.app.Activity#requestPermissions
+ requestPermissions()} for those permissions. Since you declared the
+ permissions in the manifest, you can be sure your app was granted those
+ permissions at install time.
</p>
<p>Currently, the following permissions are classified as {@link
@@ -911,6 +1039,7 @@
<ul>
<li><code>android.permission.ACCESS_LOCATION_EXTRA_COMMANDS</code></li>
<li><code>android.permission.ACCESS_NETWORK_STATE</code></li>
+ <li><code>android.permission.ACCESS_NOTIFICATION_POLICY</code></li>
<li><code>android.permission.ACCESS_WIFI_STATE</code></li>
<li><code>android.permission.ACCESS_WIMAX_STATE</code></li>
<li><code>android.permission.BLUETOOTH</code></li>
@@ -919,6 +1048,7 @@
<li><code>android.permission.CHANGE_NETWORK_STATE</code></li>
<li><code>android.permission.CHANGE_WIFI_MULTICAST_STATE</code></li>
<li><code>android.permission.CHANGE_WIFI_STATE</code></li>
+ <li><code>android.permission.CHANGE_WIMAX_STATE</code></li>
<li><code>android.permission.DISABLE_KEYGUARD</code></li>
<li><code>android.permission.EXPAND_STATUS_BAR</code></li>
<li><code>android.permission.FLASHLIGHT</code></li>
@@ -928,22 +1058,21 @@
<li><code>android.permission.KILL_BACKGROUND_PROCESSES</code></li>
<li><code>android.permission.MODIFY_AUDIO_SETTINGS</code></li>
<li><code>android.permission.NFC</code></li>
- <li><code>android.permission.PERSISTENT_ACTIVITY</code></li>
<li><code>android.permission.READ_SYNC_SETTINGS</code></li>
<li><code>android.permission.READ_SYNC_STATS</code></li>
- <li><code>android.permission.READ_USER_DICTIONARY</code></li>
<li><code>android.permission.RECEIVE_BOOT_COMPLETED</code></li>
<li><code>android.permission.REORDER_TASKS</code></li>
+ <li><code>android.permission.REQUEST_INSTALL_PACKAGES</code></li>
<li><code>android.permission.SET_TIME_ZONE</code></li>
<li><code>android.permission.SET_WALLPAPER</code></li>
<li><code>android.permission.SET_WALLPAPER_HINTS</code></li>
<li><code>android.permission.SUBSCRIBED_FEEDS_READ</code></li>
<li><code>android.permission.TRANSMIT_IR</code></li>
+ <li><code>android.permission.USE_FINGERPRINT</code></li>
<li><code>android.permission.VIBRATE</code></li>
<li><code>android.permission.WAKE_LOCK</code></li>
- <li><code>android.permission.WRITE_SETTINGS</code></li>
<li><code>android.permission.WRITE_SYNC_SETTINGS</code></li>
- <li><code>android.permission.WRITE_USER_DICTIONARY</code></li>
<li><code>com.android.alarm.permission.SET_ALARM</code></li>
<li><code>com.android.launcher.permission.INSTALL_SHORTCUT</code></li>
+ <li><code>com.android.launcher.permission.UNINSTALL_SHORTCUT</code></li>
</ul>
diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs
index 83f69a4..90df59e 100644
--- a/docs/html/preview/preview_toc.cs
+++ b/docs/html/preview/preview_toc.cs
@@ -98,6 +98,15 @@
zh-cn-lang="自动备份应用"
zh-tw-lang="針對應用程式進行自動備份">
Auto Backup for Apps</a></li>
+ <li><a href="<?cs var:toroot ?>preview/features/power-mgmt.html"
+ es-lang="Optimizaciones de ahorro de energía"
+ ja-lang="省電力の最適化"
+ ko-lang="절전 최적화"
+ pt-br-lang="Otimizações de economia de energia"
+ ru-lang="Оптимизация экономии энергии"
+ zh-cn-lang="节能优化"
+ zh-tw-lang="省電最佳化">
+ Power-Saving Optimizations</a></li>
</ul>
</li>
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 3d523d9..113c9b6 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12850,6 +12850,7 @@
pw.println(" i[ntents] [PACKAGE_NAME]: pending intent state");
pw.println(" p[rocesses] [PACKAGE_NAME]: process state");
pw.println(" o[om]: out of memory management");
+ pw.println(" perm[issions]: URI permission grant state");
pw.println(" prov[iders] [COMP_SPEC ...]: content provider state");
pw.println(" provider [COMP_SPEC]: provider client-side state");
pw.println(" s[ervices] [COMP_SPEC ...]: service state");
@@ -12940,6 +12941,10 @@
synchronized (this) {
dumpOomLocked(fd, pw, args, opti, true);
}
+ } else if ("permissions".equals(cmd) || "perm".equals(cmd)) {
+ synchronized (this) {
+ dumpPermissionsLocked(fd, pw, args, opti, true, null);
+ }
} else if ("provider".equals(cmd)) {
String[] newArgs;
String name;
@@ -13055,6 +13060,11 @@
if (dumpAll) {
pw.println("-------------------------------------------------------------------------------");
}
+ dumpPermissionsLocked(fd, pw, args, opti, dumpAll, dumpPackage);
+ pw.println();
+ if (dumpAll) {
+ pw.println("-------------------------------------------------------------------------------");
+ }
mServices.dumpServicesLocked(fd, pw, args, opti, dumpAll, dumpClient, dumpPackage);
pw.println();
if (dumpAll) {
@@ -14075,6 +14085,18 @@
}
}
+ if (!printedAnything) {
+ pw.println(" (nothing)");
+ }
+ }
+
+ void dumpPermissionsLocked(FileDescriptor fd, PrintWriter pw, String[] args,
+ int opti, boolean dumpAll, String dumpPackage) {
+ boolean needSep = false;
+ boolean printedAnything = false;
+
+ pw.println("ACTIVITY MANAGER URI PERMISSIONS (dumpsys activity permissions)");
+
if (mGrantedUriPermissions.size() > 0) {
boolean printed = false;
int dumpUid = -2;