196617 Commits

Author SHA1 Message Date
Dongwon Kang
d2ed690187 MediaSessionManager: make the binder implementation static
Removing references to application resources on unregistering so that they
can be GCed as ealry as possible.

Bug: https://code.google.com/p/android/issues/detail?id=161398
Change-Id: Icc083f4a58bb5e738aa662247dc83d021a9dc5c3
2015-07-07 11:40:51 -07:00
Jean-Michel Trivi
760b1409bc Merge "Ringtone: add support for volume control and looping" into mnc-dev 2015-07-06 23:07:26 +00:00
Dianne Hackborn
5c8498db21 Merge "Add easy way to get device idle whitelist." into mnc-dev 2015-07-06 22:24:51 +00:00
Dianne Hackborn
1b13968707 Add easy way to get device idle whitelist.
Change-Id: I28b0df69e7fb16b5d7542b1eae626bbfdd9a4c1c
2015-07-06 15:13:37 -07:00
Jorim Jaggi
28b4fc76e2 Merge "Don't prevent windows from drawing when they are just moving" into mnc-dev 2015-07-06 22:07:34 +00:00
Alex Klyubin
b9e13a25f3 Merge "Avoid IllegalStateException when generating/importing keys." into mnc-dev 2015-07-06 21:50:43 +00:00
David Friedman
18b763bb1a am 076d4f40: am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
* commit '076d4f40d849d1d1e628fa6b210e690020d04956':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
2015-07-06 21:41:05 +00:00
Casey Ho
becddea63e Merge "Unhide signal strength constants used by getLevel." into mnc-dev 2015-07-06 21:39:31 +00:00
David Friedman
076d4f40d8 am 7bd9b634: Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs
* commit '7bd9b634c42b500466cf416566d27da229d6ca1c':
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
2015-07-06 21:27:05 +00:00
David Friedman
7bd9b634c4 Merge "docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release." into mnc-preview-docs 2015-07-06 21:15:07 +00:00
David Friedman
f9fc53bb6f am 77b6971b: am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
* commit '77b6971b4699bd94c9a4b044108f264f1ddfe31f':
  Docs: Clarification of language and typo fix for work merged from CL 716303.
2015-07-06 21:13:19 +00:00
Jorim Jaggi
c5af4f8421 Don't prevent windows from drawing when they are just moving
Bug: 21292010
Change-Id: I0cf459d75e9749afa58a4b8649457b3908c8adeb
2015-07-06 21:12:49 +00:00
David Friedman
77b6971b46 am c66c7622: Docs: Clarification of language and typo fix for work merged from CL 716303.
* commit 'c66c7622eadb04c1ca258725ae7125626824c324':
  Docs: Clarification of language and typo fix for work merged from CL 716303.
2015-07-06 20:56:51 +00:00
Chris Craik
74fed61233 Merge "Clearer message when failing to draw a SW layer" into mnc-dev 2015-07-06 20:29:57 +00:00
David Friedman
f3a910b88d am 5977c487: am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
* commit '5977c4879b166eb1b5c0d6a7a361dde515e1d502':
  docs: M Preview 2 - release notes
2015-07-06 20:09:11 +00:00
David Friedman
c66c7622ea Docs: Clarification of language and typo fix for work merged from CL 716303.
Change-Id: I04f062696926b00ccfbd45fef368061dd968efbb
2015-07-06 13:04:16 -07:00
David Friedman
5977c4879b am 07661e3b: Merge "docs: M Preview 2 - release notes" into mnc-preview-docs
* commit '07661e3b73cee9720d79d0d09f7a60104ce4cabc':
  docs: M Preview 2 - release notes
