Commit Graph

48039 Commits

Author SHA1 Message Date
Paul Jensen
d3a56eda9d am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev
* commit '886ab256447f26fc21dfd328e070a11bcfd06374':
  Undeprecate android.net.ProxyInfo as it's still used.
2015-05-20 11:07:34 +00:00
Paul Jensen
cb7c035081 Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev 2015-05-20 10:49:04 +00:00
Andrei Stingaceanu
a53349dd55 am 886e9478: am 8c44e745: Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev
* commit '886e9478f53d62bdcf70302e4c3daa23afde9f5e':
  Landscape extracted mode - floating toolbar interference
2015-05-20 10:00:30 +00:00
Erik Kline
1fe1190821 am f9855b64: am 6f611d72: Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev
* commit 'f9855b642c0d1cb5a93a9287a6a9b0e1b560792c':
  Set NLM_F_ACK in our RTM_NEWNEIGH requests
2015-05-20 09:52:04 +00:00
Andrei Stingaceanu
8c44e74524 Merge "Landscape extracted mode - floating toolbar interference" into mnc-dev 2015-05-20 09:32:50 +00:00
Andrei Stingaceanu
975a8d0f4d Landscape extracted mode - floating toolbar interference
In landscape do not allow starting selection modes if the
extracted mode has not yet started. Also remove the single
tap selection delayed runnable.

This allows for a smooth transition (as in no floating
toolbar artifacts) into extracted mode. Also fixes
(more as in hides) the double selections.

Bug: 20930071
Change-Id: Idb9c375dc25777761b11ca17ccfd9f5eedc642b4
2015-05-20 10:31:19 +01:00
Lorenzo Colitti
d59c3e9531 am 485826b2: am 4b545dfb: Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev
* commit '485826b2655836e6aa5cae10effe3bedca3d77d2':
  Add a hidden method to clear the capabilities of a NetworkRequest
2015-05-20 08:20:33 +00:00
Erik Kline
6f611d7267 Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-dev 2015-05-20 08:05:22 +00:00
Erik Kline
cef7bc939f Set NLM_F_ACK in our RTM_NEWNEIGH requests
With NLM_F_ACK set in RTM_NEWNEIGH requests we get some response from
the kernel, whether there was an error or not.

Additionally:

    [1] add IpReachabilityMonitor#probeNeighbor() as a public
        static method, since it actually depends very little on the
        class internals and might be of larger use.

    [2] add a unittest for parsing NetlinkErrorMessages.

Bug: 18581716
Change-Id: I5d62e7a9972c7440f0483c38c77677436d3a1a25
2015-05-20 16:46:30 +09:00
Erik Kline
ba510e65b6 am d1e4c154: am 77b01b88: Merge "Close netlink socket when shutting down IpReachabilityMonitor" into mnc-dev
* commit 'd1e4c154b57c1aa972a9f96ab59dec6c76413a80':
  Close netlink socket when shutting down IpReachabilityMonitor
2015-05-20 07:01:53 +00:00
Lorenzo Colitti
4b545dfbcd Merge "Add a hidden method to clear the capabilities of a NetworkRequest" into mnc-dev 2015-05-20 05:49:03 +00:00
Erik Kline
abd3142dca Close netlink socket when shutting down IpReachabilityMonitor
This forces the NetlinkSocketObserver thread to exit quickly, rather
than lingering until the next random netlink neighbor multicast message
arrives.

Additionally, add a small unittest to verify that multiple calls to
NetlinkSocket#close() are safe.

Change-Id: I101730fad7eee72f9c6e8a7e7bd10c634f2ceab4
2015-05-20 12:08:55 +09:00
Yigit Boyar
08cec07f8e am 3c9b4bb2: am bf6d1ebc: am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '3c9b4bb278c268129a070dd75a58a26b5372d985':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-05-20 00:47:15 +00:00
Yigit Boyar
bf6d1ebc4b am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into lmp-mr1-ub-dev
* commit '9b7167937ab5ea456c45e735d3bd749ccf49c432':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
2015-05-19 23:15:48 +00:00
Wei Wang
8c4bad200c am 78011ba9: am de35f0d9: Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev
* commit '78011ba9db257e7ae0bc06d49104c6f4bebc799e':
  setCallbackType should be public for onlost/onfound apis
2015-05-19 23:03:11 +00:00
Jeff Sharkey
43cafdc775 am 2d5d8926: am 891230b5: Merge "Push initial disk state, handle empty media." into mnc-dev
* commit '2d5d8926eab83d80994c559c2128ca591d41237c':
  Push initial disk state, handle empty media.
2015-05-19 23:03:06 +00:00
Eino-Ville Talvala
2876261b1f am b6abdacc: am 1975b0a4: Merge "Camera2: Fix session close callback" into mnc-dev
* commit 'b6abdacc83799c21b8b8376b4de2a0d667720a0a':
  Camera2: Fix session close callback
2015-05-19 22:51:37 +00:00
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
Wei Wang
de35f0d952 Merge "setCallbackType should be public for onlost/onfound apis" into mnc-dev 2015-05-19 22:10:24 +00:00
Prerepa Viswanadham
f5e368ff26 setCallbackType should be public for onlost/onfound apis
Bug: 21304922
Change-Id: I27ed4f3e00ac13354e3ef75e5686916be0d10918
2015-05-19 22:04:56 +00:00
Jeff Sharkey
f5a6bd7538 Push initial disk state, handle empty media.
Stash volume count from last scan, and use it to push initial storage
notifications state when listener is first attached.

Also omit disks with invalid size, which usually means they're an
empty slot with no media.

Bug: 20503551
Change-Id: I75097035aebaad70ba32437179a863f6a0910aa5
2015-05-19 14:57:22 -07: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
Eino-Ville Talvala
1975b0a4be Merge "Camera2: Fix session close callback" into mnc-dev 2015-05-19 19:39:12 +00:00
Paul Jensen
f361e3dff9 Undeprecate android.net.ProxyInfo as it's still used.
It was deprecated as part of the Apache deprecation, however it is used
by ConnectivityManager.getLinkProperties() and .getDefaultProxy().
The alternatives (e.g. java.net.Proxy) do not offer a complete
replacement as they lack certain fields (e.g. PAC URL).

Bug:21274137
Change-Id: I99163a2611a738f337fb9907349ef6255dbed6d6
2015-05-19 15:09:17 -04: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
Lorenzo Colitti
84b83c5a95 Add a hidden method to clear the capabilities of a NetworkRequest
Change-Id: I41d4f2229259d0bf9d68aa00f92f3bf4e2e71fbc
2015-05-20 00:35:24 +09: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