191670 Commits

Author SHA1 Message Date
Jeff Brown
3f6405259a Rename file descriptor listener API.
Bug: 21039493
Change-Id: I506c429e99528eb04dbda5b28da2ad000d10b467
2015-05-15 12:28:15 -07:00
Doris Liu
a2f043822b Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev 2015-05-11 21:31:42 +00:00
Jean-Michel Trivi
4c08bc0f61 Merge "AudioRecord.Builder works with no or partial parameters" into mnc-dev 2015-05-11 21:28:34 +00:00
Yang Ni
552518e3c1 Merge "Moved limit constants for kernel and script group" into mnc-dev 2015-05-11 21:14:32 +00:00
Miao Wang
cb556e0d25 Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev 2015-05-11 21:13:47 +00:00
Fyodor Kupolov
51506326d1 Merge "Fix errors during user switching" into mnc-dev 2015-05-11 21:03:27 +00:00
John Spurlock
fb9a664b2b Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev 2015-05-11 20:42:52 +00:00
Fyodor Kupolov
bcb6c1eb9e Fix errors during user switching
Fix NPE in getHomeActivityForUser. Skip system processes in
killBackgroundUserProcessesWithRecordAudioPermission.

Bug: 21016983
Change-Id: I97f9ca362f4dbf0a659e3d5d7ae6cd8dbeb6404a
2015-05-11 13:39:22 -07:00
Doris Liu
d7444427d9 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
2015-05-11 13:23:31 -07:00
John Spurlock
e11ae11631 Zen: Reset zen + ringer modes on upgrades to M.
Bug: 20886649
Change-Id: I79d0b4a31eb9d54c5e5d4cd80236fdb8340dfeb2
2015-05-11 16:20:16 -04:00
Svetoslav
faf5521987 Merge "Update permission group descriptions." into mnc-dev 2015-05-11 20:04:49 +00:00
Svetoslav
b397d9fe2e Update permission group descriptions.
Change-Id: Idfdd9215430481d43f5ee638ce1eb32413ffcb1e
2015-05-11 13:04:08 -07:00
Alex Klyubin
4dc541497d Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev 2015-05-11 19:47:55 +00:00
Alex Klyubin
09b15d5bdb Merge "Add NonNull and Nullable annotations to AndroidKeyStore API." into mnc-dev 2015-05-11 19:43:46 +00:00
Alex Klyubin
322e2c3a12 Add missing value for EcIesParameterSpec.PointFormatEnum.
Change-Id: If14fe3c3c7ed123b0fa9d5874db2ad8844e49671
2015-05-11 12:37:45 -07:00
Alex Klyubin
54bb1596e4 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
2015-05-11 12:30:03 -07:00
Adam Powell
5fccffd573 Merge "Bringing new Chooser UI closer to spec" into mnc-dev 2015-05-11 19:17:29 +00:00
Adam Powell
7d7580019e 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
2015-05-11 12:16:19 -07:00
Miao Wang
d6f3ebf1d0 Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev 2015-05-11 19:11:44 +00:00
Miao Wang
50a8ff108f [RenderScript] (minor) fix validation of L3 BLAS
bug: 21028875

Change-Id: I9fd48c57b6518e06ee1d9d7d4ca44faa96d887b0
2015-05-11 12:08:02 -07:00
Miao Wang
3c61327fa9 [RenderScript] hide Allocation.copyToFieldPacker()
bug: 21027883