2015-07-06 19:53:11 +00:00
David Friedman
07661e3b73 Merge "docs: M Preview 2 - release notes" into mnc-preview-docs 2015-07-06 19:38:09 +00:00
Jim Miller
79d9219c9f Merge "Only allow fingerprint auth for the current user" into mnc-dev 2015-07-06 19:18:05 +00:00
David Friedman
13c2529009 am e7fb3318: am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs
* commit 'e7fb33180d689bbdddae03ab0afe730e4d312f45':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707
2015-07-06 18:43:37 +00:00
Andrew Solovay
8f8ad8bb57 am b9e4e0d0: am afea7a99: docs: Updating permissions preview for Preview 2.
* commit 'b9e4e0d0f13ba40e95590f42c351af9b1dba0c5b':
  docs: Updating permissions preview for Preview 2.
2015-07-06 18:43:31 +00:00
Jim Miller
cb7d9e9332 Only allow fingerprint auth for the current user
This prevents fingerprint access from activities
for a user that isn't the current user.

Fixes bug 20223481

Change-Id: I360f90972fe63f5066f701a3efda355a7cb11338
2015-07-06 11:38:52 -07:00
David Friedman
e7fb33180d am b50a279f: Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs
* commit 'b50a279fb68aace181787780187c9d3485c84f50':
  Docs: Localized pages for Distribution on DAC. Bug: 20503707
2015-07-06 18:29:11 +00:00
Andrew Solovay
b9e4e0d0f1 am afea7a99: docs: Updating permissions preview for Preview 2.
* commit 'afea7a9982de194893cf1a789bc2625d192727c4':
  docs: Updating permissions preview for Preview 2.
2015-07-06 18:29:06 +00:00
Alex Klyubin
b6e628644a Avoid IllegalStateException when generating/importing keys.
This avoids IllegalStateException when generating/importing keys which
require user authentication when the system is not configured to
generate/import such keys (e.g., secure lock screen not set up).

The documentation states that before generating/importing such keys
apps should check (using public API) whether the system is in a
suitable state. However, some apps are not doing that and instead
catching the IllegalStateException thrown during key
generation/import. This is a bad practice because this exception is an
undocumented implementation detail and should thus not be depended
upon.

This CL addresses this issue as follows:
1. Key(Pair)Generator.init now throws a checked
   InvalidAlgorithmParameterException when the system is in a wrong
   state. Because in most uses of Key(Pair)Generator .init is
   immediately followed by .generate, this prevents .generate from
   encountering this state and does so using a checked exception
   which is part of public API.
2. Key import rethrows the IllegalStateException as a checked
   KeyStoreException which is meant to be thrown if the key cannot be
   imported for any reason. Key(Pair)Generator.generate unfortunately
   cannot throw any checked exceptions and thus has to continue
   throwing unchecked exceptions.

Bug: 22262809
Change-Id: Ic0f7b7a90e0ba63df9139c79b80a8649d2645d2a
2015-07-06 11:27:16 -07:00
David Friedman
b50a279fb6 Merge "Docs: Localized pages for Distribution on DAC. Bug: 20503707" into mnc-preview-docs 2015-07-06 18:20:38 +00:00
Andrew Solovay
afea7a9982 docs: Updating permissions preview for Preview 2.
Currently just contains doc additions/clarifications that apply to
both Preview 1 and Preview 2, and also the addition of the new
'storage' bucket and the new shouldShowRequestPermissionRationale()
method.

See first comment for doc stage location.

Change-Id: I0b97741c45e117c5de3fa1a85c9ba0d5e927fa8f
2015-07-06 11:09:15 -07:00
Raph Levien
441fc0fc68 Merge "Fix problems with StaticLayout indentation" into mnc-dev 2015-07-06 18:08:41 +00:00
Adam Lesinski
1a257545b2 Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 2015-07-06 18:00:33 +00:00
Jeff Sharkey
7fd3c296f1 Merge "Permission to view shared storage for all users." into mnc-dev 2015-07-06 17:59:11 +00:00
Jeff Sharkey
6d842f63a0 Merge "Fix DocumentsUI animation regression." into mnc-dev 2015-07-06 17:58:10 +00:00
Jeff Sharkey
246d698499 Merge "Handle missing migration source volume." into mnc-dev 2015-07-06 17:57:52 +00:00
Jeff Sharkey
38cae6c8bc Merge "Reconcile private volumes when mounted." into mnc-dev 2015-07-06 17:57:46 +00:00
Jeff Sharkey
32e80d7588 Permission to view shared storage for all users.
Typical apps are restricted so they can only view shared storage
belonging to the user they're running as.  However, a handful of
system components need access to shared storage across all users,
such as DefaultContainerService and SystemUI.

