OSDN Git Service
Dianne Hackborn [Mon, 11 May 2015 22:22:35 +0000 (22:22 +0000)]
Merge "Implement device idle in power manager." into mnc-dev
Dianne Hackborn [Sat, 9 May 2015 00:21:48 +0000 (17:21 -0700)]
Implement device idle in power manager.
When in device idle mode, we now prevent most apps
from being able to hold partial wake locks. The
device idle controller now pushes its white list of
app uids into the power manager, so it can apply this
policy correctly to only apps that are not whitelisted.
The implementation adds a new "disabled" flag to a wake
lock which is set when we want to apply this policy. When
set, we ensure that we tell battery stats that the wake lock
is not being held and ignore that wake lock when computing
the power state summary.
Also add new SDK APIs to schedule alarms that are allowed
to execute while in idle mode.
Finally add new dumpsys commands to the device idle controller
to completely disable and re-enable its operation, to use
for testing.
Change-Id: I1f16672c6ac06d03bb538f9854d5843db9aa6f27
Quddus Chong [Mon, 11 May 2015 22:16:36 +0000 (22:16 +0000)]
am
ce4408a1: am
a7577843: am
d43ec638: am
174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented un
* commit '
ce4408a104300006a3296bfd2f2aad9c0f2fd9dc':
docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
Quddus Chong [Mon, 11 May 2015 22:02:42 +0000 (22:02 +0000)]
am
a7577843: am
d43ec638: am
174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to r
* commit '
a75778438fde2e7ec5322a69930ff49ded48f4c1':
docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
Quddus Chong [Mon, 11 May 2015 21:51:50 +0000 (21:51 +0000)]
am
d43ec638: am
174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a devic
* commit '
d43ec6380ce04f4c0830cd35d1dbd7b3050799d4':
docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
Quddus Chong [Mon, 11 May 2015 21:38:46 +0000 (21:38 +0000)]
am
174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator
* commit '
174dc3ba607965cf1dd0578f83ce373fa74d0f65':
docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
Doris Liu [Mon, 11 May 2015 21:31:41 +0000 (21:31 +0000)]
Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev
Jean-Michel Trivi [Mon, 11 May 2015 21:28:33 +0000 (21:28 +0000)]
Merge "AudioRecord.Builder works with no or partial parameters" into mnc-dev
Quddus Chong [Mon, 11 May 2015 21:23:42 +0000 (21:23 +0000)]
Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator." into lmp-docs
Yang Ni [Mon, 11 May 2015 21:14:31 +0000 (21:14 +0000)]
Merge "Moved limit constants for kernel and script group" into mnc-dev
Miao Wang [Mon, 11 May 2015 21:13:46 +0000 (21:13 +0000)]
Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev
Quddus Chong [Tue, 7 Apr 2015 23:42:24 +0000 (16:42 -0700)]
docs: Added training docs for Android unit testing tools and APIs.
This training covers techniques for running unit tests on local
machines, using mock objects in local unit tests, and building
instrumented unit tests to run on a device or emulator.
Change-Id: I9fee9ac3bd7382fb158145600b1850775edb687d
Fyodor Kupolov [Mon, 11 May 2015 21:03:26 +0000 (21:03 +0000)]
Merge "Fix errors during user switching" into mnc-dev
John Spurlock [Mon, 11 May 2015 20:42:51 +0000 (20:42 +0000)]
Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev
Fyodor Kupolov [Mon, 11 May 2015 19:05:15 +0000 (12:05 -0700)]
Fix errors during user switching
Fix NPE in getHomeActivityForUser. Skip system processes in
killBackgroundUserProcessesWithRecordAudioPermission.
Bug:
21016983
Change-Id: I97f9ca362f4dbf0a659e3d5d7ae6cd8dbeb6404a
Doris Liu [Mon, 11 May 2015 20:23:31 +0000 (13:23 -0700)]
Use ArrayMap instead of HashMap for storing relavant nodes
This fix is to take advantage of ArrayMap, which is a key-value
mapping data structure that is more memory efficient than HashMap.
Bug:
11604254
Change-Id: I57006880de570a4d7f3899e274cf0a06355d116b
John Spurlock [Mon, 11 May 2015 20:09:03 +0000 (16:09 -0400)]
Zen: Reset zen + ringer modes on upgrades to M.
Bug:
20886649
Change-Id: I79d0b4a31eb9d54c5e5d4cd80236fdb8340dfeb2
Svetoslav [Mon, 11 May 2015 20:04:48 +0000 (20:04 +0000)]
Merge "Update permission group descriptions." into mnc-dev
Svetoslav [Mon, 11 May 2015 20:01:23 +0000 (13:01 -0700)]
Update permission group descriptions.
Change-Id: Idfdd9215430481d43f5ee638ce1eb32413ffcb1e
Alex Klyubin [Mon, 11 May 2015 19:47:54 +0000 (19:47 +0000)]
Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev
Alex Klyubin [Mon, 11 May 2015 19:43:45 +0000 (19:43 +0000)]
Merge "Add NonNull and Nullable annotations to AndroidKeyStore API." into mnc-dev
Alex Klyubin [Mon, 11 May 2015 19:37:18 +0000 (12:37 -0700)]
Add missing value for EcIesParameterSpec.PointFormatEnum.
Change-Id: If14fe3c3c7ed123b0fa9d5874db2ad8844e49671
Alex Klyubin [Mon, 11 May 2015 19:30:03 +0000 (12:30 -0700)]
Add NonNull and Nullable annotations to AndroidKeyStore API.
This is to enable Android Lint and Android Studio to flag nullness
issues at compile time.
Bug:
18088752
Change-Id: I21033b8fcdd989d08c89b50685e47fbb9c74acbf
Adam Powell [Mon, 11 May 2015 19:17:28 +0000 (19:17 +0000)]
Merge "Bringing new Chooser UI closer to spec" into mnc-dev
Adam Powell [Thu, 7 May 2015 00:49:36 +0000 (17:49 -0700)]
Bringing new Chooser UI closer to spec
Separate the chooser targets into rows by type. Remove some API that
was redundant with LabeledIntent, simplifying ChooserTarget.
Change-Id: I90de471825f05d85e6ffbe72a32fb597be824a30
Miao Wang [Mon, 11 May 2015 19:11:43 +0000 (19:11 +0000)]
Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev
Miao Wang [Fri, 1 May 2015 22:32:24 +0000 (15:32 -0700)]
[RenderScript] (minor) fix validation of L3 BLAS
bug:
21028875
Change-Id: I9fd48c57b6518e06ee1d9d7d4ca44faa96d887b0
Miao Wang [Mon, 11 May 2015 18:41:55 +0000 (11:41 -0700)]
[RenderScript] hide Allocation.copyToFieldPacker()
bug:
21027883
Change-Id: I122392bc5206ff19ea52712576d7f363e5915231
Alex Klyubin [Mon, 11 May 2015 18:29:50 +0000 (18:29 +0000)]
Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev
John Reck [Mon, 11 May 2015 18:16:32 +0000 (18:16 +0000)]
Merge "Clarify assert" into mnc-dev
Alex Klyubin [Mon, 11 May 2015 17:31:12 +0000 (10:31 -0700)]
Fix KeyStoreTest now that begin requires parameters.
Keystore's begin operation now requires parameters which describe the
operation (e.g., algorithm, block mode, padding). This adjusts
KeyStoreTest to provide the necessary parameters.
(cherry-picked from commit
c5e4d7af22793072a2620805f5e0e23bf15e7110)
Bug:
19509156
Change-Id: Ibc665fbc893766a683a4aadc97a64ffdf2d0d85f
John Reck [Mon, 11 May 2015 17:18:12 +0000 (10:18 -0700)]
Clarify assert
Bug:
20918138
Change-Id: I39a9f8bbfb3752f9a6e5f5215ed8cd3c93ce87fc
Yang Ni [Tue, 5 May 2015 19:41:19 +0000 (12:41 -0700)]
Moved limit constants for kernel and script group
b/
20728113
so that we can share them with support lib.
Change-Id: I231c0d20c41ee53342d8a975c2db5a31854b9d40
(cherry picked from commit
7b2a46fee0f95b9ae2485db36e0d279730623c4a)
Jean-Michel Trivi [Fri, 8 May 2015 22:10:09 +0000 (15:10 -0700)]
AudioRecord.Builder works with no or partial parameters
Complete missing build-time parameters for encoding and channel
mask, according to documentation.
Bug
20894895
Change-Id: I61f9bfab374effeeded5ae782c4e8513b7310c06
Jeff Davidson [Mon, 27 Apr 2015 22:02:48 +0000 (15:02 -0700)]
Ensure VPN consent is not revoked in prepare/establish.
Covers cases where VPN is prepared, but the consent bit has been lost,
e.g. because updates were uninstalled on the current VPN app. In this
case we want prepare to re-trigger the consent flow, and we do not
want establish() to work.
So, when prepare(package, null) is called, as VpnService.prepare()
will do, if we would have otherwise taken no action and returned true
because the VPN was already prepared, we now check if package has lost
its consent and unprepare the VPN (so that it can be prepared by the
VpnSettings ConfirmDialog).
Bug:
18491424
Change-Id: I8fa60dbc2b95e15f9ce61f9b7e6735db745babba
Chirag Shah [Mon, 11 May 2015 17:39:28 +0000 (17:39 +0000)]
Merge "Revert the AssistAction class." into mnc-dev
Jean-Michel Trivi [Mon, 11 May 2015 17:39:28 +0000 (17:39 +0000)]
Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev
Mady Mellor [Mon, 11 May 2015 17:28:45 +0000 (17:28 +0000)]
Merge "Provide a way for a stylus to access the quick settings menu" into mnc-dev
John Spurlock [Mon, 11 May 2015 17:27:56 +0000 (17:27 +0000)]
Merge "QS: Defer tile view updates when opening the detail panel." into mnc-dev
John Spurlock [Mon, 11 May 2015 17:11:24 +0000 (13:11 -0400)]
QS: Defer tile view updates when opening the detail panel.
Bug:
20916542
Change-Id: I8e367fb2f8274eafb8d142fbfb54bc9be66b7546
George Mount [Mon, 11 May 2015 17:19:02 +0000 (17:19 +0000)]
Merge "Disable input during Activity Transition." into mnc-dev
John Reck [Mon, 11 May 2015 17:15:25 +0000 (17:15 +0000)]
Merge "Add a few missing asserts" into mnc-dev
Jason Monk [Mon, 11 May 2015 16:57:22 +0000 (16:57 +0000)]
Merge "SettingsLib: Do wifi processing in background" into mnc-dev
John Reck [Mon, 11 May 2015 16:43:47 +0000 (09:43 -0700)]
Add a few missing asserts
Bug:
20918138
Change-Id: I6823cfe531ff6f63a7d9fde22278e6780726c9f1
Jason Monk [Fri, 8 May 2015 20:54:18 +0000 (16:54 -0400)]
SettingsLib: Do wifi processing in background
Bug:
19520495
Change-Id: Iefad932bd523b26a19e5f902133563341aea7426
Zoltan Szatmary-Ban [Mon, 11 May 2015 16:24:49 +0000 (16:24 +0000)]
Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev
Steve McKay [Mon, 11 May 2015 16:21:01 +0000 (16:21 +0000)]
Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev
Steve McKay [Thu, 7 May 2015 21:08:20 +0000 (14:08 -0700)]
Delete StandaloneActivity from M (DO NOT MERGE)
The activity is already disabled by default.
Fix an issue where copy support error handling was attempting to invoke StandaloneActivity.
Change-Id: If15c312a183cae1b2a84517e7f7b3123c11bd619
John Spurlock [Mon, 11 May 2015 16:15:21 +0000 (16:15 +0000)]
Merge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev
Geoff Mendal [Mon, 11 May 2015 16:15:00 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
John Spurlock [Mon, 11 May 2015 16:12:07 +0000 (12:12 -0400)]
Volume: Separate tint colors for active vs inactive sliders.
Bug:
20889746
Change-Id: I98f6a0eab8f2db41ea7e1ba8e141752ef774de9e
Amith Yamasani [Mon, 11 May 2015 16:11:13 +0000 (16:11 +0000)]
Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev
Geoff Mendal [Mon, 11 May 2015 16:02:26 +0000 (09:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9eba7c09bb5f603b1260ede6a3de590670af76ff
Auto-generated-cl: translation import
Zoltan Szatmary-Ban [Wed, 6 May 2015 09:52:14 +0000 (10:52 +0100)]
Improve javadoc on android.permission.PACKAGE_USAGE_STATS
Bug:
20642656
Change-Id: Ib0cedee487950dab16134edd383ce5bd5374ff65
John Spurlock [Mon, 11 May 2015 15:57:49 +0000 (15:57 +0000)]
Merge "Volume: Use teal color for "End now"." into mnc-dev
John Spurlock [Mon, 11 May 2015 15:55:40 +0000 (11:55 -0400)]
Volume: Use teal color for "End now".
Bug:
20888718
Change-Id: I7f485dd5faa42ec7c2631c7bdeb3c03ddb46c530
John Spurlock [Mon, 11 May 2015 15:48:44 +0000 (15:48 +0000)]
Merge "Add new metrics categories for the two notification access screens." into mnc-dev
Paul McLean [Mon, 11 May 2015 15:39:28 +0000 (15:39 +0000)]
Merge "Changes as per API council review." into mnc-dev
Abodunrinwa Toki [Mon, 11 May 2015 15:27:25 +0000 (15:27 +0000)]
Merge "Set FloatingToolbar width for portrait and landscape." into mnc-dev
John Spurlock [Mon, 11 May 2015 15:15:35 +0000 (11:15 -0400)]
Add new metrics categories for the two notification access screens.
Bug:
20916418
Change-Id: Iafcaccaa465a2f121a6a1a2ba54b122173e45dc6
Chris Wren [Mon, 11 May 2015 15:07:17 +0000 (15:07 +0000)]
Merge "log more settings actions" into mnc-dev
Narayan Kamath [Mon, 11 May 2015 14:16:44 +0000 (14:16 +0000)]
Merge "Be more accepting of dex2oat errors." into mnc-dev
Abodunrinwa Toki [Tue, 5 May 2015 14:11:30 +0000 (15:11 +0100)]
Set FloatingToolbar width for portrait and landscape.
Bug:
20711006
Change-Id: Iee061a1031406780eb0f85201543b644fbb4d813
Geoff Mendal [Mon, 11 May 2015 13:24:58 +0000 (13:24 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 11 May 2015 13:22:35 +0000 (13:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 11 May 2015 13:21:28 +0000 (06:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3b9bc4b615456852e450db14f517a103fd8cb697
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 May 2015 13:17:31 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia8e10381534c60257e959e7d0eaf02deb0097142
Auto-generated-cl: translation import
Geoff Mendal [Mon, 11 May 2015 13:14:14 +0000 (06:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0999d1abf6951574e9ba7fc6c8a608aaea4540de
Auto-generated-cl: translation import
Nick Kralevich [Sun, 10 May 2015 00:27:50 +0000 (17:27 -0700)]
UsbManager / UsbService / UsbDeviceManager: delete unused code
These functions are never called.
Change-Id: Ic436e1036bed717d2c64701fddd9a810abb9443e
Jinsuk Kim [Sun, 10 May 2015 23:12:14 +0000 (23:12 +0000)]
Merge "CEC: Update ARC feature flag on hotplug" into mnc-dev
Jinsuk Kim [Sun, 10 May 2015 22:49:51 +0000 (07:49 +0900)]
CEC: Update ARC feature flag on hotplug
ARC feature flag should have been updated whenever hotplug[on]
was detected, so that the ARC can be established upon device
discovery. This CL rectifies the bug.
Bug:
20817208
Change-Id: I5053ad3f576d0e405b6d8fc0c4e6584e66ed0a86
Jeff Sharkey [Sun, 10 May 2015 21:53:34 +0000 (14:53 -0700)]
Fix devices with primary physical storage.
Always assume the factory-reset default primary storage before parsing
storage settings. Without this, we'd always default to picking
internal emulated storage during first boot or upgrade.
Bump version code to re-evaluate this for devices that default to
physical storage as primary.
Also restrict available move targets when storage is physical, since
we can't really translate between multi-user and non-multi-user aware
storage.
Bug:
20836019
Change-Id: I186ded1aa3dd9cea67497a4f53b0973031174ccd
Dirk Dougherty [Sat, 9 May 2015 04:49:22 +0000 (04:49 +0000)]
am
d3b2d050: am
674b1fcb: Doc change: Update cards and landing contents.
* commit '
d3b2d0502dd30039789f2a2b6380a4344fdc865e':
Doc change: Update cards and landing contents.
Dirk Dougherty [Sat, 9 May 2015 04:37:37 +0000 (04:37 +0000)]
am
674b1fcb: Doc change: Update cards and landing contents.
* commit '
674b1fcbaae2142666a6fb8eea4595fa8c64e406':
Doc change: Update cards and landing contents.
Dirk Dougherty [Fri, 8 May 2015 03:39:50 +0000 (20:39 -0700)]
Doc change: Update cards and landing contents.
Change-Id: Iecb6a6aa0fd3835750979bea49ac782abaa3364a
Chris Wren [Fri, 8 May 2015 21:23:47 +0000 (17:23 -0400)]
log more settings actions
airplane: quick and slow settings
bluetooth: quick and slow settings
cellular data: quick and slow settings
dnd: quick and slow settings
wifi: quick settings (slow already done)
cast: quick settings
user: quick settings
include state of the toggle in the action log
Back away slowly from the over-generalization of logging
around handleClick, the semantics of mState are particular
to the individual tiles.
Bug:
20264417
Change-Id: I4cecbd3361af64d08de9fb41b8dca210a8086a80
Guang Zhu [Sat, 9 May 2015 00:27:55 +0000 (00:27 +0000)]
Merge "allow top sleeping state in app process verification" into mnc-dev
Alan Viverette [Sat, 9 May 2015 00:20:01 +0000 (00:20 +0000)]
Merge "Replace usages of deprecated version of TextView.setTextAppearance()" into mnc-dev
Fyodor Kupolov [Sat, 9 May 2015 00:19:40 +0000 (00:19 +0000)]
Merge "Disable multi-user background recording" into mnc-dev
Alan Viverette [Sat, 9 May 2015 00:17:44 +0000 (17:17 -0700)]
Replace usages of deprecated version of TextView.setTextAppearance()
Change-Id: Ie501affe2e3a275d3172ce8ed584ba1cd5494da8
Fyodor Kupolov [Sat, 18 Apr 2015 00:59:14 +0000 (17:59 -0700)]
Disable multi-user background recording
On user switch, kill existing processes of the background user with
android.permission.RECORD_AUDIO permission. Home activity should not be
killed to avoid an expensive restart of the home launcher, when the
user switches back.
Introduced DISALLOW_RECORD_AUDIO user restriction, which is enabled for the
background user, and removed for the foreground user.
Introduced a concept of system controlled user restriction, which can only
be set by the system, rather than device administrator.
Bug:
20346194
Change-Id: Ic942fd565e80d14424230dae612965a8e229c4ef
Jean-Michel Trivi [Fri, 8 May 2015 23:45:25 +0000 (16:45 -0700)]
android.media.AudioRecord.Builder: no "capture preset"
Implement feedback to keep using "audio sources" instead of migrating
to "capture presets" in AudioRecord.Builder.
Bug
20887665
Change-Id: I4d7773102711c3a4f3f4050b3eb5600bfba889cd
Guang Zhu [Sat, 9 May 2015 00:10:29 +0000 (17:10 -0700)]
allow top sleeping state in app process verification
This happens when an app is launched but has a dialog shown on
top of it. Typical reason is a licensing prompt of sorts.
Change-Id: Id73f45f54767b869873c62f13aeeb470c1a5cd81
Wei Jia [Fri, 8 May 2015 23:23:43 +0000 (23:23 +0000)]
Merge "MediaSync: address API review." into mnc-dev
Fyodor Kupolov [Fri, 8 May 2015 23:10:29 +0000 (23:10 +0000)]
Merge "Remove restrictions PIN functionality" into mnc-dev
Alex Klyubin [Fri, 8 May 2015 23:09:15 +0000 (23:09 +0000)]
Merge "Document when encrypted AndroidKeyStore keys are wiped." into mnc-dev
Alex Klyubin [Fri, 8 May 2015 22:25:48 +0000 (15:25 -0700)]
Document when encrypted AndroidKeyStore keys are wiped.
This also drops the boolean parameter from
KeyGeneratorSpec.Builder.setEncryptionRequired to match the already
launched KeyPairGeneratorSpec.Builder.setEncryptionRequired.
Bug:
18088752
Change-Id: I91a3e8c77958971b1bda8329319f1a0d8043b669
Paul McLean [Fri, 8 May 2015 18:41:20 +0000 (11:41 -0700)]
Changes as per API council review.
Bug:
20887665
Change-Id: I1da7a2c69d8cf20682c767294b1647beef33f90c
Ronghua Wu [Fri, 8 May 2015 22:53:32 +0000 (22:53 +0000)]
Merge "media: merge CodecException's getErrorCode and getReason." into mnc-dev
Mark Salyzyn [Wed, 8 Apr 2015 17:56:59 +0000 (10:56 -0700)]
BootReceiver: scrub APANIC
(Cherry pick from commit
b49dd577f421adbc4e2c7aa7aa88174905b76242)
Bug:
19525200
Change-Id: I940e25a6dd20d53d44ad8848f490ac18c5e971e9
Christopher Tate [Fri, 8 May 2015 22:46:13 +0000 (22:46 +0000)]
am
e8334254: am
4f35e169: am
4475e7df: am
ea2c4033: Mark persistent apps as such when the ProcessRecord is created
* commit '
e83342540b2b7dc7571c12768007697685a6add5':
Mark persistent apps as such when the ProcessRecord is created
Wale Ogunwale [Fri, 8 May 2015 22:34:29 +0000 (22:34 +0000)]
Merge "Clean-up component states in AMS when component is disabled" into mnc-dev
Christopher Tate [Fri, 8 May 2015 22:32:18 +0000 (22:32 +0000)]
am
4f35e169: am
4475e7df: am
ea2c4033: Mark persistent apps as such when the ProcessRecord is created
* commit '
4f35e1699a4b62bd71bed27fece85e2c026210d1':
Mark persistent apps as such when the ProcessRecord is created
Ronghua Wu [Fri, 8 May 2015 21:40:49 +0000 (14:40 -0700)]
media: merge CodecException's getErrorCode and getReason.
And unhide getErrorCode.
Bug:
20950388
Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
John Spurlock [Fri, 8 May 2015 22:29:24 +0000 (22:29 +0000)]
Merge "Zen QS: Tweak segmented button + introduction styling." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:29:09 +0000 (22:29 +0000)]
Merge "Zen: Tweak default automatic rules." into mnc-dev
John Spurlock [Fri, 8 May 2015 22:28:49 +0000 (22:28 +0000)]
Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev
Wei Jia [Fri, 8 May 2015 22:23:28 +0000 (15:23 -0700)]
MediaSync: address API review.
Rename *Settings to *Params;
Remove size parameter from MediaSync.queueAudio();
Bug:
20887706
Change-Id: I4c572da92ada51458031a482b96b3f624224e608
Wale Ogunwale [Fri, 1 May 2015 22:35:39 +0000 (15:35 -0700)]
Clean-up component states in AMS when component is disabled
Bug:
15804187
Change-Id: I2b5856c5a0a012f34698fb64f8596d32924bbd1f
Mike Lockwood [Fri, 8 May 2015 22:19:55 +0000 (22:19 +0000)]
Merge "BluetoothMidiDevice: Cleanup and error handling improvements" into mnc-dev