Change-Id: I122392bc5206ff19ea52712576d7f363e5915231
2015-05-11 11:51:09 -07:00
Alex Klyubin
e1176f10eb Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev 2015-05-11 18:29:54 +00:00
John Reck
30e175c8be Merge "Clarify assert" into mnc-dev 2015-05-11 18:16:33 +00:00
Alex Klyubin
292102459b 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
2015-05-11 11:12:34 -07:00
John Reck
9298c54141 Clarify assert
Bug: 20918138
Change-Id: I39a9f8bbfb3752f9a6e5f5215ed8cd3c93ce87fc
2015-05-11 11:03:43 -07:00
Yang Ni
9310e3db45 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)
2015-05-11 11:01:32 -07:00
Jean-Michel Trivi
46011f8871 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
2015-05-11 10:58:16 -07:00
Jeff Davidson
0a775ce980 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
2015-05-11 17:50:07 +00:00
Chirag Shah
3ce72722ca Merge "Revert the AssistAction class." into mnc-dev 2015-05-11 17:39:49 +00:00
Jean-Michel Trivi
3b12261c50 Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev 2015-05-11 17:39:29 +00:00
Mady Mellor
15445a652b Merge "Provide a way for a stylus to access the quick settings menu" into mnc-dev 2015-05-11 17:28:46 +00:00
John Spurlock
b7c9b2259f Merge "QS: Defer tile view updates when opening the detail panel." into mnc-dev 2015-05-11 17:28:00 +00:00
John Spurlock
20c8905869 QS: Defer tile view updates when opening the detail panel.
Bug: 20916542
Change-Id: I8e367fb2f8274eafb8d142fbfb54bc9be66b7546
2015-05-11 13:24:23 -04:00
George Mount
3dec0d4721 Merge "Disable input during Activity Transition." into mnc-dev 2015-05-11 17:19:03 +00:00
John Reck
78fad5724d Merge "Add a few missing asserts" into mnc-dev 2015-05-11 17:15:32 +00:00
Jason Monk
d567d88e10 Merge "SettingsLib: Do wifi processing in background" into mnc-dev 2015-05-11 16:57:23 +00:00
John Reck
ad57442fd0 Add a few missing asserts
Bug: 20918138
Change-Id: I6823cfe531ff6f63a7d9fde22278e6780726c9f1
2015-05-11 09:43:47 -07:00
Jason Monk
30d8004dbf SettingsLib: Do wifi processing in background
Bug: 19520495
Change-Id: Iefad932bd523b26a19e5f902133563341aea7426
2015-05-11 12:37:43 -04:00
Zoltan Szatmary-Ban
11a1086f69 Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev 2015-05-11 16:24:52 +00:00
Steve McKay
b3100f4b13 Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev 2015-05-11 16:21:02 +00:00
Steve McKay
6e02dc8cd6 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
2015-05-11 16:19:00 +00:00
John Spurlock
13ea79dea4 Merge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev 2015-05-11 16:15:22 +00:00
Geoff Mendal
7846d966f5 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-11 16:15:01 +00:00
John Spurlock
77bb25af3d Volume: Separate tint colors for active vs inactive sliders.
Bug: 20889746
Change-Id: I98f6a0eab8f2db41ea7e1ba8e141752ef774de9e
2015-05-11 12:12:07 -04:00
Amith Yamasani
a5b2684c25 Merge "Rename *AppIdle to *AppInactive per api-council" into mnc-dev 2015-05-11 16:11:14 +00:00
Geoff Mendal
fc0a274438 Import translations. DO NOT MERGE
Change-Id: I9eba7c09bb5f603b1260ede6a3de590670af76ff
Auto-generated-cl: translation import
2015-05-11 09:02:26 -07:00
Zoltan Szatmary-Ban
763e170f58 Improve javadoc on android.permission.PACKAGE_USAGE_STATS
Bug: 20642656
Change-Id: Ib0cedee487950dab16134edd383ce5bd5374ff65
2015-05-11 16:01:33 +00:00
John Spurlock
c454f786e2 Merge "Volume: Use teal color for "End now"." into mnc-dev 2015-05-11 15:57:50 +00:00
John Spurlock
e71442521a Volume: Use teal color for "End now".
Bug: 20888718
Change-Id: I7f485dd5faa42ec7c2631c7bdeb3c03ddb46c530
2015-05-11 11:55:40 -04:00
John Spurlock
4cf2ae9c55 Merge "Add new metrics categories for the two notification access screens." into mnc-dev 2015-05-11 15:48:47 +00:00