Commit Graph

48014 Commits

Author SHA1 Message Date
Dianne Hackborn
98e454575c am f24a522c: am 2d9c6015: Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev
* commit 'f24a522c79c7d3c7e6ffe6cf105da90bad95c511':
  Fix issue #20679383: Add text style to assist.ViewNode...
2015-05-19 22:51:03 +00:00
Paul Jensen
d6e54755dd am 06c48119: am c1a9436d: Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev
* commit '06c48119ed1b0a6e32f3811f368dcece1baa75bf':
  Query HTTP proxy for network via a new API to avoid permissions exceptions
2015-05-19 22:50:30 +00:00
Eino-Ville Talvala
424ab24d8a am c79976eb: am 77545f6a: Merge "Camera2: Add SDK annotations" into mnc-dev
* commit 'c79976ebebf86abed84ceb6afa9e154ae35e0bb7':
  Camera2: Add SDK annotations
2015-05-19 22:50:18 +00:00
Hemant Gupta
0a5da7186a am 2ea2465f: am 58fbffc3: Bluetooth: Check for mPanService before changing tethering state
* commit '2ea2465f2e401d4bec71f4cf605bcc4bc958db6c':
  Bluetooth: Check for mPanService before changing tethering state
2015-05-19 22:49:29 +00:00
Yohei Yukawa
e97ecba7f4 am fae01126: am c2cc6fff: Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev
* commit 'fae01126800386a892da70c9b2763843bccff18d':
  Keep IMM#mCurRootView synchronized with the actual window focus.
2015-05-19 22:49:15 +00:00
Dianne Hackborn
a7c407d7d4 am 1e338c0f: am 8e3f2954: Merge "Update power manager to track uid state like netstats." into mnc-dev
* commit '1e338c0f3ba6366bec3ec4bf9034cb2135f16a7d':
  Update power manager to track uid state like netstats.
2015-05-19 22:49:03 +00:00
Fyodor Kupolov
d763aae7c7 am 5053258e: Merge "Allow creating a managed profile if there is only one user."
* commit '5053258e200973d6ae4fec705ea766e0a58a61c9':
  Allow creating a managed profile if there is only one user.
2015-05-19 21:17:46 +00:00
Dianne Hackborn
2d9c6015b3 Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-dev 2015-05-19 18:26:28 +00:00
Dianne Hackborn
02beb41c97 Fix issue #20679383: Add text style to assist.ViewNode...
...from text nodes in WebView

Add a new explicit API for setting the text style information associated
with a view structure.

Also, how about some documentation!

Change-Id: Ia948b2d66382b973d0d00a67172a281ad55ce592
2015-05-19 11:18:16 -07:00
Paul Jensen
c1a9436d27 Merge "Query HTTP proxy for network via a new API to avoid permissions exceptions" into mnc-dev 2015-05-19 17:58:11 +00:00
Eino-Ville Talvala
77545f6a19 Merge "Camera2: Add SDK annotations" into mnc-dev 2015-05-19 17:55:37 +00:00
Nicolas Prevot
5f645339e4 Merge "Allow creating a managed profile if there is only one user." into mnc-dev 2015-05-19 17:52:15 +00:00
Fyodor Kupolov
5053258e20 Merge "Allow creating a managed profile if there is only one user." 2015-05-19 17:47:03 +00:00
Eino-Ville Talvala
8b905578b5 Camera2: Add SDK annotations
- Annotate everything with @NonNull, @Nullable
- Annotate a few @IntRange
- Annotate a few @IntDef
  - Most metadata enums probably canont be annotated usefully,
    since get/set() are generic and the annotation system
    can't yet manage that.
  - Plus metadata annotations need to be auto-generated anyway
- Also add explicit null check to prepare's surface argument
- Also update docs of getCameraCharacteristics to match reality

Bug: 21029463
Change-Id: Ifd81b2a782e29ad069fe25c7db4a1fda73dabcd7
2015-05-19 10:31:06 -07:00
Hemant Gupta
58fbffc36f Bluetooth: Check for mPanService before changing tethering state
Checking for mPanService before changing OR checking tethering state,
otherwise it will lead to application crash while checking isTetheringOn
OR changing tethering state.

Change-Id: I00844c03cdb8616118c1d50d7d31c75e51f0ef9b
2015-05-19 10:07:19 -07:00
Yohei Yukawa
c2cc6fff1b Merge "Keep IMM#mCurRootView synchronized with the actual window focus." into mnc-dev 2015-05-19 16:52:26 +00:00
Dianne Hackborn
8e3f29540d Merge "Update power manager to track uid state like netstats." into mnc-dev 2015-05-19 16:44:12 +00:00
Abodunrinwa Toki
56546bd883 am 785c0a02: am 1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev
* commit '785c0a02c0016fc6c1981bd3e509948d1c1cb227':
  Hide floating toolbar when user interacts with screen.
