195501 Commits

Author SHA1 Message Date
Kenny Guy
ea864c4d4d Deprecate APIs for admin to create users.
Bug: 21921868
Change-Id: I956d24a8394d95bf975581a3451ceabe01708a10
2015-06-26 16:46:01 +00:00
Kenny Guy
43cf8d1ed1 Merge "Use closer to standard toast for work profile toast." into mnc-dev 2015-06-19 14:56:51 +00:00
Jason Monk
660130b9b0 Merge "Try to keep connection state more up to date" into mnc-dev 2015-06-19 14:55:38 +00:00
Kenny Guy
63bf8acb2a Use closer to standard toast for work profile toast.
Revert back to using a standard system toast
for the toast shown when user unlocks to a
work activity.
Include the work status icon in the toast.

Bug: 21325183
Bug: 21896447
Change-Id: I691417a4ecac36983f391ee722f59e2b467affc1
2015-06-19 15:34:02 +01:00
Abodunrinwa Toki
07e440b278 Merge "Fix FloatingToolbar flickers." into mnc-dev 2015-06-19 14:26:11 +00:00
Jason Monk
909705601e Try to keep connection state more up to date
It seems that connection state isn't always correct, make sure we
update it every time a device changes state, so that we don't stay
connected while no device is connected.

Bug: 21896051
Change-Id: I5aa398f33a916609742e22ce5affd4211ed0a626
2015-06-19 10:04:49 -04:00
Gustav Sennton
1b48a6430a Merge "Revert "Load WebView from one out of a list of packages."" into mnc-dev 2015-06-19 13:23:52 +00:00
Gustav Sennton
d973018221 Revert "Load WebView from one out of a list of packages."
This was not a clean revert!

This reverts commit 2ed6fee15c85ff991f64ecfa8c1c4738e0fdf9b6.
We essentially only revert the functionality for going through a list of
WebView package names and picking the first compatible one.
Except for that functionality we also fetched the name of the shared
library from a flag in WebView and made some minor refactoring in the
initial commit, these changes have been left alone in this revert.

Bug: 21893371
Change-Id: Idb2539dc33cc5f9e2894ecd665c23573c6cba9f3
2015-06-19 11:38:56 +01:00
Andrei Stingaceanu
50057943fb Merge "Cannot select text after rotation in extract mode" into mnc-dev 2015-06-19 09:33:04 +00:00
Sudheer Shanka
a408061cc7 Merge "Use the intent filter icon in ResolveInfo for managed profile." into mnc-dev 2015-06-19 09:25:59 +00:00
Jonathan Basseri
cb8bb39001 Merge "Add VVM carrier config to public API." into mnc-dev 2015-06-19 06:16:48 +00:00
Rich Slogar
e9abb6829f am d9d05fe3: am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit 'd9d05fe358c96e85149627d955191d1328e9924a':
  docs: sdk-tools 24.3.3 updates
2015-06-19 05:58:13 +00:00
Wei Liu
940335ba5b Merge "resolved conflicts for merge of 1dac6bd9 to mnc-dev" into mnc-dev 2015-06-19 05:54:54 +00:00
Wei Liu
9fbee9ba98 resolved conflicts for merge of 1dac6bd9 to mnc-dev
Change-Id: I000b35f5e2658a065c780396254bcb88f1cbce5e
2015-06-18 22:52:37 -07:00
Shawn Willden
0961480879 Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev 2015-06-19 03:16:55 +00:00
Alex Klyubin
42abb74834 Reflect removal of KM_TAG_AEAD_TAG from keymaster.
This reflects the changes in da89dde9787dfbd8c053119ab52d9e671106b18e
in system/keymaster.

Bug: 19919114
Change-Id: I9cdfc7ce63099c4de29029b1fc112369c4a68eba
2015-06-18 18:43:45 -07:00
Selim Cinek
a353528c79 Merge "Added a message to the keyguard bouncer" into mnc-dev 2015-06-19 01:40:39 +00:00
Adam Lesinski
8b156e37d5 Merge "BatteryStats: Update external stats individually." into mnc-dev 2015-06-19 01:22:53 +00:00
Adam Lesinski
d2b9dcac7f Merge "BatteryStats: Log when WiFi idle time is too large" into mnc-dev 2015-06-19 01:17:08 +00:00
Adam Lesinski
a7c90c84e4 BatteryStats: Update external stats individually.
When wifi traffic causes a stats collection, we shouldn't care about
cpu or bluetooth updates.

Bug:21478443
Change-Id: I177dc0fc09951813cb4a702ad0e5d951d69f8c22
2015-06-18 18:13:36 -07:00
Christopher Tate
3233a0a65c Merge "Don't always dump domain/preferred state" into mnc-dev 2015-06-19 01:12:02 +00:00
Christopher Tate
9c896ab226 Don't always dump domain/preferred state
Change-Id: Ie0431b6c3cb1a9f372a142637359c42b182d4b1b
2015-06-18 18:09:42 -07:00
Adam Lesinski
bd6704fc4d BatteryStats: Log when WiFi idle time is too large
We have issues with bad data coming from the WiFi system, so
log when we have unreasonably large WiFi idle time.

