257609 Commits

Author SHA1 Message Date
TreeHugger Robot
bd510de4e9 Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev 2016-12-19 13:43:10 +00:00
Hugo Benichi
85f3996d72 Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
* changes:
  DO NOT MERGE IP Connectivity metrics: add connect() statistics
  DO NOT MERGE Fix IP connectivity metrics tests
  DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
  DO NOT MERGE IP connectivity metrics: add transport field.
2016-12-19 08:31:17 +00:00
Hugo Benichi
05d36569b6 Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
* changes:
  DO NOT MERGE Network notifications: revamp keying scheme
  DO NOT MERGE Define Network notification proto constants.
  DO NOT MERGE Unit tests for NetworkNotificationManager
2016-12-19 08:25:32 +00:00
Hugo Benichi
64bc2580e3 Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev 2016-12-19 05:55:26 +00:00
Hugo Benichi
cdf3ba48cc Captive portals: login activity probes like NetworkMonitor
This patch changes CaptivePortalLoginActivity captive portal test to be
consistent with NetworkMonitor by:
 - using Network.java to open the http connection.
 - adding a UserAgent property to the request header.

Test: manually tested.
Bug: 32369183
Change-Id: I33cbcdab9809c712d998da6d925bdd4e3093f8ff
2016-12-19 09:19:13 +09:00
Joe Fernandez
206d947de9 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38
am: 536dc4ecc4

Change-Id: I431cc25fd1658a08497c562abefa05f55df9382f
2016-12-17 04:59:06 +00:00
Joe Fernandez
536dc4ecc4 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a
am: e161f75d38

Change-Id: I622c23e61f4e8db5a51a9d2425cc1fe379ec9505
2016-12-17 04:48:04 +00:00
Joe Fernandez
e161f75d38 docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e
am: 045ae0458a

Change-Id: I2257467a9b263897d2af594720de61d29a982709
2016-12-17 04:37:05 +00:00
Joe Fernandez
045ae0458a docs: Add deprecation message for the developer.android.com docs
am: b9bd6cca9e

Change-Id: I3ba7d4519c491bdf09836f096106b4a6bc52e116
2016-12-17 04:26:02 +00:00
Svet Ganov
5857a47008 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3
am: 0dca3a2fba

