192490 Commits

Author SHA1 Message Date
Lorenzo Colitti
aba6cccd40 Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev 2015-05-19 10:29:48 +00:00
Robin Lee
3e5484d452 Merge "Support cross-user VPN calls (with permission)" into mnc-dev 2015-05-19 10:14:59 +00:00
Lorenzo Colitti
76f6779703 Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.
1. Always keep ConnectivityService's validated bits current:
   - Apply the validated bit whenever a NetworkAgent updates its
     NetworkCapabilities.
   - Set or clear the validated bit whenever lastValidated changes.
2. Send callbacks when the validation state of a network changes.
3. Delete getNetworkCapabilitiesAndValidation, removing code
   duplication with getNetworkCapabilities.
4. Add the validated bit to NetworkCapabilities#toString.

Bug: 18591282
Bug: 20081183
Change-Id: I6aa53b61c15cc137f203f9fc6bbd4c16894be750
2015-05-19 18:29:02 +09:00
Jorim Jaggi
c6767354c5 Merge "Add setting to disable assist data (1/2)" into mnc-dev 2015-05-19 04:40:15 +00:00
Jorim Jaggi
9d91083034 Add setting to disable assist data (1/2)
Bug: 20944446
Change-Id: I8050df3177b6d540829c3f0989a4e4b1381c87ec
2015-05-18 21:39:05 -07:00
Erik Kline
2b0196a7d3 Merge "Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing" into mnc-dev 2015-05-19 02:36:56 +00:00
Adam Powell
f9a0d44d2e Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 2015-05-19 01:10:55 +00:00
Dianne Hackborn
fde500245c Merge "Remove screenshot APIs." into mnc-dev 2015-05-19 01:05:53 +00:00
Dianne Hackborn
38a499edf5 Remove screenshot APIs.
Change-Id: I1efdb7945bd52f5f43c7103480be3d7dac60018b
2015-05-18 17:48:40 -07:00
Alan Viverette
0c4729a1e4 Merge "Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"" into mnc-dev 2015-05-19 00:37:03 +00:00
Alan Viverette
344ad7126f Revert "Postpone AnimatedVectorDrawable animator inflation until applyTheme()"
This reverts commit 9b115a9870a184e32bdbd07f792f9b8c956c75ca.

Change-Id: Ief148510472e129f992cf52ef8b8a25b5e17e05f
2015-05-19 00:36:53 +00:00
Joe Fernandez
f8575f667b am e7e9d177: am 2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit 'e7e9d1771525f14027602546e396c0e707bc9de0':
  docs: M Preview landing page updates
2015-05-19 00:31:27 +00:00
Rich Slogar
32239acf5c am 80f67b62: am 3f3cde41: am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '80f67b621247cf120dd885a544e1c2d7eb1d8b90':
  docs: emulator updates
2015-05-19 00:31:21 +00:00
Glenn Kasten
0e2c164a8a Merge "Update documentation for short transfer counts" into mnc-dev 2015-05-19 00:28:20 +00:00
Joe Fernandez
e7e9d17715 am 2b18c39d: Merge "docs: M Preview landing page updates" into mnc-preview-docs
* commit '2b18c39dacd6a14a677b13556e3c8bafa8e110d6':
  docs: M Preview landing page updates
2015-05-19 00:16:51 +00:00
Rich Slogar
80f67b6212 am 3f3cde41: am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit '3f3cde41d178267aeff9a41ec56bc95ce1ad45bf':
  docs: emulator updates
2015-05-19 00:16:46 +00:00
Svet Ganov
f7b541ff74 Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev 2015-05-19 00:13:22 +00:00
Joe Fernandez
2b18c39dac Merge "docs: M Preview landing page updates" into mnc-preview-docs 2015-05-19 00:07:59 +00:00
Joe Fernandez
7c884e6fa8 docs: M Preview landing page updates
- Simplify the action links
- Remove data binding section: this is too much emphasis on that tool

Change-Id: Ic81cef14985a6cc3f14bc9176dd8311ef265d9da
2015-05-18 17:06:05 -07:00
Rich Slogar
3f3cde41d1 am a01f2e73: am c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit 'a01f2e737c23ea8a45d34b9709b9a1010385b4c5':
  docs: emulator updates