2015-05-19 14:28:57 +00: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
Clara Bayarri
f11210a36c am 9053af6f: am e94561ec: Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev
* commit '9053af6f84ae396d4bddceb9dc1cab3487dbf087':
  Fix Cancelling a text action activity deletes the selected text
2015-05-19 11:07:02 +00:00
Lorenzo Colitti
e5b49e8d1c am f9118608: am aba6cccd: Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
* commit 'f9118608703b11b002125eca81929f2b6647ebf3':
  Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen.
2015-05-19 10:48:46 +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
Robin Lee
4f874010a4 am 855867b1: am 3e5484d4: Merge "Support cross-user VPN calls (with permission)" into mnc-dev
* commit '855867b1ef8b760d0695921fa7ba040785416a70':
  Support cross-user VPN calls (with permission)
2015-05-19 10:36:56 +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
0f9d315217 am 06ac707d: am c6767354: Merge "Add setting to disable assist data (1/2)" into mnc-dev
* commit '06ac707daf039a08367fe9127767434a3e58f758': (30 commits)
  Add setting to disable assist data (1/2)
  Make all icon fields & extras sent to listeners backward-compatible.
  Revert "Fix IMMS#mInputShown state inconsistency."
  Fix bug with jobservice context giving wrong value
  camera2: Fix work-profile eviction handling.
  Fix missing break in Icon class
  Fix post dial for remote connections
  Fix build: udpate parser factory method
  Don't keep LayoutlibCallback reference.
  Adjust lockscreen style to spec
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
  Change the location of Brandmaster statement file.
  Revert "Update IME focus when the active view is losing the focus."
  Revert "Icon support comes to Notification."
  Fix icon-related crash.
  Don't display the "no Internet access" prompt on captive portals.
  Rewriting should fail when any paths are null.
  Ignore abandon after install relinquished.
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
  Fix crash in setup wizard
  ...
2015-05-19 05:02:29 +00: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
1f2e423c9c am 0427cf9a: am 2b0196a7: Merge "Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing" into mnc-dev
* commit '0427cf9a4d52d9c81644f3f8329b5b4fe3c5ddd2':
  Add IpReachabilityMonitor#probeAll() to begin doing DNAv4/v6-like probing
2015-05-19 03:05:21 +00: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
ac6122c042 am 5418cde8: am f9a0d44d: Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev
* commit '5418cde8aac5f239bfab2056767e42a5e2aeb270':
  Migrate uses of config_windowIsRound to Configuration.isScreenRound
2015-05-19 01:24:18 +00:00
Dianne Hackborn
eefbef3e91 am 7f26b6e7: am fde50024: Merge "Remove screenshot APIs." into mnc-dev
* commit '7f26b6e715a92ffee22ef06020f2caf00ad95b82':
  Remove screenshot APIs.
2015-05-19 01:24:13 +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
Svet Ganov
cbe0916ebf am e7896371: am f7b541ff: Merge "Do not report WiFi and Bluetooth MAC addresses - framework." into mnc-dev
* commit 'e78963712e59963b2c6e3b2082231879fe8ba737':
  Do not report WiFi and Bluetooth MAC addresses - framework.
2015-05-19 00:36:56 +00:00
Vladislav Kaznacheev
7c953911fb am e1c3cebf: am 10e23977: am d2368d07: Merge "Make VPA.setInterpolator(null) unset the interpolator." into lmp-mr1-ub-dev
* commit 'e1c3cebff3140e5c17cd42ca9b85fad0e16ed490':
  Make VPA.setInterpolator(null) unset the interpolator.
2015-05-19 00:17:15 +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
Stefan Kuhne
332914448a am c1523029: am a2968ad5: Merge "Revert "Backup/restore recents task list"" into mnc-dev
* commit 'c15230299f9c9130af74712be5f866a50196f286':
  Revert "Backup/restore recents task list"
2015-05-19 00:05:15 +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
Jeff Brown
912bda17ea am b8d5c965: am d5538758: Merge "Rename file descriptor listener API." into mnc-dev
* commit 'b8d5c965533bda3fc62210a12d2b74468fa51a06':
  Rename file descriptor listener API.
2015-05-18 23:53:11 +00: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 92dd1abef4,
18795a2299, and
ac6a3a5e9d 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
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