OSDN Git Service
Adam Powell [Tue, 28 Apr 2015 22:59:57 +0000 (22:59 +0000)]
Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev
Adrian Roos [Tue, 28 Apr 2015 22:44:57 +0000 (22:44 +0000)]
Merge "Rename windowLightStatusBar" into mnc-dev
Adam Powell [Tue, 28 Apr 2015 22:41:46 +0000 (15:41 -0700)]
Fix a bug when constructing a ChooserTargetAdapter without custom
targets
Bug
20667333
Change-Id: Ia35021d12c00f64f5424588f776d79e18e8d518e
dcashman [Tue, 28 Apr 2015 22:25:47 +0000 (22:25 +0000)]
Merge "Fix PackageManagerSettingsTests and add KeySet info." into mnc-dev
Adrian Roos [Tue, 28 Apr 2015 22:09:35 +0000 (22:09 +0000)]
Merge changes from topic 'roosa-lpu' into mnc-dev
* changes:
Remove LockPatternUtils.getCurrentUser()
Require explicit userId in LockPatternUtils
dcashman [Mon, 27 Apr 2015 21:02:49 +0000 (14:02 -0700)]
Fix PackageManagerSettingsTests and add KeySet info.
Add unit tests for the keyset portion of packages.xml. Also fix previously
broken test by adding UserManagerService reference.
Bug:
19530911
Bug:
19530120
Change-Id: I251fc3e9dc983f1d63f9e84905d3ed0e64843def
Chris Craik [Tue, 28 Apr 2015 22:06:16 +0000 (22:06 +0000)]
Merge "Use default constructor to get anti-aliasing" into mnc-dev
Chris Craik [Tue, 28 Apr 2015 21:39:48 +0000 (21:39 +0000)]
Merge "Remove unused flags and dirty rects" into mnc-dev
Tony Mantler [Tue, 28 Apr 2015 21:26:31 +0000 (21:26 +0000)]
Merge "Make sure Transition constructor is accessible before invoking" into mnc-dev
Tony Mantler [Tue, 28 Apr 2015 21:17:06 +0000 (14:17 -0700)]
Make sure Transition constructor is accessible before invoking
b/
20666031
Change-Id: Ief519ac00aed8ce84cbc852025f91cc03da90c55
Luan Nguyen [Tue, 28 Apr 2015 21:09:22 +0000 (21:09 +0000)]
am
4e7500e1: am
c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
* commit '
4e7500e10cf10eb697bb3e916bf705b9db470c8f':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
Joshua Schwarz [Tue, 28 Apr 2015 21:09:13 +0000 (21:09 +0000)]
am
a4edc82e: am
4547dac0: Fix one-off error in reporting.
* commit '
a4edc82e9b50189b187996e8c4f4e851bdf83893':
Fix one-off error in reporting.
Adrian Roos [Tue, 28 Apr 2015 20:44:43 +0000 (13:44 -0700)]
Rename windowLightStatusBar
Bug:
20642760
Change-Id: If961c758bb034ff9643d7b06a2baafe7307f4051
Luan Nguyen [Tue, 28 Apr 2015 20:39:14 +0000 (20:39 +0000)]
am
c1609dc0: docs: Update information on delivering message to clarify that MessageAPI is not reliable.
* commit '
c1609dc0b25c3143ae8d74bc44fb36873b7d289c':
docs: Update information on delivering message to clarify that MessageAPI is not reliable.
Craig Mautner [Tue, 28 Apr 2015 20:33:46 +0000 (20:33 +0000)]
Merge "Notify client of all window movements." into mnc-dev
Eino-Ville Talvala [Tue, 28 Apr 2015 20:01:50 +0000 (20:01 +0000)]
Merge "Camera2: Fix auto-gen documentation crossreferences." into mnc-dev
Alan Viverette [Tue, 28 Apr 2015 19:51:43 +0000 (19:51 +0000)]
Merge "Layout layers without intrinsic dimensions using FILL gravity" into mnc-dev
Eino-Ville Talvala [Thu, 16 Apr 2015 23:39:45 +0000 (16:39 -0700)]
Camera2: Fix auto-gen documentation crossreferences.
Also update a few outdated notes.
Bug:
20085848
Change-Id: I1aace2152ee937c6c6a4701af999722fdc2e3da7
Mike Lockwood [Tue, 28 Apr 2015 19:36:27 +0000 (19:36 +0000)]
Merge "MidiFramer: Add support for SysEx messages" into mnc-dev
Mike Lockwood [Tue, 28 Apr 2015 18:03:38 +0000 (11:03 -0700)]
MidiFramer: Add support for SysEx messages
Change-Id: I15a605029a0e89fa75c57f180a5a951ada88461c
Yorke Lee [Tue, 28 Apr 2015 18:57:45 +0000 (18:57 +0000)]
Merge "Simplify DefaultDialerManager" into mnc-dev
Chris Craik [Tue, 28 Apr 2015 18:49:27 +0000 (11:49 -0700)]
Use default constructor to get anti-aliasing
Change-Id: I3e078a3bc91a2fd703984ba18b5e7e98069b32f1
Adrian Roos [Fri, 17 Apr 2015 02:31:29 +0000 (19:31 -0700)]
Remove LockPatternUtils.getCurrentUser()
Bug:
18931518
Change-Id: I177eefe466c12217cf64c85b872f71bc23c7bf05
Adrian Roos [Fri, 17 Apr 2015 00:11:20 +0000 (17:11 -0700)]
Require explicit userId in LockPatternUtils
Bug:
18931518
Change-Id: Ib03f37df9135f0324a998c62d165d8eea46328c8
Luan Nguyen [Tue, 28 Apr 2015 18:36:42 +0000 (11:36 -0700)]
docs: Update information on delivering message to clarify that
MessageAPI is not reliable.
bug:
20088602
Change-Id: I2244598e5a155bc6e477d367287b8683ebdf019f
Yorke Lee [Tue, 28 Apr 2015 16:39:20 +0000 (09:39 -0700)]
Simplify DefaultDialerManager
The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.
Bug:
20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
Joshua Schwarz [Tue, 28 Apr 2015 18:28:18 +0000 (18:28 +0000)]
am
4547dac0: Fix one-off error in reporting.
* commit '
4547dac01f3136393cc708bb49ff546413a45d6c':
Fix one-off error in reporting.
Paul McLean [Tue, 28 Apr 2015 18:26:10 +0000 (18:26 +0000)]
Merge "AudioRecord device select continued" into mnc-dev
Yin-Chia Yeh [Tue, 28 Apr 2015 17:55:13 +0000 (17:55 +0000)]
Merge "Camera: document supported templates" into mnc-dev
Yin-Chia Yeh [Sat, 25 Apr 2015 00:48:04 +0000 (17:48 -0700)]
Camera: document supported templates
Bug:
20264663
Change-Id: I6fee34a337bccb61aa563903032f9e2c13bf65e0
Amit Mahajan [Tue, 28 Apr 2015 17:53:14 +0000 (17:53 +0000)]
Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
Amit Mahajan [Mon, 27 Apr 2015 22:58:29 +0000 (22:58 +0000)]
Revert "Adding logging to debug SignalStrength callback missing issue."
This reverts commit
6ba726f825162481644df89cf0754f4e20f2793e.
Bug:
20444738
Change-Id: Idf118b259cfd3854feac851b9532d4fff1d74985
Alan Viverette [Tue, 28 Apr 2015 17:49:19 +0000 (17:49 +0000)]
Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
Amith Yamasani [Tue, 28 Apr 2015 17:48:15 +0000 (17:48 +0000)]
Merge "Mark actually seen notifications as seen" into mnc-dev
Alan Viverette [Tue, 28 Apr 2015 17:44:50 +0000 (10:44 -0700)]
Layout layers without intrinsic dimensions using FILL gravity
Addresses a regression in Calendar where a custom drawable that doesn't
implement intrinsic bounds is laid out incorrectly. Also fixes an issue
where ColorDrawable would be laid out incorrectly.
Bug:
20643614
Change-Id: I796f0d3e189e482cf6fa169a5dd13f654d72653c
Zhijun He [Sat, 25 Apr 2015 01:23:54 +0000 (18:23 -0700)]
Camera2: add max capture stall for reprocess
Bug:
19988710
Change-Id: I05bf3f72fdd54127d9aaa1583e9b0903be94c310
Amith Yamasani [Tue, 28 Apr 2015 17:28:09 +0000 (10:28 -0700)]
Mark actually seen notifications as seen
This was missing from a previous CL that was meant to have it.
Change-Id: I856cee8708d988630778ba88b70deaad8730fc1f
Paul McLean [Fri, 24 Apr 2015 20:01:29 +0000 (14:01 -0600)]
AudioRecord device select continued
Change-Id: I3b6ace370b878351d98dbdcba2db718b30de2f27
Wale Ogunwale [Tue, 28 Apr 2015 17:12:46 +0000 (17:12 +0000)]
Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
Joe Fernandez [Tue, 28 Apr 2015 17:02:34 +0000 (17:02 +0000)]
am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
03cbc27845d6622c8eb7c033ec18dc535ab5d7e4':
docs: Modify Branding guidelines for Android form factors
Joe Fernandez [Tue, 28 Apr 2015 16:46:36 +0000 (16:46 +0000)]
am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
0312f37785768d7931e81afe92dbeda11f132d50':
docs: Modify Branding guidelines for Android form factors
Chris Craik [Mon, 27 Apr 2015 23:41:00 +0000 (16:41 -0700)]
Remove unused flags and dirty rects
bug:
17209071
Also update DisplayList->RenderNode naming in Editor
Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
Joe Fernandez [Tue, 28 Apr 2015 16:21:55 +0000 (16:21 +0000)]
Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
Svet Ganov [Tue, 28 Apr 2015 16:03:53 +0000 (16:03 +0000)]
Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
Craig Mautner [Mon, 27 Apr 2015 20:07:40 +0000 (13:07 -0700)]
Notify client of all window movements.
Previously only the animated movements were reported.
Fixes bug
19817982.
Change-Id: Icebc723be87aa948b72a2ea7cd94d5a0472990be
dcashman [Tue, 28 Apr 2015 14:44:05 +0000 (14:44 +0000)]
Merge "Add KeySetManagerService unit tests." into mnc-dev
dcashman [Tue, 28 Apr 2015 14:43:29 +0000 (14:43 +0000)]
Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 09:56:40 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 09:56:23 +0000 (09:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Dongwon Kang [Tue, 28 Apr 2015 09:25:49 +0000 (09:25 +0000)]
Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 08:56:40 +0000 (01:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f6d4bf043ac98defa9d3b70d0a01d48f4aa6ace
Auto-generated-cl: translation import
Geoff Mendal [Tue, 28 Apr 2015 08:43:47 +0000 (01:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I25003c7f81d46bc95432d22aeb7657fef7c76579
Auto-generated-cl: translation import
Dongwon Kang [Tue, 28 Apr 2015 08:24:51 +0000 (17:24 +0900)]
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Bug:
20509313
Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689
Martijn Coenen [Tue, 28 Apr 2015 07:50:12 +0000 (07:50 +0000)]
Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
Keisuke Kuroyanagi [Tue, 28 Apr 2015 04:58:42 +0000 (04:58 +0000)]
Merge "Fix: End handle disappears when the selection is short." into mnc-dev
Geoff Mendal [Tue, 28 Apr 2015 04:38:29 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56af308506de3258cefb3c96d49ca5ccaed1a57d
Auto-generated-cl: translation import
Wale Ogunwale [Tue, 28 Apr 2015 03:54:47 +0000 (20:54 -0700)]
Set non-starting visible resumed activity as resumed activity for the stack
When ensuring visible activities for a stack we check to see if there is
already a resumed activity on the stack, so if we need to start an
activity that needs to be visible, we start it in the paused state
if there is already a resumed activity in the stack. This was't
taking into account a non-starting, visible, and resumed activity.
One case this can happen is if the currently resumed activity in
the stack becomes translucent and the activity behind it needs to
be started because it was previously destroyed due to low memory.
Bug:
19636839
Change-Id: I31670fd64d3bcbbf41823f51518ca603c7412e92
Joshua Schwarz [Tue, 28 Apr 2015 01:35:50 +0000 (18:35 -0700)]
Fix one-off error in reporting.
Change-Id: I5315e3d13b42285169e6c92cfcf9cf2ae9667018
Joe Fernandez [Tue, 28 Apr 2015 00:36:29 +0000 (00:36 +0000)]
am
ff31bb4b: am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
ff31bb4bb7d46766552526f6580a76445a549339':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:36:23 +0000 (00:36 +0000)]
am
80d19484: am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
80d19484c109c4beb0e36b7ce0418ebe526ad300':
docs: Update Wearable API setup to mention addApiIfAvailable().
Robert Shih [Tue, 28 Apr 2015 00:30:11 +0000 (00:30 +0000)]
Merge "MediaController: workaround to disable seek" into mnc-dev
Joe Fernandez [Tue, 28 Apr 2015 00:24:26 +0000 (00:24 +0000)]
am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
68ef92871f52bad28d5aea168c0d3a4b863d282d':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 00:24:19 +0000 (00:24 +0000)]
am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
185002bcc9b551828557ab6946fef7fef1c17d74':
docs: Update Wearable API setup to mention addApiIfAvailable().
Svet Ganov [Tue, 28 Apr 2015 00:00:44 +0000 (17:00 -0700)]
Handle null projection properly if provider app op is not enabled.
Change-Id: I00b757ef73bf4dd58217ba748520c3504350d4ba
Joe Fernandez [Tue, 28 Apr 2015 00:03:49 +0000 (00:03 +0000)]
Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
Joe Fernandez [Tue, 28 Apr 2015 00:00:08 +0000 (00:00 +0000)]
Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
Alan Viverette [Mon, 27 Apr 2015 23:27:11 +0000 (23:27 +0000)]
Merge "Add some missing Settings and DayNight themes" into mnc-dev
Deepanshu Gupta [Mon, 27 Apr 2015 23:20:34 +0000 (23:20 +0000)]
Merge "Fix view outline for shadows in LayoutLib." into mnc-dev
Alan Viverette [Mon, 27 Apr 2015 23:07:11 +0000 (16:07 -0700)]
Add some missing Settings and DayNight themes
Bug:
20546201
Change-Id: I1eeaf3c76c17b773bb7d9b19ad7fa84479b70f41
Raph Levien [Mon, 27 Apr 2015 22:50:33 +0000 (22:50 +0000)]
Merge "Expose drawTextRun publicly" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 22:49:33 +0000 (22:49 +0000)]
Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
Raph Levien [Thu, 23 Apr 2015 23:12:23 +0000 (16:12 -0700)]
Expose drawTextRun publicly
For correct low-level drawing of low level text, a method that
includes context for shaping is necessary, and it's similarly useful
to provide the direction explicitly rather than running the BiDi
algorithm on the text. The drawTextRun method (in both char[] and
CharSequence variants) has provided this functionality for several
major releases but has been internal. This patch exposes the
methods publicly, and also improves the doc strings for both
the new method and some related ones.
Bug:
20193553
Change-Id: I9be33ca5ae3e7db2b69a56298400671d5ef8ad05
Yorke Lee [Mon, 27 Apr 2015 22:17:50 +0000 (15:17 -0700)]
Rename setDefaultDialerApplication for consistency
Change-Id: I8227df913bdb0ed5e1b3472f9d4ebea1158b366b
Joe Fernandez [Mon, 27 Apr 2015 22:16:41 +0000 (15:16 -0700)]
docs: Modify Branding guidelines for Android form factors
b/
19835619
Change-Id: Ic942aa3c262de5922e084b1e007652b151ca2a76
dcashman [Fri, 27 Feb 2015 17:48:33 +0000 (09:48 -0800)]
Add KeySetManagerService unit tests.
Bug:
19530120
Change-Id: Ie5601f7cafd4b853c6436941cfed48622549d928
Robert Shih [Mon, 27 Apr 2015 19:50:39 +0000 (12:50 -0700)]
MediaController: workaround to disable seek
An example use case is live HLS streams.
Bug:
19489473
Change-Id: I9c278f2875a5faaf1af092cc84888d4280a00747
Cedric Ho [Mon, 27 Apr 2015 20:58:12 +0000 (20:58 +0000)]
Merge "resolved conflicts for merge of
0af3af03 to mnc-dev" into mnc-dev
Luan Nguyen [Wed, 22 Apr 2015 21:48:46 +0000 (14:48 -0700)]
docs: Update Wearable API setup to mention addApiIfAvailable().
bug:
20486912
Change-Id: Ie5fe89b5bd0bbed5c95cead301c6eb6278bfdaee
Cedric Ho [Mon, 27 Apr 2015 20:16:18 +0000 (13:16 -0700)]
resolved conflicts for merge of
0af3af03 to mnc-dev
Change-Id: I38f423be6dcef216cf813aa0f747be38f0ad792f
Yorke Lee [Mon, 27 Apr 2015 19:56:58 +0000 (19:56 +0000)]
Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev
Yorke Lee [Mon, 27 Apr 2015 18:18:38 +0000 (11:18 -0700)]
Add utility method isDefaultOrSystemDialer
Will be used by various system components to determine if a
given package name is a privileged Dialer
Bug:
20333102
Bug:
20304411
Change-Id: I1e5bcbde8ee9a5dc6936b118b1b78f32d97737a6
Martijn Coenen [Thu, 23 Apr 2015 19:55:58 +0000 (21:55 +0200)]
Fix vmalloc memory accounting (DO NOT MERGE).
VmallocUsed from meminfo sums all vmalloc'd
memory areas, but it shouldn't count the areas
that were mapped with ioremap(); ioremap()'d
ranges usually map to I/O memory, not actual
physical memory.
Binder and CMA are exceptions, but in the
common case we're more accurate not counting
those regions either.
Bug:
20483106
Change-Id: I75e74d9477a30a3de84877531b6e614a71469d24
(cherry picked from commit
f33b6292168ea6e90c9d52d477c922af23001f63)
Chris Craik [Mon, 27 Apr 2015 19:28:01 +0000 (19:28 +0000)]
Merge "Anti-alias by default" into mnc-dev
Chris Craik [Mon, 27 Apr 2015 19:28:44 +0000 (19:28 +0000)]
Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 18:52:03 +0000 (18:52 +0000)]
Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
Dan Stoza [Mon, 27 Apr 2015 18:31:12 +0000 (11:31 -0700)]
ImageWriter: Change detach to sp<GraphicBuffer>
Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.
Bug:
20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736
Luan Nguyen [Thu, 23 Apr 2015 17:32:31 +0000 (10:32 -0700)]
docs: Add note about overriding onConnectedNodes() when listening
for capability node changes.
bug:
20523695
Change-Id: I7a1b057625f6f39d9ee3a03948f0b187484b1842
Chris Craik [Tue, 21 Apr 2015 22:13:29 +0000 (15:13 -0700)]
Promote RenderProperties with an alpha to have a RenderLayer
bug:
20254728
Change-Id: I0bd1d440fe46683b291d4c8ab07a630c34b2eadc
Chris Craik [Fri, 24 Apr 2015 17:46:46 +0000 (10:46 -0700)]
Anti-alias by default
Change-Id: I19434717dd3af4fdcffbfcca2ffbb485dfebe644
Adam Powell [Mon, 27 Apr 2015 18:03:07 +0000 (18:03 +0000)]
Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
Svet Ganov [Mon, 27 Apr 2015 17:50:00 +0000 (17:50 +0000)]
Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev
Arunesh Mishra [Mon, 27 Apr 2015 17:49:48 +0000 (17:49 +0000)]
Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
Svet Ganov [Mon, 27 Apr 2015 16:33:40 +0000 (09:33 -0700)]
DO NOT MERGE Do not clean up global/system settings on package unintalls.
Legacy apps can write their own entries in the system settings and
when they get uninstalled these are hanging around forever polluting
the settings table. We keep track of which settings an app added and
when the app is uninstalled we drop its custom entries. The trouble
was that we did the same thing for global and secure settings with
no explicit list of platform defined settings. Hence, if say a test
signed by the platform certificate touches platform defined global
or secure settings and is then uninstalled, we would drop the platform
defined entries portentially crippling the system.
bug:
20113160
Change-Id: Ia21694f6326ad4a1795c4666027b366e26c05a23
(cherry picked from commit
b128540dc741c424d4f652419686882b7a3bfa06)
Scott Rowe [Mon, 27 Apr 2015 17:48:38 +0000 (17:48 +0000)]
am
7f2e8cdc: am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
7f2e8cdc521d3f47ce5e22e8589569dd486c1aa8':
Andrew Solovay [Mon, 27 Apr 2015 17:48:32 +0000 (17:48 +0000)]
am
ec472abf: am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
ec472abfa22ecbd42f295fb17bd9414386c6a065':
Andrew Solovay [Mon, 27 Apr 2015 17:48:27 +0000 (17:48 +0000)]
am
bd719d7b: am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
bd719d7ba94b87ec89cbdbfde74f007bb1047d2b':
Quddus Chong [Mon, 27 Apr 2015 17:48:21 +0000 (17:48 +0000)]
am
5edfdac4: am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
5edfdac4b8264e3c94673eaede8f17a3568b8496':
dcashman [Mon, 27 Apr 2015 17:42:22 +0000 (10:42 -0700)]
Remove static modifier from KeySetManagerService issuedIds.
There is no notion of shared issuedIds across instances of KeySetManagerService,
of which there should only ever be one on the system. This is particularly
troublesome for unit tests which rely on a clean slate for each
KeySetManagerService invocation.
Bug:
19530120
Change-Id: I41fbd5424650a74426c5aa1128ddfa6a230dcfa3
Arunesh Mishra [Mon, 27 Apr 2015 16:39:00 +0000 (09:39 -0700)]
Add near-ultrasound properties to AudioManager.java
Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc
Julia Reynolds [Mon, 27 Apr 2015 17:29:21 +0000 (17:29 +0000)]
Merge "Allow device initializers to set a preferred setup activity." into mnc-dev