Since WRITE_MEDIA_STORAGE already offers this functionality by
bypassing any FUSE emulation, reuse it to grant the "sdcard_rw" GID
which is no longer handed out to third-party apps.  Then we change
the FUSE daemon to allow the "sdcard_rw" GID to see shared storage
of all users.

Bug: 19995822
Change-Id: I504c2a179ba74f142ed0d32da5baa69f4212cd82
2015-07-06 10:54:28 -07:00
Eino-Ville Talvala
539d18c5a9 Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-dev 2015-07-06 17:51:48 +00:00
Dianne Hackborn
dcd96ead84 Merge "Maybe fix issue #22283836 -- package manager NPE." into mnc-dev 2015-07-06 17:50:28 +00:00
David Friedman
335aa228c3 Docs: Localized pages for Distribution on DAC.
Bug: 20503707

Change-Id: I7e45012b34d57bad426d930399eb1afbf3f5f859
2015-07-06 10:38:32 -07:00
Geoff Mendal
e2222d12c8 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-06 17:34:06 +00:00
Geoff Mendal
85bac1cc19 Import translations. DO NOT MERGE
Change-Id: I6c69d2d259e0341bb42765b0940a607599df666b
Auto-generated-cl: translation import
2015-07-06 10:29:06 -07:00
George Mount
20f71891c4 Merge "Fix Fade out during Activity Transition." into mnc-dev 2015-07-06 17:25:46 +00:00
George Mount
a7478ab9a7 Fix Fade out during Activity Transition.
Bug 22181705

The Fade Transition sets the transitionAlpha in onTransitionEnd.
I previously changed Visibility to only do it in onAnimationEnd,
so the onTransitionEnd overrides the Visibility's version. This
fixes that change.

Change-Id: I7df478897b6fcfec20999965e297925b65a1448b
2015-07-06 10:23:13 -07:00
Jason Monk
d369d074f5 Merge "Fix wifi crash" into mnc-dev 2015-07-06 17:19:19 +00:00
Adam Lesinski
f7808b7cf0 BatteryStats: Fix issue with method parameter order...
Argh, this explains some weird instances of negative power
given to Wakelock usage. Realtime and uptime were switched in the
parameter list, and since they're both longs, compiler was happy.

Bug:22295225
Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228
2015-07-06 10:17:24 -07:00
Makoto Onuki
dfd6301fa2 Merge "If user ejects a storage from details, take user to... ... the storage list view" into mnc-dev 2015-07-06 17:13:29 +00:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Jean-Michel Trivi
462045e89a Ringtone: add support for volume control and looping
Bug 22182606

Change-Id: Ied910b9fe02a5da9c4822a107ee884677c8b4991
2015-07-06 10:06:02 -07:00
Jason Monk
dbd05a98e5 Fix wifi crash
Handle clearing state for resume on the same worker thread as everything
else, this way there can't be concurrent modification.

Bug: 22040227
Change-Id: I9ac78a19fc126c8103f3218e657ca93911d3890d
2015-07-06 13:05:43 -04:00
Dianne Hackborn
167d588b8b Maybe fix issue #22283836 -- package manager NPE.
Change-Id: I0383b9a4f1e0b872b3b427e6ad42fd8aa309b7ab
2015-07-06 09:52:59 -07:00
Amith Yamasani
a72eac60c7 Fix a typo causing NPE in restricted profiles
Bug: 22287398
Change-Id: Iec19d890c7b0b7ffed3381dc3f5a9b3e761362a7
2015-07-06 09:24:08 -07:00
Raph Levien
401aa9d807 Merge "Clean up Hyphenator file reading" into mnc-dev 2015-07-06 16:07:37 +00:00