Bug:21929173
Change-Id: I54b34c5efad14264306155c588f4c3b71cae35df
2015-06-18 18:06:40 -07:00
Sanket Padawe
30a79ec190 Merge "Set default PBAP checkbox state to false (checkbox unselected)." into mnc-dev 2015-06-19 01:03:36 +00:00
Dianne Hackborn
0348ba2e23 Merge "Fix issue #20494208: Go out of device idle when headset button is pressed" into mnc-dev 2015-06-19 01:01:38 +00:00
Adam Lesinski
00fac63575 Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev 2015-06-19 00:57:47 +00:00
Sanket Padawe
ceeaef3852 Set default PBAP checkbox state to false (checkbox unselected).
Bug: 20488109
Change-Id: I6259ea8d048cbface2ba63b8c1077af12d0fee1b
2015-06-18 17:56:08 -07:00
Dan Sandler
11859eba4e Merge "Announce chronometers with time-unit words." into mnc-dev 2015-06-19 00:50:59 +00:00
Dianne Hackborn
b6683c4286 Fix issue #20494208: Go out of device idle when headset button is pressed
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.

Change-Id: Ie58de60e63036a4142881283835961fbcceec892
2015-06-18 17:40:33 -07:00
Santos Cordon
fe1fdacf1d Merge "Clean up SIM CallManager APIs." into mnc-dev 2015-06-19 00:05:02 +00:00
Rich Slogar
d9d05fe358 am 838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '838e4aa6e69f6482adfdde2e45867a36dc1db2b0':
  docs: sdk-tools 24.3.3 updates
2015-06-18 23:55:44 +00:00
Rich Slogar
838e4aa6e6 Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs 2015-06-18 23:47:28 +00:00
Rich Slogar
1ba81cff91 docs: sdk-tools 24.3.3 updates
Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
2015-06-18 16:36:52 -07:00
Wei Liu
1dac6bd9fb am ae363d2d: Wear doesn\'t need Shell to send notification when bugreport captured.
* commit 'ae363d2db4398a695606c254b88be8940139edd1':
  Wear doesn't need Shell to send notification when bugreport captured.
2015-06-18 23:24:41 +00:00
Fyodor Kupolov
7e603d6994 Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev 2015-06-18 23:17:01 +00:00
Santos Cordon
2c27b9a9fa Clean up SIM CallManager APIs.
Bug: 21499476
Change-Id: Iaded74c6b885b0745dfa85d0b7733bdad75d615a
2015-06-18 16:13:54 -07:00
Pierre Vandwalle
0b00db8eeb Merge "create Wifi PNO ALARM intent" into mnc-dev 2015-06-18 23:13:19 +00:00
Jonathan Basseri
6c1dc315aa Add VVM carrier config to public API.
These bits of carrier config were @hidden, but in order for carrier apps
to set them, they need to be public.

Bug: 21930513
Change-Id: Ifa49cf7441a8c6b6cf7e1aadb46abeb41054fcc3
2015-06-18 16:05:39 -07:00
Fyodor Kupolov
e5bce22dc0 Merge "Defer writes to runtime-permissions.xml" into mnc-dev 2015-06-18 23:00:50 +00:00
Doris Liu
707ae53879 Merge "Fix a typo in Drawable's javadoc" into mnc-dev 2015-06-18 22:39:18 +00:00
Yang Ni
159f442fa3 Merge "Unpublish methods in class ScriptGroup.Binding" into mnc-dev 2015-06-18 22:39:00 +00:00
Todd Kennedy
f29c4a07f4 Merge "Add getPackageImportance() system API" into mnc-dev 2015-06-18 22:37:40 +00:00
Selim Cinek
3122fa85b2 Added a message to the keyguard bouncer
A message can now be shown on the keyguard bouncer
explaining why the bouncer is being shown.

Bug: 21618072
Change-Id: I25aea9cc242abbf6a133fb42cc4407f5c2f3f688
2015-06-18 15:30:36 -07:00
Doris Liu
a6c51149c5 Fix a typo in Drawable's javadoc
Change-Id: Ic168b250defb30512cb35a836118fe2bdf1b2e78
2015-06-18 15:28:27 -07:00
Todd Kennedy
69810483c7 Add getPackageImportance() system API
Callers must have the permission GET_PACKAGE_IMPORTANCE

Bug: 20642684
Change-Id: I6f3ef2ec810c884e0dee239e5909bcb314957302
2015-06-18 15:27:44 -07:00
Jeff Sharkey
c8a49a2b95 Merge "Write packages.list when granting permissions." into mnc-dev 2015-06-18 22:27:23 +00:00
Jeff Sharkey
b43ec54c23 Write packages.list when granting permissions.
Some permissions have the side effect of adding GIDs right now,
so we need to flush out packages.list.

Bug: 21874693
Change-Id: Ia4398c9f84cf7f151248f821b3fa2c12bdf91b80
2015-06-18 15:23:02 -07:00
Alan Viverette
f1da9a1401 Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev 2015-06-18 22:21:49 +00:00
Alan Viverette
15d48a16f6 DO NOT MERGE: Remove DayNight theme
Do not go gentle into that good night,
Old age should burn and rave at close of day;
Rage, rage against the dying of the light.

Though wise men at their end know dark is right,
Because their words had forked no lightning they
Do not go gentle into that good night.

Bug: 21854466
Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
2015-06-18 15:15:16 -07:00
Paul McLean
2d5f41e4c1 Merge "Better handling of 0-length format conversions in convertAudioPortFromNative()." into mnc-dev 2015-06-18 22:00:33 +00:00