Commit Graph

255075 Commits

Author SHA1 Message Date
Christopher Wiley
5de073a6b0 Remove WiFi related methods from NetworkManagementService
These are no longer necessary, since WiFi manages its own details.

Bug: 30041228
Change-Id: Ia3824da43367ae74d3f3a204318cfe5470d74957
Test: Compiles
(cherry picked from commit 212b95f587)
2016-08-29 11:26:50 -07:00
Mitchell Wills
079b2f342c Don't pull in external/junit through mockito
android-support-test provides a different version of junit

FIXED=30481239

Change-Id: I6d8f52d5f82b4c9905da8cc4a6ca79216eba9e26
(cherry picked from commit d3868cfc63)
2016-08-29 11:26:50 -07:00
Roshan Pius
47fb68bd24 WifiConfiguration: Expose NetworkSelectionStatus strings
Make the status/disable reason string arrays public to be used in
XmlUtil for restoring of data.

BUG: 30448209
Change-Id: If8201df9397edcc4251e5b6aa4d613212fb576ad
TEST: Unit tests
(cherry picked from commit 23173a2efa)
2016-08-29 11:26:49 -07:00
Svetoslav Ganov
6bc2a92a59 Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Partial cherry-pick of core/res/res/values/{config,symbols}.xml only
Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit ac69be543f)
2016-08-29 11:26:49 -07:00
Etan Cohen
0e70bdd7a5 [NAN] Add LV utilities (TLV with T size of 0).
NAN uses LV (not TLV). Expose an LV variant of TLV to make API
cleaner.

Bug: 30096512
Change-Id: I74b4c514d50f1df5750b521bd68a5e2d832d92c3
(cherry picked from commit 009b1fcb85)
2016-08-29 11:26:48 -07:00
Etan Cohen
2b1e7eabfc [NAN] Fix TlvElement member names - reflect public access.
Bug: 30096512
Change-Id: Ic2ab61e891bead6f6e8f13d9ac311ead8fecba5b
(cherry picked from commit e40b4d344e)
2016-08-29 11:26:48 -07:00
Christopher Wiley
090e9de648 TetherUtil: Use ConnectivityManager for tethering
In the past, enabling the SoftAP would cause tethering to happen because
of some unfortunate side effects.  This is no longer the case, and
using WifiManager for this purpose is not a good idea.

Bug: 30147602
Test: Can toggle tethering on/off via all of settings, quick settings,
      and quick quick settings.

Change-Id: Iebbfc6c48b3e8e3fa52d235594ded3502f5801a3
(cherry picked from commit 26bd4efcaa)
2016-08-29 11:26:47 -07:00
Etan Cohen
c579d20618 [NAN] TLV utilities iterator - throw correct exception
Make sure that iterator.next() validates that next element exists -
otherwise throw the exception specified by the interface.

Bug: 30096512
Change-Id: I327da433e3f1181e272c81ee503cbe8aab323f7e
(cherry picked from commit 3e5ac12302)
2016-08-29 11:26:47 -07:00
Etan Cohen
ee58a68285 [NAN] Modify arguments from "array, length" to "array"
Arrays carry their own lengths. There's no need to provide mechanism
to 'shave' the array - could be done explicitly by caller if needed.

Bug: 29617160
Change-Id: Ib135aa04145f400163cd1a8908dfca4590b4480d
(cherry picked from commit 0a5b7efcb2)
2016-08-29 11:26:47 -07:00
Etan Cohen
44cb6ef1de [NAN] NAN System Api: RTT
Modify visibility of startRanging [NAN RTT] to SystemApi. Matches the
visibliity of the RttManager API.

Change-Id: Ia92de9885d0b38dfce74484f437bd122dd53cbf6
(cherry picked from commit ab9ef45971)
2016-08-29 11:26:46 -07:00
Christopher Wiley
05f86d1eec Properly disable WiFi tethering
When Tethering.stopTethering(<wifi>) is called, we set
mWifiTetheringRequested to false and request the AP be torn down.
Previously, we would discard WIFI_AP_STATE_CHANGED_ACTION Intents,
because mWifiTetheringRequested was set to false.  This would in
turn cause us to leave tethering enabled, because we only tear down
tethering upon noticing that the interface is going down
(as signalled by WifiManager via this Intent).

In the past, this was covered up because we would tear down tethering
when the interface was taken down.  Now that we rely on SoftApManager
to notify us of AP state, we need to pay very close attention to what
is being said about the state.

Bug: 30124308
Test: Can toggle tethering on and off reliably on shamu, bullhead,
      angler with no SIM.

