147488 Commits

Author SHA1 Message Date
Kenny Guy
83c7a53b4f Merge "Remove String version of getBadgedLabel" into lmp-dev 2014-08-05 00:19:02 +00:00
Robert Ly
e915faa1d4 am 001e3072: am 23daa441: am 8e115e64: Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs
* commit '001e30729a7e12bef238df680626042b2e99d807':
  docs: Documenting fix for CVE-2014-0224 (SSL vulnerability).
2014-08-07 16:04:07 +00:00
Lajos Molnar
785c9a2ae1 Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 2014-08-07 15:00:45 +00:00
Chet Haase
3053b2fdcf Allow TimePicker/DatePicker to use legacy layout style
In L, the TimePicker was rewritten to use a clock face and the
DatePicker was rewritten to use a calendar. This
change allows developers to opt into the old style instead
(android:timePickerMode="spinner|clock" and
android:datePickerMode="spinner|calendar").)

Issue #16717952 Pre-L style android.widget.TimePicker on L
Issue #16846963 Allow developer to use legacy DatePicker appearance

Change-Id: I4ee071fcbc5bf25eab83d6a5cb6ff352a603f90a
2014-08-07 14:28:49 +00:00
Jorim Jaggi
c4489f990f Merge "BG protection for user switcher on Keyguard." into lmp-dev 2014-08-07 12:44:12 +00:00
Jorim Jaggi
bf1899e64c BG protection for user switcher on Keyguard.
Also fixes the position.

Bug: 15757197
Bug: 15545213
Change-Id: I9fab98652ab1ccad4e02d5cfa17b212a72a0a0b3
2014-08-07 15:45:53 +02:00
Adrian Roos
04e5f72cdb Merge "Update User switcher to new spec, implement adding users" into lmp-dev 2014-08-07 09:28:12 +00:00
Lajos Molnar
8d563a2077 ImageReader: fix documentation, relax some guarantees
MediaCodec does not guarantee any of this.

Change-Id: Id73c917baad9ca72de87b98c16374505c8028e86
2014-08-06 20:00:10 -07:00
Paul Jensen
8f333f1922 Switch CaptivePortalLogin app to use theme like Settings UI.
The theme is switched to Theme.Material.Settings.  The progress bar
window feature is not supported in Material (b/16652978) so I added
a progress bar to the layout.  The Theme.Material.Setting's accent
color is set such that ProgressBars are indistinguishable, so accent
color is reset back to the parent's setting.

bug:15409354
Change-Id: Ic2862b8439be8591ec426f3d4dffad72179b2539
2014-08-07 02:49:24 +00:00
Adrian Roos
ccdff62159 Update User switcher to new spec, implement adding users
Also enforces restrictions on when guests can be added.

Bug: 15545213
Change-Id: Ia03747fbcc39f2b1b20876463c85afbac5057878
2014-08-06 18:00:32 +02:00
Santos Cordon
7c7bc7f691 Add setConferenceable() API from ConnectionService to incall. (1/4)
Change-Id: I64fdca08d35f893d755e3b154543a261b1418343
2014-08-06 03:36:09 -07:00
Adrian Roos
5f2220df7f Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 2014-08-05 00:19:02 +00:00
Adrian Roos
b8b4774e61 Fix NPE in DevicePolicyManagerService that crashed SystemUI
Bug: 16857795
Change-Id: I6234f03c4ee31311af9f9c556b790594ee1a8b2f
2014-08-07 15:55:21 +02:00
Adrian Roos
3c9a350165 Pass initiatedByUser to TrustListeners
Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
2014-08-07 15:13:09 +02:00
Dan Sandler
a909b28a13 Merge "Fix screenshots." into lmp-dev 2014-08-07 12:44:12 +00:00
Dan Sandler
deb0d11a43 Fix screenshots.
Bug: 16861182
Change-Id: I9433cb4a5cc100d85f06eeed18ade3ead5ba8188
2014-08-07 09:24:03 -04:00
Adrian Roos
0da7093840 Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 2014-08-07 12:44:12 +00:00
Zoltan Szatmary-Ban
138b324d5d Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 2014-08-07 12:44:12 +00:00
Zoltan Szatmary-Ban
678e3ecc93 Revert "Update Trusted Credentials screen in settings"
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.

Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
2014-08-07 13:41:08 +00:00
Zoltan Szatmary-Ban
0f5efe0b44 Merge "Update Trusted Credentials screen in settings" into lmp-dev 2014-08-05 00:19:02 +00:00
Jungshik Jang
7bbf9e720d Merge "Use message validator for sending message." into lmp-dev 2014-08-04 23:56:40 +00:00
Svetoslav
985e566cec Fix cross-user talk.
An app can access widgets hosted or provided by its uid and package.
Access is also allowed if the caller has the bind app widgets permission
but this caller can be in the wrong user. Now the caller should not
only have the bind app widget permission but also be in the same user
as the host or the provider of the widget.