2015-05-19 00:05:35 +00:00
Erik Kline
9ce5d602cd Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing
Note that this change is not sufficient to force probing in all cases,
but does cause probing to occur on Linux if the target node hasn't been
confirmed as reachable in the past 5 seconds (delay_first_probe_time).

Bug: 18581716
Bug: 19866451
Bug: 20944464
Change-Id: I29393897118311b48c966c41e2cddb7a784f136f
2015-05-19 09:04:18 +09:00
Vladislav Kaznacheev
10e23977bd am d2368d07: Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
* commit 'd2368d07a71fa77edc07be4ada89f70065bc940f':
  Make VPA.setInterpolator(null) unset the interpolator.
2015-05-18 23:54:08 +00:00
Adrian Roos
7034954f91 Merge "Prevent EmergencyDialer restart from Keyguard" into mnc-dev 2015-05-18 23:48:15 +00:00
Rich Slogar
a01f2e737c am c03a39ab: Merge "docs: emulator updates" into lmp-docs
* commit 'c03a39ab74f5d4c6f62d5323d4049855758fdfcf':
  docs: emulator updates
2015-05-18 23:45:33 +00:00
Adrian Roos
b5947e0127 Prevent EmergencyDialer restart from Keyguard
Fixes a flicker caused by clearing the emergency
dialer task when it was already launched. Instead
we now only clear activities on top of the dialer.

Bug: 20728640
Change-Id: I8a1214c4726e4848587a81e9050a6ab63759b64f
2015-05-18 16:39:14 -07:00
Vladislav Kaznacheev
d2368d07a7 Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev 2015-05-18 23:32:56 +00:00
Stefan Kuhne
63b007e651 Fixing build breakage
There was a merge conflict due to 2 overlapping CL's.

Bug: 20763296
Change-Id: Ib5e8476587dfd1354d288150501771df4b3b7ec8
2015-05-18 16:26:46 -07:00
Adam Powell
01f280d376 Migrate uses of config_windowIsRound to Configuration.isScreenRound
Move existing code that previously relied on config_windowIsRound to
use the new Configuration.isScreenRound() method. Also move the system
property override for emulators over to the initial setup of a Display
so that the configuration property is consistent with existing
expectations.

Remove config_windowIsRound from symbols.xml. The symbol now only
exists as a default value redirect for overlays already configured to
supply this value.

Change-Id: I24e6564030a6051c3ac7262868983b43e13eee65
2015-05-18 16:07:42 -07:00
Stefan Kuhne
a2968ad51e Merge "Revert "Backup/restore recents task list"" into mnc-dev 2015-05-18 23:05:11 +00:00
Stefan Kuhne
e88d1e5926 Revert "Backup/restore recents task list"
Reverts commits 92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3,
18795a2299fefd88ee16393f22324b999ace6ce4, and
ac6a3a5e9d90edb533e5b377a4a14ef514be955a which make-up
changes required for backing-up and restoring recent
tasks from one device to another.

The implementation had too many unresolved issues including
the ordering of the restored recent tasks which was depending
on when the task package is installed on the new device that
puts the restored recents list out of order compared to the
old device.

Bug: 15986349
Bug: 19014377
Bug: 20763296

Change-Id: I06fd35a43036ef0b7260cf4db9c42890df63b95d
2015-05-18 16:00:15 -07:00
Selim Cinek
6f145cf0c0 Fixed a bug that the more card was gone
Bug: 21155295
Change-Id: I7e332df71980b5a553e66b928c3e994849470ab3
2015-05-18 22:58:16 +00:00
Jeff Brown
d5538758af Merge "Rename file descriptor listener API." into mnc-dev 2015-05-18 22:47:47 +00:00
Robin Lee
3b3dd942ec Support cross-user VPN calls (with permission)
Settings and SystemUI need to act on other users than USER_OWNER.

This is gated by INTERACT_ACROSS_USERS_FULL in addition to the existing
CONTROL_VPN checks, so the number of processes able to interfere with
other profiles' VPNs should be quite small.