Change-Id: If46a8ee11cf4c07c5cc336523f5e5f00273500ec
(cherry picked from commit e52b24a0c5)
2016-08-29 11:26:46 -07:00
Etan Cohen
2d3face59a [NAN] Provide inteface MAC address to app.
Expose NAN discovery interface MAC address to app. Required
to enable OOB discovery with other NAN functionality
(e.g. data-path).

Bug: 30000035
Change-Id: Id3c336a61a36522d7011557c805bc3c5307747a1
(cherry picked from commit d097f8a4e5)
2016-08-29 11:26:45 -07:00
Etan Cohen
6060d85878 [NAN] Add (T)LV validation testing
Test for validity of a (T)LV. Used in construction of publish and
subscribe configuration (both Tx and Rx filters).

Bug: 30007730
Change-Id: Ibf2179121d45c582bb054c06ec2a765ed0927040
(cherry picked from commit c13b9f6b7d)
2016-08-29 11:26:45 -07:00
Erik Kline
f834ddaf28 Add IPv6 tethering coordinator
Add an IPv6TetheringCoordinator to TetheringMaster StateMachine, which
receives and processes NetworkState updates and passes the necessary IPv6
information to the revelant TetherInterfaceStateMachine.

Add an IPv6TetheringInterfaceServices to TetherInterfaceStateMachine, which
is responsible for adding local network routes and managing an IPv6
RouterAdvertisementDaemon.

Partial cherry-pick of only interfaceType method
Bug: 9580643
Change-Id: I3eaae460b80752e2115359d7bde873a1e9ea515a
(cherry picked from commit 1eb8c69bed)
2016-08-29 11:26:44 -07:00
Christopher Wiley
9c820cdebf Stop listening for WiFi interface status changes
Bug: 29931437
Test: Can toggle tethering on and off repeated on shamu and an
      upcoming device, both devices without a SIM.
Test: Can toggle tethering on and off repeated on an
      upcoming device with a T-Mobile SIM.

Change-Id: I4986b1a5f6ae9b45010bd30639806f7ed63a605c
(cherry picked from commit d30aaeb214)
2016-08-29 11:26:44 -07:00
Etan Cohen
01db037f45 [NAN] Add validity checks for service name
Add checks that the service name is valid per spec (see bug for
details). Stores internally as a byte[] for further propagation.

Bug: 30000106
Change-Id: Iab413aba6755c97bfca0332d6eaa21f636e47f3f
(cherry picked from commit adfbfb3a93)
2016-08-29 11:26:43 -07:00
Etan Cohen
a77565d3fc [NAN] Fix assumption about Strings containing single-byte characters.
Code assumed that each character was represented by a single byte.

Change-Id: I92ea63f7273379ed1035f10c207d41e3e352bf38
(cherry picked from commit 9a6161c61c)
2016-08-29 11:26:43 -07:00
Etan Cohen
85b1a5b786 [NAN] NAN data-path API: network specifier
Adds network specifier API. These are used in creating a connectivity
request through ConnectivityManager. The network specifier provides
mechanism to pass information to the network factory.

Bug: 26564277
Change-Id: Ib5b88685e033a2957644f2e9cff39a70712ac7b5
(cherry picked from commit 15849dc463)
2016-08-29 11:26:42 -07:00
Rebecca Silberstein
934535bfe5 DO NOT MERGE StateMachine: remove final from SendMessage
Removed final from public sendMessage and sendMessageDelayed commands to
unblock unittest development.  This allows tests to verify calls to
sendMessage and sendMessageDelayed.

Also fixed one checkstyle error with import order.

BUG: 28593024
Change-Id: I26e02c3d75049d385ded7891c4fc9967273c27be
TEST: builds
TEST: runtest frameworks-wifi
(cherry picked from commit 0dbeb9e01a)
2016-08-29 11:26:42 -07:00
mukesh agrawal
4e5e2d1e11 wifi: allow config of default+verbose ring buffers
Add the ability to set the size of ring buffers for
both logging modes (default and verbose).

BUG=29225988
TEST=manual

Manual test: add some logging statements to WifiLogger,
verify that the default ring buffer size is 32KB,
and that the verbose ring buffer size is 1024KB.

Change-Id: I4b7bc0da41ba66d15f8e2b6f3c3d6d615691d507
(cherry picked from commit 6ae111026c)
(cherry picked from commit 6c7a90669b)
2016-08-29 11:26:41 -07:00
Mitchell Wills
0a9fb8093b Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
wpa_supplicant can update this value when authenticating so if the
framework writes it back the new value can be overwritten.

TEST: Patch was validated by original reporter
      Enterprise tests pass (b/29608435)

Change-Id: If359b4ca625371fbdb68177c7cdb6498c3a519a1
Fixes: 28161335

(cherry picked from commit a464a9fce8)
2016-08-29 11:26:10 -07:00
Yohei Yukawa
8eb07090a4 Make sure IME focus is synced to View focus
This CL fixes an edge case that my previous CL [1] forgot to handle.