bug:16834230

Change-Id: I5ddb6309f63f2b4ba95360446c2b9584350fb66f
2014-08-07 05:14:36 +00:00
Jungshik Jang
5f75cbd859 Use message validator for sending message.
Change-Id: I2ff82c5596e8c78c24189199ede66ee9905b95f5
2014-08-07 12:02:29 +09:00
Jungshik Jang
9b5bd967e4 Merge "Rename HdmiCecDeviceInfo into HdmiDeviceInfo." into lmp-dev 2014-08-04 23:56:40 +00:00
Paul Jensen
eec75412a9 Stop ConnectivityService from talking to netd about uncreated networks.
This avoids logged netd errors that are red-herrings.

bug:16667349
Change-Id: I5d6f1681f1d38dab0af4c535573a0c45c0216603
2014-08-07 02:44:51 +00:00
Jungshik Jang
61f4fbd2e8 Rename HdmiCecDeviceInfo into HdmiDeviceInfo.
In order to include mhl device info to device info,
rename HdmiCecDeviceInfo into HdmiDeviceInfo.

BUG: 16215362

Change-Id: I30fb0216061fbbdd6fdc1b82c63af83f1b678597
2014-08-07 11:14:15 +09:00
Paul Jensen
8043df68bf Merge "Flush DNS cache when routes change." into lmp-dev 2014-08-06 21:46:55 +00:00
Paul Jensen
5fb2c6ffe7 Flush DNS cache when routes change.
We used to do this but the change got lost in the NetworkAgent
upgrade.  This brings it back.  ConnectivityService has netd do
the actual flushing.

bug:16549455
Change-Id: I11ddd55fcb9d1ed1d2c6a9be7eb8c57e41bdbdb8
2014-08-06 22:39:40 -04:00
Paul Jensen
b69a3a8eaa Revert DNS cache flush command deletion from "Cleanup: Delete dead code."
This reverts part of commit 7a161c535104555890fa78b99faf1f414fc03e85.
The DNS cache flushing code needs to be called when routes change.

Change-Id: I20d39eabfa088deeeeeff0c3292b1910fd948b0d
bug:16549455
2014-08-06 15:34:26 -04:00
Paul Jensen
306f1a45c6 Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast.
This broadcast used to be sent out by the now defunct CaptivePortalTracker.
Begin sending it out again from the NetworkMonitor who now tests for
captive portals.

Change-Id: Ia33beb04e78cfc4fc042c3b999a3d4e2f9ba4c96
2014-08-06 15:22:02 -04:00
Paul Jensen
e547ff2810 Use OkHTTP instead of my home-made HTTP, for network validation.
The home-made version was only done because there was no previous way to
perform network-specific HTTP.  The home-made version has already shown
incompatibility, see linked bug.

bug:16316314
Change-Id: Ic9e50174552d1466eb1ff59ff9d28e18035cc3e0
2014-08-06 15:17:54 -04:00
Svetoslav
dd712a70c8 Merge "Fix NPE in device policy manager service." into lmp-dev 2014-08-05 00:35:13 +00:00
Svetoslav
318f91b784 Fix NPE in device policy manager service.
Change-Id: I796359f903077eb0ef825ed926557f1a13b2e4c4
2014-08-06 19:05:57 -07:00
Alan Viverette
dbed893ba8 Preserve surface insets when view layout is updated
Also makes canvas save & restore in threaded renderer a little safer.

