192567 Commits

Author SHA1 Message Date
Alex Klyubin
29542143b1 Merge "Document the security features of Android Keystore." into mnc-dev 2015-05-19 15:55:10 +00:00
Glenn Kasten
5db6637f8c Explain the void send() throws IOException
Bug: 21044677
Change-Id: If6b51058813aff3780821db7c619004622df64ca
2015-05-19 08:46:48 -07:00
Xiyuan Xia
1ca3541857 Merge "Abort swipe up gesture when long press is detected" into mnc-dev 2015-05-19 15:44:44 +00:00
Alex Klyubin
3c5d5f0b4a Document the security features of Android Keystore.
Bug: 18088752
Change-Id: Iec995e39065d9c4f159cb4eea38486f9c75de072
2015-05-19 08:39:31 -07:00
Glenn Kasten
c4ddf16c8b Merge "send without timestamp is not equivalent to send now" into mnc-dev 2015-05-19 15:38:01 +00:00
Glenn Kasten
a32d5c8472 send without timestamp is not equivalent to send now
Change-Id: I68decbd005932c762ccd376ee80b52ac9884fba4
2015-05-19 08:33:36 -07:00
Derek Sollenberger
252893df57 Merge "Check that the parcel contained the expected amount of region data." into mnc-dev 2015-05-19 14:38:52 +00:00
Abodunrinwa Toki
a8151e4ef7 Hide floating toolbar when selection is out of bounds.
Bug: 20212141
Change-Id: I7844308e339ba9a5027c629da8090053011e019d
2015-05-19 15:21:10 +01:00
Abodunrinwa Toki
1f21d2a8b1 Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 2015-05-19 14:06:46 +00:00
Abodunrinwa Toki
fd3a3a1163 Hide floating toolbar when user interacts with screen.
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
  toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
  is changing.

Bug: 20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
2015-05-19 14:25:39 +01:00
Paul Jensen
7597dc7c4d Merge "Avoid surfacing "Sign in to network" notification if user selects "use as is" from captive portal app." into mnc-dev 2015-05-19 12:07:47 +00:00
Paul Jensen
0c506582ef Merge "Make NetworkMonitor do exponential backoff between reevaluation attempts." into mnc-dev 2015-05-19 12:07:04 +00:00
Clara Bayarri
e94561ecbc Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev 2015-05-19 10:42:20 +00:00
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
Dianne Hackborn
d23e0d6901 Update power manager to track uid state like netstats.
To follow the correct semantics for when restricts due to
device idle can be applied, power manager need to know about
uid process states like net policy so that it can allow
wake locks from apps that are in the foreground.

Since this is being added to a second place, I reworked things
so that the activity manager now keeps track of per-uid process
states and allows apps to register to listen to those, rather
than having to track lower-level process states and transform
them into an overall uid state.  Both net policy and power
manager use this new facility.

Change-Id: I77359164c40d0f36fe1ef296dd9f9c3062431148
2015-05-18 18:13:41 -07: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
Eino-Ville Talvala
937c93c47d Camera2: Fix session close callback
If a session is directly replaced, it no longer will receive state
change callbacks from the device. That means it'll never hear about
abort or idle transitions.

Fix this to signal onClose earlier, after sequences complete. This is
reliable to wait on.

Remove the unconfigure drainer, as we have nothing to do after
null-stream configuration completes, now, so no point in triggering
anything for it.

Bug: 19666551
Change-Id: Ied6fb40126b79886cdbcb27d40a76a1646273dd2
2015-05-18 16:25:38 -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