The goal of my previous CL was to avoid InputMethodManager from getting
confused by a false focus-in event from temporarily detached Views.
However, my CL forgot to take care of the case where the temporarily
detached View is still focused even after the temporary detach mode is
done.

The bad news is that such a situation is relatively easy to trigger by
having a ListView that has EditText as follows, which seems to be
known to be a common technique in Android developer community to put an
EditText in a ListView.
  ListView#listView.addHeaderView(new EditText(context), null, true);

If the ListView is initialized as above, and the EditText has input
focus, View focus and IME focus start to disagree immediatelly after the
ListView's layout is re-evaluated.  This is really easy to trigger, for
example just by dismissing the IME window.

In summary, the root cause is that InputMethodManager#focusIn(View) is
now always ignored as long as the View is temporarily detached, under an
assumption that IMM#focusIn(View) will be called back again with a View
that is not temporarily detached when everything is stable.  Hence the
fix is to do so by hooking up View#dispatchFinishTemporaryDetach() to
call IMM#focusIn(View) again when the View is actually focused in the
final state.

 [1]: Ia79bbd8468f768d546354382b47b39dd31ef7bb5
      a4ed0cfcb6

Bug: 30022872
Bug: 30578745
Bug: 30706985
Change-Id: Iecbdb00dcef8c72e4f7b31035c9bf0f4a40a578f
(cherry picked from commit dd228fbb4d)
2016-08-29 18:24:31 +00:00
Jason Monk
67566858af Merge "Fix double status bar icons" into nyc-dev
am: 2b4e612b10

Change-Id: Ic50aea16f2c5dd14c56dac581f9780e49626ddb5
2016-08-29 18:17:16 +00:00
Jason Monk
829548a3cb Fix double status bar icons
am: 12124d7eca

Change-Id: Ib9208ba63774a65d6aac32f9af06abd2769dbd43
2016-08-29 18:17:12 +00:00
Selim Cinek
96b67bcd1c Merge "Fixed a bug where notifications could reappear" into nyc-dev
am: 4226dcef1e

Change-Id: I2f31b0a2e9d2426b6a22924b2f19ccf7590f86d0
2016-08-29 18:08:49 +00:00
Selim Cinek
b7f50bedb1 Fixed a bug where notifications could reappear
am: f3b64692a3

Change-Id: I6cfebd6d64d09c153ba21dea7ff96793d4595ab7
2016-08-29 18:08:42 +00:00
Selim Cinek
ad235b03fb Fixed a bug where the headsup would be stuck disappearing
am: a4155bb7c0

Change-Id: Ibb48a2b105212634bdff1daadb53be3f5caa4413
2016-08-29 18:08:28 +00:00
Jason Monk
2b4e612b10 Merge "Fix double status bar icons" into nyc-dev 2016-08-29 18:00:02 +00:00
TreeHugger Robot
4226dcef1e Merge "Fixed a bug where notifications could reappear" into nyc-dev 2016-08-29 17:58:31 +00:00
Jason Monk
12124d7eca Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController.  Set it in the constructor to enforce
this.

Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes: 28524184
(cherry picked from commit c6fe61c59c)
2016-08-29 13:26:18 +00:00
Yi Kong
2b5a0d299d Merge "Track getxattr API change" am: c4c4a1e76e
am: f897e1c3b6

Change-Id: I47ac9cfbd5a38849dad542089cb3fa923a8cd3fe
2016-08-29 08:09:52 +00:00
Yi Kong
f897e1c3b6 Merge "Track getxattr API change"
am: c4c4a1e76e

Change-Id: I66059536d5dfb0999743656f095d557ddf25ff70
2016-08-29 08:05:05 +00:00
Treehugger Robot
c4c4a1e76e Merge "Track getxattr API change" 2016-08-29 07:57:30 +00:00
Adam Powell
00c4f7ba65 Force AlertDialogLayout to have gravity start|top
AlertDialogLayout overrides LinearLayout#onMeasure but not onLayout,
meaning that some state initialized for the handling of gravity may
not be valid in LinearLayout#onLayout. As this is an internal class
never used directly by apps, explicitly specify the default gravity of
start|top in @layout/alert_dialog_material to avoid this bug. Apps
that do things like set gravity in their theme (for whatever reason)
could otherwise change its behavior.

Bug 30494039