BUG: 16654228
Change-Id: Ie0d49450ed408cffd0b859c08e524b6f904c77ca
2014-08-07 01:01:17 +00:00
Svet Ganov
67739a3a19 Merge "Fix regression in remote views." into lmp-dev 2014-08-05 00:35:13 +00:00
Svet Ganov
0da85b6c90 Fix regression in remote views.
Now remote views contain the application info for the app on whose
behalf they should show content. The application info contains the
user id and the package name which makes it unique in the multi
user environment. If the app which creates the remote views does
not have the same package as the one passed in the contructor of
the remote views, we lookup the app info for the target package.
There is a special hidden overload that allows creating a remote
views instance that represents an app in given package and user
(requires interact across users) permission. The latter is used
by SystemUi when creating remote views for apps that posted a
notification.

bug:16838651

Change-Id: I2daa974629f89a2446848e59300d994dadcf4439
2014-08-07 00:30:44 +00:00
Jorim Jaggi
5557e65b20 Merge "Fix hints for tablet lockscreen." into lmp-dev 2014-08-06 23:49:14 +00:00
Jorim Jaggi
62defa3a87 Fix hints for tablet lockscreen.
Change-Id: I5f304e2da36467bee8306f611adda30f6dc34b3c
2014-08-07 02:25:37 +02:00
Jeff Sharkey
fbd0e9fa37 Surface user action events when un/installing.
This will be used shortly to connect up with permissions
confirmation UI.

Bug: 16515814
Change-Id: If28cecc28549900d960ac107a1fba0b10ce5bd7b
2014-08-07 00:23:54 +00:00
Jorim Jaggi
0b75f83f14 Fix constant redrawing on Keyguard issue.
Change-Id: I48d7d746a6f4e737c0292e9f1d4becc5eb6d6294
2014-08-07 02:20:27 +02:00
Adam Lesinski
14e15fe4ab Merge "Modify base Configuration used for aapt dump badging" into lmp-dev 2014-08-06 21:46:55 +00:00
Youngsang Cho
5caf1e8dda Make caption setting consistent across sessions
Change-Id: I7cb8ab109188b9f78cceb1025339bce98c776052
2014-08-07 00:48:50 +00:00
Adam Powell
098e7fb587 Have TextView editors use the Menu context for action mode icons
Using the TextView's context instead when resolving these icons from
the theme causes issues if a dark action bar theme is in use.

Bug 16686041

Change-Id: I44cb4a83516d8610103b6ebaf604860b67ac84dd
2014-08-06 17:35:17 -07:00
Jorim Jaggi
905857f1b8 Merge "Fix constant redrawing on Keyguard issue." into lmp-dev 2014-08-05 00:35:13 +00:00
Paul Jensen
6ac5db5777 Merge "Revert DNS cache flush command deletion from "Cleanup: Delete dead code."" into lmp-dev 2014-08-05 00:19:02 +00:00
Paul Jensen
0a9aae3e29 Merge "Add back in ACTION_NETWORK_CONDITIONS_MEASURED broadcast." into lmp-dev 2014-08-05 00:35:13 +00:00
Paul Jensen
ab14df37ab Remove dead CaptivePortalTracker.
Captive portals are now detected by the NetworkMonitor.

Change-Id: Ibfb04bf83b1028231397a577468f110d7ab1dc06
2014-08-07 02:32:54 +00:00
Paul Jensen
e6499b7921 Merge "Use OkHTTP instead of my home-made HTTP, for network validation." into lmp-dev 2014-08-05 00:19:02 +00:00
Jinsuk Kim
58956a5569 Merge "CEC: Hide CEC devices behind non-CEC switch" into lmp-dev 2014-08-05 00:07:36 +00:00
Jinsuk Kim
4fdd0f47bc CEC: Hide CEC devices behind non-CEC switch
CEC devices connected to a non-CEC switch are not under full control
of TV. Will be filtered out from the list of devices provided to TIF.

Bug: 16797838
Change-Id: I8f8ff3a33ddeeb0a2877ca0e596a24096e648879
2014-08-07 10:36:30 +09:00