200105 Commits

Author SHA1 Message Date
Cheryl Potter
4b32b3f43f Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs 2015-09-08 21:28:06 +00:00
xin He
ee1babecd2 Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev 2015-09-08 21:01:49 +00:00
Jorim Jaggi
5e8e1c6377 Do not expand notifications with expand gesture when disallowed
Bug: 23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
2015-09-08 18:51:00 +00:00
Cheryl Potter
a63d058b0a docs: change intro and title for contacts and sign-in lesson, and remove empty bullet
b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20
2015-09-08 10:49:59 -07:00
Lorenzo Colitti
b988466312 Require the new PACKET_KEEPALIVE_OFFLOAD permission.
Bug: 23884210
Change-Id: I50a1a647a69deaba92e73021ee7d6cc0f3eb1eee
2015-09-09 00:16:57 +09:00
Lorenzo Colitti
9d1284eba7 Add an error code for generic hardware error.
This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.

In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.

Bug: 21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13
2015-09-09 00:16:57 +09:00
Lorenzo Colitti
9acca09527 Fix bugs and crashes in PacketKeepalive API.
Bug: 22606153
Bug: 23820819
Bug: 23884210
Change-Id: I1bf82094ec664baed345e9fb137fada0cbf4b7a0
2015-09-09 00:16:56 +09:00
Lorenzo Colitti
7914ce5dd4 Add tests for the PacketKeepalive API.
This currently fails in many different ways, but it tells us what
to fix.

Bug: 22606153
Bug: 23884210
Change-Id: If2e5ee0a8d7b26cad67d3d566ed5b1383e0db096
2015-09-09 00:16:56 +09:00
Lorenzo Colitti
7b70036abc Add a PACKET_KEEPALIVE_OFFLOAD permission.
Bug: 23884210
Change-Id: I0f9207ac9b9c07c676f64f2748905e523e891501
2015-09-09 00:16:55 +09:00
Lorenzo Colitti
ffa390b6f3 Use a CountDownLatch instead of sleep() in NetworkFactory tests.
This makes testNetworkFactoryRequests 2-3 times faster.

Bug: 22606153
Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69
2015-09-08 16:41:47 +09:00
Lorenzo Colitti
e58961aa5f Get rid of shortSleep() in ConnectivityServiceTest.
Instead, use IdleHandler to wait for things to become idle.

Bug: 22606153
Change-Id: Ic6ab93ad4d336b40962f9be1096629a44b63ee2f
2015-09-08 16:41:47 +09:00
Geoff Mendal
9f3e169c3a Import translations. DO NOT MERGE
Change-Id: Ifcce22af4c5736023ed78b34be3a420ec6c6738d
Auto-generated-cl: translation import
2015-09-07 08:31:05 -07:00
Lorenzo Colitti
83fa2588f6 Make ConnectivityServiceTest a bit more readable.
1. Make TestNetworkCallback a bit smarter and rename it to
   SingleUseNetworkCallback. This allows us to get rid of all the
   calls to TestNetworkCallback#getConditionVariable.
2. Delete the commented out code that used to test a
   ConnectivityService model that has not been used since KK.
3. Remove unused imports, etc.

Bug: 22606153
Change-Id: I81a2d0b970d19e5f4515490d8c2f88d416445fa1
2015-09-07 20:41:51 +09:00
Martijn Coenen
a1ec958829 Fix missing copyright headers.
Bug: 23868522
Change-Id: I37fb86e3a751fad363d70687d1b9bcd512bcd33e
2015-09-07 11:53:59 +02:00
Cheryl Potter
24a6be463e am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '36866dc7347ba37ced74af6f8a6298c62282dacb':
  docs: changed references to Google+ sign-in to Google sign-in
2015-09-04 22:45:57 +00:00
Renato Mangini
8f2a5b2576 am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '1edd4ebce50a653f3d1454114f5cd73edcace903':
  Minor fix on Auto Desktop Head Unit doc.
2015-09-04 22:45:53 +00:00
Cheryl Potter
36866dc734 am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '4afcda743d0ba14ee0d3449e7f15518f3cc538dc':
  docs: changed references to Google+ sign-in to Google sign-in
2015-09-04 22:35:43 +00:00
Renato Mangini
1edd4ebce5 am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit 'a8b9a2b7aeab97f71ff876319d807d9f151c6065':
  Minor fix on Auto Desktop Head Unit doc.
2015-09-04 22:35:36 +00:00
Cheryl Potter
4afcda743d am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs
* commit '79ad6310ea3ca5931013cf746babf55cf391cc8f':
  docs: changed references to Google+ sign-in to Google sign-in
2015-09-04 22:24:55 +00:00
Renato Mangini
a8b9a2b7ae am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.
* commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc':
  Minor fix on Auto Desktop Head Unit doc.
2015-09-04 22:24:48 +00:00
Cheryl Potter
79ad6310ea Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs 2015-09-04 22:14:25 +00:00
Vinit Deshpande
6247701895 Introduce config_wifi_revert_country_code_on_cellular_loss
This setting allows wifi country code to automatically reset
to default (i.e. ro.boot.wificountrycode property value) when
cellular modem loses MCC

bug: 21795172

Change-Id: I20bd3a260b639dba331305c6baa39ffb52e2fd6f
2015-09-04 15:10:47 -07:00
Robert Greenwalt
8e285f2f74 Merge "Cut down some logs." into mnc-dr-dev 2015-09-04 21:51:50 +00:00
Tyler Gunn
eb5fcb900c Add carrier config for specifying invalid characters.
Some carriers have the need to strip out certain invalid characters in
instant lettering (e.g. call subject) messages.
This carrier config is added for that purpose.

