257620 Commits

Author SHA1 Message Date
Charles Mendis
5109de9bd3 Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
am: a586b546c3

Change-Id: I32b15e3ab326700434f488aad7f6e8f05bfa153e
2016-12-19 19:11:47 +00:00
Michael Kwan
a2160c27f9 Fix OnCancelListener for Dialogs on swipe to dismiss.
am: 67639a5f67

Change-Id: I8ceab83a3a8287bdf8d2a7ff88427404543755c9
2016-12-19 19:11:45 +00:00
Charles Mendis
a586b546c3 Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev 2016-12-19 19:05:53 +00:00
Marie Janssen
df37f1fa74 Merge changes I546d7abc,I32163278 into nyc-mr2-dev
* changes:
  Bluetooth: fix issues re-enabling after crash
  Bluetooth: log message improvements
2016-12-19 17:58:43 +00:00
Philipp Weiß
f84f98c4e2 Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev 2016-12-19 17:57:16 +00:00
Daniel Sandler
be09dd77dc Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev 2016-12-19 16:44:12 +00:00
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
Michael Kwan
67639a5f67 Fix OnCancelListener for Dialogs on swipe to dismiss.
Swipe to dismiss on dialogs did not dispatch onCancel events
to OnCancelListeners. Resolve by adding listener to monitor
swipe to dismiss events and dispatch onCancel events when
that occurs.

Bug: 33663411
Change-Id: I64ff29e008d485a4559eb3d1ff7f0e74dccff404
2016-12-16 13:43:16 -08: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
Marie Janssen
fa63068deb Bluetooth: fix issues re-enabling after crash
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance.  In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.

Luckily in this case the persisted system state is also ON.  Use the
persisted state as information about whether we should be fully enabled.

Test: basic sanity check, forced crash of BT
Bug: 33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
2016-12-16 11:23:30 -08:00
Marie Janssen
ffcf88f36e Bluetooth: log message improvements
Some log improvements:
 - Reduce logspam
 - Use names for states in logs instead of numbers
 - Be more consistent with messages

Also remove some commented out dead code.

Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
2016-12-16 11:22:04 -08: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
phweiss
c94b637305 DO NOT MERGE Add network logging icon to Quicksettings when enabled
Add the network logging icon in Quick Settings' footer if
network logging is enabled, possible next to the VPN icon.
Quicksettings has to be able to tell that network logging
is enabled, so this CL changes DPM.isNetworkLoggingEnabled() to be
callable from the device owner or from any app with the MANAGE_USERS
permission.

The icon is only a placeholder until the official icon is finished.

CTS Verifier tests will be added when all Network logging UX changes are
done.

Cherry-picked from master, and then modified to work in N:
I had to remove the QSFooterTest change because the testing infrastructure
is not there in N. Also, I had to add DPMS.enforceDeviceOwnerOrManageUsers()
to which did not exist in N before.

BUG: 33126618
BUG: 29748723
Test: Manual, CTS-Verifier tests will be added in a follow-up

(cherry picked from commit a4e169ed68ee57aa249e5e79fcd6bff5df46199e)

Change-Id: Ib35d323605ab11f883a4b6199d1db79b9e53c49b
2016-12-16 19:25:29 +01: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