Bug: 20692490
Bug: 20747154
Bug: 20872408
Change-Id: I6e5d7220f73435bec350719e7b4715935caf4e19
2015-05-18 23:35:31 +01:00
Alan Viverette
365f5c2e4b Merge "Update ripple drawable target radius on bounds change" into mnc-dev 2015-05-18 22:32:57 +00:00
Alan Viverette
6ae9dc8049 Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev 2015-05-18 22:24:39 +00:00
Jim Miller
32d812824b Merge "Attempt to fix bug with setActiveGroup() in FingerprintService." into mnc-dev 2015-05-18 22:15:56 +00:00
Svet Ganov
408abf7f1b Do not report WiFi and Bluetooth MAC addresses - framework.
As a part of the new runtime permissions work we are limiting
the PII apps can access. BT and WiFi MAC addresses are PII and
based on our research there is no valid use case for app dev
to get these addresses aside of user tracking which we are
trying to limit.

bug:21078858

Change-Id: Ib48223b272c0fd4f5c36acc889d4f44df204b309
2015-05-18 15:14:24 -07:00
xin He
7e11579ba0 Merge "hal based pno and lazy roam implementation" into mnc-dev 2015-05-18 22:11:18 +00:00
Pierre Vandwalle
358673e275 hal based pno and lazy roam implementation
cherry-picked from mirror-m-wireless-internal-release 
3655257 - hal based pno and lazy roam implementation

Change-Id: Ib58d40796c896a6d0dad856e0cb86c716c7aee7f
2015-05-18 22:10:20 +00:00
Deepanshu Gupta
9354a3ac00 Merge "Show better error message for color attr not found." into mnc-dev 2015-05-18 22:04:23 +00:00
Jose Lima
8783d3fe76 Make all icon fields & extras sent to listeners backward-compatible.
This also had to be done for when retrieving existing notifications.
For final release, we will only be doing this for
notification listeners targeting older SDKs.

Bug: 21207612
Change-Id: I351f9e13cd052410e7355c956c750c3859f972cb
2015-05-18 14:51:33 -07:00
Chris Wren
b4f6ccc9f7 Merge "log notification longevity and freshness" into mnc-dev 2015-05-18 21:51:12 +00:00
Deepanshu Gupta
5f1bf49694 Show better error message for color attr not found.
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
2015-05-18 14:46:12 -07:00
Adam Powell
98465f99bb Merge "Add Configuration data for round displays" into mnc-dev 2015-05-18 21:30:22 +00:00
Adam Powell
863e65e123 Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-dev 2015-05-18 21:30:21 +00:00
Daniel Sandler
ae1eac53a7 Make all icon fields & extras sent to listeners backward-compatible.
For final release, we will only be doing this for
notification listeners targeting older SDKs.

Bug: 21207612
Change-Id: I28fdaa5666698150ab455f9bfb63251b9418519e
2015-05-18 14:23:55 -07:00
Dirk Dougherty
2e79d52674 am 905bc335: am bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
* commit '905bc335a5f5e180ef52361d72a608bde4657b03':
  Doc change: edits and image updates.
2015-05-18 21:22:24 +00:00
Rich Slogar
bfc14e3eb2 am 54f2ca6e: am 348d105e: am 4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '54f2ca6ed4c8c224da932f2f63fdf2fbe03eea64':
  docs: build-cmd-line-updates
2015-05-18 21:22:19 +00:00
Dirk Dougherty
05f803377e resolved conflicts for merge of ab6d5376 to mnc-dev
Change-Id: Ice8e511bffa6a0bc3aec9e44c059a7dfde91d65f
2015-05-18 14:17:51 -07:00
Adam Powell
49e7ff9647 Add Configuration data for round displays
Add round values to the screenLayout field for Configuration
and a convenience method to check roundness.

Plumb this through the DisplayManager, making roundness the property
of a DisplayAdapter. The built-in main display will read the
configuration resource config_mainBuiltInDisplayIsRound to determine
its roundness. Device-specific resource overlays should set this to
true for devices with round primary displays.

By default, this config resource inherits from the existing
config_windowIsRound value currently used by some Android Wear
device configurations.

This change awaits another for aapt/native resources code to make the
resource filtering system aware of this property.

Change-Id: I1daced7ca6d6e172789e7c32bebfd43753bfa2ae
2015-05-18 14:13:33 -07:00