Change-Id: Ieb84f199c9cfe49045dc969a3c9a620037e7587a
2016-12-17 03:54:00 +00:00
Svet Ganov
0dca3a2fba [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753
am: 5034efbaf3

Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110
2016-12-17 03:42:58 +00:00
Svet Ganov
5034efbaf3 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours
am: c91845f753

Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1
2016-12-17 03:32:01 +00:00
Svet Ganov
c91845f753 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
am: c3db570a00  -s ours

Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544
2016-12-17 03:21:28 +00:00
Mark Lu
68b2be6105 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739
am: 1474527789

Change-Id: I0bf163508c4e936b2876cfdab59b47e1b3740f09
2016-12-17 02:29:14 +00:00
Mark Lu
2b77de3a44 docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
am: 58d24b22ed

Change-Id: I8e3a23304924623e2379155dcc7df1f739a5b7f0
2016-12-17 02:28:22 +00:00
Joe Fernandez
b9bd6cca9e docs: Add deprecation message for the developer.android.com docs
Change-Id: Ia091df49099482696abbc3a596cf1787ca904d67
2016-12-16 18:20:56 -08:00
Mark Lu
1474527789 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
am: 88e64bb739

Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f
2016-12-17 02:19:55 +00:00
Mark Lu
58d24b22ed docs: update description for BitmapFactory.Options#inBitmap
am: a8f4286272

Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430
2016-12-17 02:19:51 +00:00
Mark Lu
88e64bb739 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev 2016-12-17 02:04:28 +00:00
Justin Klaassen
868a859fd7 Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev 2016-12-17 02:00:26 +00:00
Mark Lu
a8f4286272 docs: update description for BitmapFactory.Options#inBitmap
bug: 18730109
Change-Id: Iab062d41af3a32208d3500179d3737278a035188
2016-12-16 15:43:27 -08:00
Kweku Adams
1decad5e8c Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev 2016-12-16 23:37:21 +00:00
Adrian Roos
31b96311bf Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev 2016-12-16 22:32:34 +00:00
Junda Liu
565fcb4b95 Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev 2016-12-16 22:24:19 +00:00
Adam Lesinski
45489787d7 Reset BatteryStats when too large for clients to handle
When BatteryStats history is too large, the Settings app crashes.
Reset the battery stats by marking an *OVERFLOW* event at the
beginning of the newly reset history.

This seems to happen in Retail mode when the devices are on charger
for an extended period of time and accumulate a sufficiently large
history. Resetting makes sense because the phone is most likely
charged and will reset anyways when unplugged.
Bug: 32540341
Test: Manual

Change-Id: I8c2892458b5d9ce64b1c44aa2e2a000340e71e63
2016-12-16 19:27:53 +00:00
Christine Franks
ee3af13cf2 Merge "Add config_demoModePassword" into nyc-mr2-dev 2016-12-16 19:10:59 +00:00
Kaori Katou
ed7bf5eecc Assist app is not launched when long-pressing on Home key
To get Assist component and launch it correctly,
The proper userId should be passed
to AssistUtils#getAssistComponentForUser().

Bug: 30777883
Test: manual - install LegacyAssistant app and long-press on Home key

Change-Id: I9f18ffdd9fc893235d77ed8145a765736a679478
(cherry picked from commit 70554e01c64101bb7e5a511be328ae774a6f451c)
2016-12-16 10:52:20 -08:00
Adrian Roos
6ce17fb072 Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev 2016-12-16 18:49:56 +00:00
Michal Karpinski
a775ad997b Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Bug: 29748723

(cherry picked from commit e4dfd2d0028ff1c7088ec58a4d3eaf8f222311e6)

Change-Id: Ib175f1d57093590b0080f32dc5f6c60ea50066e0
2016-12-16 18:18:57 +00:00
Pankaj Kanwar
99291e8f35 Merge "Notify user when user fails to connect to the network." into nyc-mr2-dev 2016-12-16 16:00:14 +00:00
TreeHugger Robot
2bfb3155d9 Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev 2016-12-16 08:53:57 +00:00
Mark Lu
ad7fe271ae Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4
am: b825c71446

Change-Id: I3bf4c7726b5221f7013e2df35d007f30e24dba17
2016-12-16 05:07:28 +00:00
Mark Lu
1c5a117342 docs: changes to broadcast documentation am: 33ec106d22
am: 377dab8ab3

Change-Id: I7dcb1bc57fb62f2b177c7ad15a9236da98fb749f
2016-12-16 05:06:37 +00:00
Mark Lu
b825c71446 Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
am: 7b22d549d4

Change-Id: I41ac74d65f48258c21afcbd39bf1eb518976a5f2
2016-12-16 04:59:10 +00:00
Mark Lu
377dab8ab3 docs: changes to broadcast documentation
am: 33ec106d22

Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
2016-12-16 04:59:08 +00:00
Ruben Brunk
27b53cfe88 Don't call into VrManagerService with AM lock.
Bug: 33655854
Merged-In: If777e0ef40b29bff42722f2aa10cff86a5831bc0
Change-Id: I365d0033cf20172cee57b0ef2a53dd8648640c8d
2016-12-15 20:50:32 -08:00
Mark Lu
7b22d549d4 Merge "docs: changes to broadcast documentation" into nyc-mr1-dev 2016-12-16 04:48:39 +00:00
Christine Franks
566525c6bb Add config_demoModePassword
Bug: 33340467
Test: aapt d resources framework-res.apk | grep config_demoModePassword
Change-Id: Ic2f4710e9a664be45afd3eba9ad94a4dfc5445f9
2016-12-15 18:04:35 -08:00
pkanwar
2b7a8a9ab0 Notify user when user fails to connect to the network.
Bug: 28572539
Change-Id: I1cb7c0481ecf804b80c9d4fe75f407eba9b205fb
2016-12-15 15:10:07 -08:00
Svet Ganov
c3db570a00 [DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
bug:33039926
bug:33042690

Change-Id: If0431b77ec546c72f8cc25bb605a851572bb22a6
2016-12-15 22:58:05 +00:00
Hall Liu
e6d5a19e5f Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev 2016-12-15 22:41:38 +00:00
Adrian Roos
23c46fb117 Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev 2016-12-15 22:22:57 +00:00
Michael Kwan
a14aa31ef5 Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am: 738fb65657

Change-Id: Ib2ab0dc43370d8387a56f2e3b3e3d50d44d7b772
2016-12-15 21:16:08 +00:00
Michael Kwan
4308eaa477 Fix swipe-to-dismiss to properly react to swipe gestures.
am: 8a9b27773b

Change-Id: I2b25052c22b5f50f95d0365eff4e3b2e27625b7f
2016-12-15 21:16:05 +00:00
Michael Kwan
738fb65657 Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev 2016-12-15 21:09:57 +00:00
Phil Weaver
718f403b50 Add null check to a11y interrupt.
am: 74f9e1b867

Change-Id: I8bb63b88a12ab6f8dfae42918ab9fdf4b1a457b5
2016-12-15 19:04:59 +00:00
Hugo Benichi
2299a1c401 DO NOT MERGE IP Connectivity metrics: add connect() statistics
This patch adds a ConnectStats class to aggregate connect() statistics
gathered in NetdEventListenerService. ConnectStats is uploaded once a
day by IpConnectivityMetrics.

Test: $ runtest frameworks-net + new unit test
Bug: 32198976

(cherry picked from commit 4f71a15973f7048076ed10f63d708f020e1a21e0)

Change-Id: I1450c126b90b628d9f1c73ddf054b4742f5e84c5
2016-12-15 22:56:36 +09:00
Michal Karpinski
92cd0ce92d DO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean
Fixes a potential race condition - when enabling/disabling the logging
some events might have been lost.

Bug: 29748723
Change-Id: I8a436d525393b2314805e287eddcea26d4ec073b
2016-12-15 12:54:36 +00:00
Hugo Benichi
93c0de0a35 DO NOT MERGE Fix IP connectivity metrics tests
So that test assumptions match previous changes in ipconnectivity.proto.

This patch also tags metrics tests with @SmallTest.

Test: $ runtest frameworks-net
Bug: 32561414
Bug: 32198976

(cherry picked from commit 80df43ea8a4286f2b7e0678be35dbca3f16f3766)

Change-Id: I8926a92248ac2d46fc78749afc40bc5f0de10878
2016-12-15 21:31:25 +09:00
Hugo Benichi
097bde6c8f DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
This patch introduces a ConnectStatistics message for collecting
Android devices connect() statistics.

It also changes DNS latency events to be grouped by (query_type,
query_return_value) to optimize space usage. For this purpose, a new
DNSLookupLatencies message is introduced and DNSLookupBatch is
deprecated. New counter fields are added for the number of queries,
and number of responses with A and AAAA records.

Test: manually taking a diff with reference ipconnectivity.proto
Bug: 32198976

(cherry picked from commit 7c3a7869218216fceccb7fba983bc022e556df21)

Change-Id: I54403377bc5d4c7a1c77b563c588e5210edf56e5
2016-12-15 21:31:25 +09:00