Change-Id: I71a8be1829a7fe24cf7714a3bd5ed732f85eb887
(cherry picked from commit 39e0bf23f5)
2016-08-27 16:44:10 +00:00
Yi Kong
c44a6e08e2 Track getxattr API change
Bug: 30992227
Change-Id: I788b3e51a536c7df7896f622038fe762f9848a2a
2016-08-27 12:16:44 +01:00
Tao Bao
8abcfed8a4 Bump up the uncrypt timeout to 30 min.
Bug: 30490464
Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9
2016-08-26 20:52:41 -07:00
Yuichi Biwa
cb3e1237b5 ChooserActivity: Cannot start app that the icon overflows the layout
Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.

Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.

Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).

Bug: 30153542

Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
(cherry picked from commit 4f3a843ea9)
2016-08-27 01:36:44 +00:00
Abodunrinwa Toki
99c340cad9 FloatingActionMode: Fix screen coordinates.
Use application context to get the screen's display metrics.

Bug: 30127070
Change-Id: I2c453c494ef210c12d89fc7e3ff026728f9ecb0f
(cherry picked from commit afb38c5cc4)
2016-08-27 01:27:28 +00:00
Alan Viverette
c328f042a6 Set up view state before attaching, jump drawables if needed
View attachment calls jumpDrawablesToCurrentState(), so the view state
needs to be set up prior to attachment. For views that are already
attached but are being moved to a new position, manually jump.

Cleans up comments in methods that were modified.

Bug: 29978498
Change-Id: Ica27b2c60ad7ee98b9d1e4912c4f8b8c248af88d
(cherry picked from commit 26489e1688)
2016-08-27 01:17:22 +00:00
Selim Cinek
f3b64692a3 Fixed a bug where notifications could reappear
With sensitive notifications a user could get into
a situation where the groupsummary would not be cleared
because its dismissability was never updated and based
on the visibility of the veto button. This is now corrected.

This Cl also cleans up the veto button handling overall and
ensures that there's no stale state arond it.

Change-Id: Ic7df8d382146d7863ee551c1daa8ba5ed384c7b5
Fixes: 30056258
(cherry picked from commit 9e624e732a)
2016-08-27 00:38:03 +00:00
Selim Cinek
a4155bb7c0 Fixed a bug where the headsup would be stuck disappearing
Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes: 30120962
2016-08-27 00:33:49 +00:00
Chih-Hung Hsieh
007c463e64 Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38
am: e33f3472f3

Change-Id: I4601d7072c16322b70de9620a6bbaa41772d612b
2016-08-27 00:01:59 +00:00
Chih-Hung Hsieh
e33f3472f3 Merge "Fix misc-macro-parentheses warnings in hwui/tests."
am: e2732e5e38

Change-Id: If801b6f30a280ed8382c37765e2623eb3520ebcc
2016-08-26 23:53:25 +00:00
Treehugger Robot
e2732e5e38 Merge "Fix misc-macro-parentheses warnings in hwui/tests." 2016-08-26 23:45:07 +00:00
Raph Levien
9cde7244b6 Enforce consistent sizes for arrays in SpannableStringInternal
The grow logic in SpannableStringInternal#setSpan assumes that the
size of mSpanData is consistent with that of mSpans, in particular
that if the latter doesn't need to grow, neither does the former.
The copySpans() method didn't enforce this, creating an mSpanData
array only big enough to hold the data.

This patch documents the invariant in a comment and enforces it.

Bug: 30359314
Change-Id: Ie25db70a76836e97af8476a7f5c10cb4b976c1cf
(cherry picked from commit 83549088c6)
2016-08-26 23:44:47 +00:00
smain@google.com
99e44c903c add a notice that Work profiles are not compatible with Instant Run
Also includes the redirect for links from the Studio UI
bug: 31098748

Change-Id: Ief7296e512ccf387d738426026413dfe19785ff7
2016-08-26 16:37:16 -07:00
Andrii Kulian
620040db3f DO NOT MERGE -- Correctly finish activity in non-focused stack
When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.

Bug: 29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit 7318d63ba6)
2016-08-26 23:07:28 +00:00
Chih-Hung Hsieh
474081eee1 Fix misc-macro-parentheses warnings in hwui/tests.
* Add parentheses around macro parameters.
Bug: 28705665

Test: build with WITH_TIDY=1
Change-Id: I04f6dd1a180ed1191bf68b685facf6fb9020b4b0
2016-08-26 15:19:47 -07:00
Andrew Solovay
6f29c2091c docs: Fixing formatting problem
Fixing problem (mismatched <div> tags) that caused the page text to be
obscured. See first comment for doc stage location.

bug: 31046432
Change-Id: I82227fd29764755885458c1c011db534325fcde3
2016-08-26 13:35:03 -07:00
Colin Cross
63dc310e6a Merge "Replace libziparchive-host with libziparchive" am: 611e205bbe
am: 8c8bb25089

Change-Id: Iaa10133cfcf424d82f170bf5b8b21487a982e5fb
2016-08-26 20:32:24 +00:00