Bug: 22779583
Change-Id: I165dc125e6d40a0a85442ff138a77d286eb83a4c
2015-09-04 13:16:37 -07:00
Pavel Zhamaitsiak
566886f797 Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev 2015-09-04 16:09:02 +00:00
Sungmin Choi
4c97f3a45a Do not show roaming icon for some operators of Chile
Bug: 23775352
Change-Id: Ie86c628e4acb8fe4b4d24feec98f5a9227c9346c
2015-09-04 01:03:03 -07:00
Robert Greenwalt
a9ebeeff03 Cut down some logs.
bug:23623327
Change-Id: I737d4e6c384bf4da62c65ad2abe0c9b5dca0067a
2015-09-03 17:53:42 -07:00
Andre Eisenbach
1d5e2e291d Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 2015-09-04 00:02:57 +00:00
Andre Eisenbach
7be83c578c Bluetooth: Fix profile auto-connect logic
The fix in commit 05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.

This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.

Bug: 22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
2015-09-03 15:20:09 -07:00
Dan Stoza
0b887e579b Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 2015-09-03 21:55:36 +00:00
Amit Mahajan
8a670f1da4 Merge changes from topic 'TDSCDMA support' into mnc-dr-dev
* changes:
  Add TDSCDMA family
  Telephony: Add TD-SCDMA SignalStrength
2015-09-03 21:24:46 +00:00
Dan Stoza
904f485bc6 SurfaceControl: Add colorTransform to DisplayInfo
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.

Bug: 20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
2015-09-03 13:38:39 -07:00
Adrian Roos
34411e8fec Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev 2015-09-03 19:42:39 +00:00
Adrian Roos
95200e6f4e Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 2015-09-03 19:41:22 +00:00
Adrian Roos
af4ab3e2d3 Don't disable fingerprint when entering wrong credential
Bug: 23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
2015-09-03 12:34:12 -07:00
Adrian Roos
f6d51acec6 Poke fingerprint timeout when vold password is correct
Bug: 23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
2015-09-03 12:34:11 -07:00
Adrian Roos
1b5cc3a4ba Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 2015-09-03 18:59:37 +00:00
Ian Pedowitz
7d223aeef8 am 0a76afb9: Merge "Don\'t crash on (invalid) hardware address lengths > 127." into mnc-dev
* commit '0a76afb93e6f303921ab84e2f26747c3ebf19b62':
  Don't crash on (invalid) hardware address lengths > 127.
2015-09-03 17:34:50 +00:00
Ian Pedowitz
0a76afb93e Merge "Don't crash on (invalid) hardware address lengths > 127." into mnc-dev 2015-09-03 17:22:21 +00:00
Svetoslav Ganov
0b5162c85f am 6dd856b1: Merge "Don\'t drop runtime permissions on older system app update." into mnc-dev
* commit '6dd856b1ea31bae083b6c2ed40af812c41b3a6cf':
  Don't drop runtime permissions on older system app update.
2015-09-03 17:17:46 +00:00
Wale Ogunwale
d4ef34ce8d am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev
* commit '512141d581133ad5c1712ac097dcee08d46bae2c':
  Respect DONT_KILL_APP flag when bringing down a disabled service.
2015-09-03 17:17:42 +00:00
Svetoslav Ganov
6dd856b1ea Merge "Don't drop runtime permissions on older system app update." into mnc-dev 2015-09-03 17:08:57 +00:00
Wale Ogunwale
512141d581 Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev 2015-09-03 17:06:03 +00:00
Dan Sandler
c263a08663 Make the vertical navbar 48dp like the horizontal one.
When the navigation bar was originally introduced to phones
(in change Ic613a335) we wanted it to stick to the same spot
on the display so that it felt as much as possible like a
physical button array; pressing the same fingertip-sized
spot on the glass should always invoke BACK, etc. This meant
flipping the nav bar to a vertical orientation when the
phone was in landscape, and then juggling around the window
insets and other system windows to make room for it.

For reasons that are now lost to time, in that original
implementation we made the vertical navigation bar narrower:
42dp (versus 48dp for the horizontal navigation bar, which
incidentally is always horizontal on tablet-type devices).
Nobody really noticed (except app developers looking to
hardcode this value instead of just using fitSystemWindows
or the new WindowInsets).

Here we finally make the navigation bars match perfectly in
portrait and landscape.

Bug: 23724209
Change-Id: I861be84b41c6a227d269469686c8c66a32029f1d
2015-09-03 10:51:57 -04:00
Michael Wright
8ae90587a5 Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 2015-09-03 14:00:52 +00:00
Lorenzo Colitti
d64144a37c Don't crash on (invalid) hardware address lengths > 127.
These would cause us to crash with a NegativeArraySizeException
when trying to create the clientMac array. Instead, if the length
is > 16 (invalid, because the field is only 16 bytes long), fudge
it to 6 (Ethernet / wifi).  This is a bit less liberal than the
legacy client, which doesn't check the length at all.

Bug: 23725795
Change-Id: I83f47bfc400ffa8ce85dd9d1b8eb96be5afe51a5
2015-09-03 21:28:48 +09:00
Adrian Roos
e07cbaf53c Show face unlock even when fingerprint is running
Bug: 23318158
Change-Id: I02b085297c2546c814d97d725d18beba79568b33
2015-09-02 16:26:34 -07:00
Jim Miller
bd5b61c489 Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev 2015-09-02 23:07:58 +00:00
Jim Miller
73633ddbcf Fingerprint should throttle after 5 attempts
Fixes bug 23762058

Change-Id: I62665dd3097b8e71075a5eddbf34a551db1507d5
2015-09-02 15:35:33 -07:00
Daniel Estrada Alva
90738c2a7e Merge "Use private action for SUPL related connectivity changes." into mnc-dr-dev 2015-09-02 22:04:30 +00:00