OSDN Git Service
Philipp Weiß [Tue, 20 Dec 2016 19:52:04 +0000 (19:52 +0000)]
Merge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev
phweiss [Wed, 14 Dec 2016 20:37:48 +0000 (21:37 +0100)]
DO NOT MERGE Show notification when network logging is enabled
A notification is shown after network logging is enabled
and after the next three reboots that are at least one day apart.
Clicking it sends an intent to quick settings to shown its device monitoring
dialog.
Cherry-picked from master.
Bug:
29748723
Bug:
33126577
(cherry-picked from commit
a0cb251ca6a8ea8df17ff8089573bc50f2f1849f)
Test: Manual, CTS-Verifier tests will be added later
Change-Id: I2bf517bd27ab23ad3f66270602dbf062efab8cbb
Philipp Weiß [Tue, 20 Dec 2016 17:57:34 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev
Tony Mak [Wed, 2 Nov 2016 10:26:45 +0000 (10:26 +0000)]
DO NOT MERGE: Cross profile candidate should be considered
Bug:
32547783
Fixed the regression introduced in
8e2d9d1d9050e93b15c54e992698325c7d4aa57c
Test: Manual test - Open a map link in work calendar, personal map is shown as an option.
Change-Id: If5651b5e09cf1916813e8f91dbdcdf53f9119ef2
(cherry picked from commit
9f2c93663c2de84f958eebef96a98458ebaf51a9)
phweiss [Fri, 2 Dec 2016 13:31:04 +0000 (14:31 +0100)]
DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings
If a device owner is active, the layout is changed from a
standard AlertDialog with only one string to a custom dialog
that includes information on Device Owners, and VPN and Network Logging,
if enabled.
Cherry-picked from master and modified to not rely on changes that are not in
N:
A change in master renamed some variables in QSFooter.createDialog() and made
them final, this change is also included here.
The owner's organization name cannot be set in N.
In the case of active Device Owner and active VPN, there was a specialized
string for this in N. This string was now replaced by using the simpler
Device Owner string + an own entry for VPN in the new layout.
Some imports had to be included that were already there on master.
The dimen-tag throws an error message on floats during build, replaced by an
item-tag.
BUG:
29748723
BUG:
33126622
Test: Manual, CTS-Verifier tests will be added later
(cherry picked from commit
9e450e12330d4cfe7843613c79f1c3671d08305f)
Change-Id: I2bfca9d9d02a42d9c3b17683625eda29e9369666
Hugo Benichi [Tue, 20 Dec 2016 00:57:43 +0000 (09:57 +0900)]
DO NOT MERGE Stricter NetworkNotificationManagerTest
This patch changes NetworkNotificationManagerTest to populate extraInfo
of NetworkInfo in order to catch regressions in malformed format Strings
of log statements in NetworkNotificationManager.
Test: verified that the test fails when reintroducing the format String
bug.
Bug:
33737715
Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a
TreeHugger Robot [Tue, 20 Dec 2016 04:58:51 +0000 (04:58 +0000)]
Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev
* changes:
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
DO NOT MERGE Fix malformed log statement.
Paul Stewart [Mon, 19 Dec 2016 16:45:32 +0000 (08:45 -0800)]
DO NOT MERGE Fix other String.format issues in NetworkNotificationManager.java
Commit
fb2609d3eee1c7a4dda889c000f32183a044978a added a string
format which caused an exception. On top of the fixes to this
from
e1406167186c2cabe683b3c1511ad6733e9106c9, we can also fix
a few more issues here with some missing arguments to other
String.format invocations in the aforementioned CL, and other
formatting problems.
Bug:
33737715
Test: Build and run SUW
(cherry picked from commit
835cb49639fc7cb75819564fa15f2f5a0bd5dee2)
Change-Id: I40064d3e1a0f0300c43bdbc51839b579a5394a36
Joe LaPenna [Mon, 19 Dec 2016 18:31:14 +0000 (10:31 -0800)]
DO NOT MERGE Fix malformed log statement.
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f
BUG:
33746580
Test: built, triggered notification, no crash.
(cherry picked from commit
e1406167186c2cabe683b3c1511ad6733e9106c9)
Change-Id: I50594ad865e6f95abc5c67c58af604ef2aa88f9b
Chris Tate [Tue, 20 Dec 2016 01:01:52 +0000 (01:01 +0000)]
Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev
Christopher Tate [Mon, 19 Dec 2016 22:38:44 +0000 (14:38 -0800)]
Migrate system+lock wallpaper to lock-only when setting live wp
If the static imagery is shared between system+lock, preserve the lock
presentation when setting a different system-surface live wallpaper. If
the caller knows it wants to achieve system+lock display of the new live
wallpaper, it follows up setWallpaperComponent() with an explicit clear
of the lock wallpaper state.
Previously, setting a new system live wallpaper would necessarily override
a desired static lock image in the case of system+lock shared imagery.
Now it doesn't.
Bug
32664317
Change-Id: I7ef2cded534f9e6e91899db4c37bd24efaf09fee
TreeHugger Robot [Mon, 19 Dec 2016 20:59:12 +0000 (20:59 +0000)]
Merge "Start sensor service in a seperate thread" into nyc-mr2-dev
Mark Lu [Mon, 19 Dec 2016 20:28:59 +0000 (20:28 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev am:
cbfb58c9d7
am:
70fa908fb2
Change-Id: I1eab802afe75f847555baa8964030a1bb994107a
Mark Lu [Mon, 19 Dec 2016 20:27:52 +0000 (20:27 +0000)]
docs: remove implicit intent from bindService and startService am:
94ebbe0e58
am:
d7c29565ba
Change-Id: I44109d60ff26725daf6ebbce50bac9a7068146fe
Mark Lu [Mon, 19 Dec 2016 20:22:00 +0000 (20:22 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
am:
cbfb58c9d7
Change-Id: If12008d4e9fe1883c6c4f21e6e6736045b325182
Mark Lu [Mon, 19 Dec 2016 20:21:57 +0000 (20:21 +0000)]
docs: remove implicit intent from bindService and startService
am:
94ebbe0e58
Change-Id: Iaf24452f3456703c917a2a574ff218c9eac854bd
Mark Lu [Mon, 19 Dec 2016 20:21:21 +0000 (20:21 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am:
5f05256106
am:
9c834b1241
Change-Id: I3288982f953f36ae08a36ca324edb6937633bd18
Mark Lu [Mon, 19 Dec 2016 20:16:15 +0000 (20:16 +0000)]
docs: update Paint.setTextSize() to indicate pixel units
am:
5f05256106
Change-Id: I9709ea36fe7657c8a06abe1c58760b30112e0e63
Mark Lu [Mon, 19 Dec 2016 20:13:15 +0000 (20:13 +0000)]
Merge "docs: remove implicit intent from bindService and startService" into nyc-mr1-dev
Brad Ebinger [Mon, 19 Dec 2016 19:53:00 +0000 (19:53 +0000)]
Merge "Add UI prompt for MMI code failure on 3gpp" into nyc-mr2-dev
Charles Mendis [Mon, 19 Dec 2016 19:11:47 +0000 (19:11 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
am:
a586b546c3
Change-Id: I32b15e3ab326700434f488aad7f6e8f05bfa153e
Michael Kwan [Mon, 19 Dec 2016 19:11:45 +0000 (19:11 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss.
am:
67639a5f67
Change-Id: I8ceab83a3a8287bdf8d2a7ff88427404543755c9
Charles Mendis [Mon, 19 Dec 2016 19:05:49 +0000 (19:05 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
Marie Janssen [Mon, 19 Dec 2016 17:58:38 +0000 (17:58 +0000)]
Merge changes I546d7abc,I32163278 into nyc-mr2-dev
* changes:
Bluetooth: fix issues re-enabling after crash
Bluetooth: log message improvements
Philipp Weiß [Mon, 19 Dec 2016 17:57:13 +0000 (17:57 +0000)]
Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev
Daniel Sandler [Mon, 19 Dec 2016 16:44:09 +0000 (16:44 +0000)]
Merge "Avoid NPE in notification inline controls." into nyc-mr2-dev
TreeHugger Robot [Mon, 19 Dec 2016 13:43:07 +0000 (13:43 +0000)]
Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" into nyc-mr2-dev
Hugo Benichi [Mon, 19 Dec 2016 08:31:10 +0000 (08:31 +0000)]
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.
Hugo Benichi [Mon, 19 Dec 2016 08:25:25 +0000 (08:25 +0000)]
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
Hugo Benichi [Mon, 19 Dec 2016 05:55:21 +0000 (05:55 +0000)]
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev
Hugo Benichi [Tue, 13 Dec 2016 23:23:40 +0000 (08:23 +0900)]
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
Mark Lu [Wed, 14 Dec 2016 00:29:51 +0000 (16:29 -0800)]
docs: remove implicit intent from bindService and startService
bug:
18295867
Change-Id: Ib4b561dd215f4b124ce9a90b446bc03676f7e00a
Mark Lu [Fri, 16 Dec 2016 22:23:47 +0000 (14:23 -0800)]
docs: update Paint.setTextSize() to indicate pixel units
bug:
2321154
Change-Id: Ic71404677a8079c744b99d4848d69c6ff52089ab
Joe Fernandez [Sat, 17 Dec 2016 04:59:06 +0000 (04:59 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38
am:
536dc4ecc4
Change-Id: I431cc25fd1658a08497c562abefa05f55df9382f
Joe Fernandez [Sat, 17 Dec 2016 04:48:04 +0000 (04:48 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a
am:
e161f75d38
Change-Id: I622c23e61f4e8db5a51a9d2425cc1fe379ec9505
Joe Fernandez [Sat, 17 Dec 2016 04:37:05 +0000 (04:37 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e
am:
045ae0458a
Change-Id: I2257467a9b263897d2af594720de61d29a982709
Joe Fernandez [Sat, 17 Dec 2016 04:26:02 +0000 (04:26 +0000)]
docs: Add deprecation message for the developer.android.com docs
am:
b9bd6cca9e
Change-Id: I3ba7d4519c491bdf09836f096106b4a6bc52e116
Svet Ganov [Sat, 17 Dec 2016 03:54:00 +0000 (03:54 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3
am:
0dca3a2fba
Change-Id: Ieb84f199c9cfe49045dc969a3c9a620037e7587a
Svet Ganov [Sat, 17 Dec 2016 03:42:58 +0000 (03:42 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753
am:
5034efbaf3
Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110
Svet Ganov [Sat, 17 Dec 2016 03:32:01 +0000 (03:32 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours
am:
c91845f753
Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1
Svet Ganov [Sat, 17 Dec 2016 03:21:28 +0000 (03:21 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
am:
c3db570a00 -s ours
Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544
Mark Lu [Sat, 17 Dec 2016 02:29:14 +0000 (02:29 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739
am:
1474527789
Change-Id: I0bf163508c4e936b2876cfdab59b47e1b3740f09
Mark Lu [Sat, 17 Dec 2016 02:28:22 +0000 (02:28 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am:
a8f4286272
am:
58d24b22ed
Change-Id: I8e3a23304924623e2379155dcc7df1f739a5b7f0
Joe Fernandez [Sat, 17 Dec 2016 02:20:56 +0000 (18:20 -0800)]
docs: Add deprecation message for the developer.android.com docs
Change-Id: Ia091df49099482696abbc3a596cf1787ca904d67
Mark Lu [Sat, 17 Dec 2016 02:19:55 +0000 (02:19 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
am:
88e64bb739
Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f
Mark Lu [Sat, 17 Dec 2016 02:19:51 +0000 (02:19 +0000)]
docs: update description for BitmapFactory.Options#inBitmap
am:
a8f4286272
Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430
Mark Lu [Sat, 17 Dec 2016 02:04:23 +0000 (02:04 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
Justin Klaassen [Sat, 17 Dec 2016 02:00:21 +0000 (02:00 +0000)]
Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev
Wei Wang [Tue, 29 Nov 2016 19:53:53 +0000 (11:53 -0800)]
Start sensor service in a seperate thread
StartSensorService is taking ~141.8ms on marlin to start
With this CL, StartSensor will be done in a seperate
thread so the SystemServer can continue booting
Bug:
33199244
Bug:
33623300
Test: on marlin
Change-Id: I9e486d61e85072d5cbe69b1671c8fbfeca9c2200
(cherry picked from commit
f94016d91b1001b7575a7063934ec47edefb79a9)
Brad Ebinger [Fri, 9 Dec 2016 21:18:30 +0000 (13:18 -0800)]
Add UI prompt for MMI code failure on 3gpp
Some carriers do not support call forwarding MMI codes while roaming
on 3gpp networks. A new message has been added that clarifies this
to the user.
Test: Manual
Bug:
30106345
Merged-In: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
Change-Id: Id8d3434b02346eaad4f52d514a3269b5750ca1c3
Mark Lu [Fri, 16 Dec 2016 23:43:27 +0000 (15:43 -0800)]
docs: update description for BitmapFactory.Options#inBitmap
bug:
18730109
Change-Id: Iab062d41af3a32208d3500179d3737278a035188
Kweku Adams [Fri, 16 Dec 2016 23:37:17 +0000 (23:37 +0000)]
Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev
Adrian Roos [Fri, 16 Dec 2016 22:32:31 +0000 (22:32 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev
Junda Liu [Fri, 16 Dec 2016 22:24:16 +0000 (22:24 +0000)]
Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev
Michael Kwan [Fri, 16 Dec 2016 20:38:10 +0000 (12:38 -0800)]
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
Adam Lesinski [Fri, 16 Dec 2016 07:45:17 +0000 (23:45 -0800)]
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
Marie Janssen [Thu, 15 Dec 2016 21:51:30 +0000 (13:51 -0800)]
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
Marie Janssen [Tue, 13 Dec 2016 18:51:02 +0000 (10:51 -0800)]
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
Christine Franks [Fri, 16 Dec 2016 19:10:56 +0000 (19:10 +0000)]
Merge "Add config_demoModePassword" into nyc-mr2-dev
Kaori Katou [Thu, 4 Aug 2016 08:11:07 +0000 (17:11 +0900)]
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)
Adrian Roos [Fri, 16 Dec 2016 18:49:53 +0000 (18:49 +0000)]
Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev
phweiss [Thu, 24 Nov 2016 15:20:57 +0000 (16:20 +0100)]
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
Michal Karpinski [Fri, 16 Dec 2016 17:06:42 +0000 (17:06 +0000)]
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
Pankaj Kanwar [Fri, 16 Dec 2016 16:00:12 +0000 (16:00 +0000)]
Merge "Notify user when user fails to connect to the network." into nyc-mr2-dev
TreeHugger Robot [Fri, 16 Dec 2016 08:53:54 +0000 (08:53 +0000)]
Merge "Don't call into VrManagerService with AM lock." into nyc-mr2-dev
Mark Lu [Fri, 16 Dec 2016 05:07:28 +0000 (05:07 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4
am:
b825c71446
Change-Id: I3bf4c7726b5221f7013e2df35d007f30e24dba17
Mark Lu [Fri, 16 Dec 2016 05:06:37 +0000 (05:06 +0000)]
docs: changes to broadcast documentation am:
33ec106d22
am:
377dab8ab3
Change-Id: I7dcb1bc57fb62f2b177c7ad15a9236da98fb749f
Mark Lu [Fri, 16 Dec 2016 04:59:10 +0000 (04:59 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
am:
7b22d549d4
Change-Id: I41ac74d65f48258c21afcbd39bf1eb518976a5f2
Mark Lu [Fri, 16 Dec 2016 04:59:08 +0000 (04:59 +0000)]
docs: changes to broadcast documentation
am:
33ec106d22
Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
Ruben Brunk [Fri, 16 Dec 2016 01:55:40 +0000 (17:55 -0800)]
Don't call into VrManagerService with AM lock.
Bug:
33655854
Merged-In: If777e0ef40b29bff42722f2aa10cff86a5831bc0
Change-Id: I365d0033cf20172cee57b0ef2a53dd8648640c8d
Mark Lu [Fri, 16 Dec 2016 04:48:36 +0000 (04:48 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
Christine Franks [Thu, 8 Dec 2016 23:33:01 +0000 (15:33 -0800)]
Add config_demoModePassword
Bug:
33340467
Test: aapt d resources framework-res.apk | grep config_demoModePassword
Change-Id: Ic2f4710e9a664be45afd3eba9ad94a4dfc5445f9
pkanwar [Tue, 13 Dec 2016 20:06:41 +0000 (12:06 -0800)]
Notify user when user fails to connect to the network.
Bug:
28572539
Change-Id: I1cb7c0481ecf804b80c9d4fe75f407eba9b205fb
Svet Ganov [Thu, 15 Dec 2016 22:51:17 +0000 (14:51 -0800)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
bug:
33039926
bug:
33042690
Change-Id: If0431b77ec546c72f8cc25bb605a851572bb22a6
Hall Liu [Thu, 15 Dec 2016 22:41:34 +0000 (22:41 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev
Adrian Roos [Thu, 15 Dec 2016 22:22:53 +0000 (22:22 +0000)]
Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev
Michael Kwan [Thu, 15 Dec 2016 21:16:08 +0000 (21:16 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am:
738fb65657
Change-Id: Ib2ab0dc43370d8387a56f2e3b3e3d50d44d7b772
Michael Kwan [Thu, 15 Dec 2016 21:16:05 +0000 (21:16 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures.
am:
8a9b27773b
Change-Id: I2b25052c22b5f50f95d0365eff4e3b2e27625b7f
Michael Kwan [Thu, 15 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
Phil Weaver [Thu, 15 Dec 2016 19:04:59 +0000 (19:04 +0000)]
Add null check to a11y interrupt.
am:
74f9e1b867
Change-Id: I8bb63b88a12ab6f8dfae42918ab9fdf4b1a457b5
Hugo Benichi [Fri, 25 Nov 2016 02:24:22 +0000 (11:24 +0900)]
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
Michal Karpinski [Thu, 15 Dec 2016 10:30:18 +0000 (10:30 +0000)]
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
Hugo Benichi [Thu, 24 Nov 2016 02:28:06 +0000 (11:28 +0900)]
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
Hugo Benichi [Thu, 24 Nov 2016 02:34:49 +0000 (11:34 +0900)]
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
Hugo Benichi [Thu, 24 Nov 2016 02:25:01 +0000 (11:25 +0900)]
DO NOT MERGE IP connectivity metrics: add transport field.
This patch adds a transport field dimension to IpConnectivityEvent for
replacing interface name, and eventually network ids.
At the moment the transport field is not populated.
Test: manually taking a diff against reference ipconnectivity.proto
Bug:
32198976
(cherry picked from commit
807124a7f5891b8be5496d9fae3c6c5fdd9f5492)
Change-Id: Idf2167973c322153659b8e755d8be973e70d972a
Hugo Benichi [Mon, 31 Oct 2016 06:04:37 +0000 (15:04 +0900)]
DO NOT MERGE Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug:
32198976
(cherry picked from commit
8b06bcdfd24100302818ae0e11ee751dd813d5cf)
Change-Id: I527f98c28b31f490ea999222ef8d0b685a2f24ed
Hugo Benichi [Thu, 8 Dec 2016 00:36:52 +0000 (09:36 +0900)]
DO NOT MERGE Network notifications: revamp keying scheme
This patch changes the (tag: String, id: Int) keying scheme for network
notifications so that TRON notification counters can count network
related notifications unambiguously.
TRON instruments all notifications shown for package "android" as well
as user interactions with these Notifications. These counters are
grouped by id. However the network notifications ("no internet" dialog,
"captive portal sign in" dialog, ...) use a static tag and a dynamic id
for keying notifications, preventing the counters to correctly
aggregate. In addition there is also the risk of collision with other
SystemUi notification ids not managed by NetworkNotificationManager.
In order to make the TRON counters useful for network notifications,
the id is now encoding the network notification type in a stable way
while the tag is used to uniquely identify network notifications.
Test: change covered by previously added new unit tests.
Bug:
32198726
Bug:
33030620
(cherry picked from commit
fb2609d3eee1c7a4dda889c000f32183a044978a)
Change-Id: Iadf7f15da38de28587090ed0395f15c24d4ad442
TreeHugger Robot [Thu, 15 Dec 2016 10:03:44 +0000 (10:03 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity." into nyc-mr2-dev
Erik Kline [Wed, 19 Oct 2016 08:42:01 +0000 (17:42 +0900)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug:
21859053
Bug:
26101306
Bug:
31742572
Bug:
31707128
Bug:
33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
Phil Weaver [Wed, 2 Nov 2016 22:40:42 +0000 (15:40 -0700)]
Add null check to a11y interrupt.
Also adding same robustness to interrupt that we have for
sending a11y events.
Bug:
32507871
Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit
867ad35d9c676b5ba2047b0fc9a4006737e5c4aa)
Hugo Benichi [Thu, 8 Dec 2016 00:36:52 +0000 (09:36 +0900)]
DO NOT MERGE Define Network notification proto constants.
This patch defines 4 new constants in metrics_constants.proto
corresponding to the 4 network notifications shown by
NetworkNotificationManager.
Estimates for the average number of notifications:
- SIGN_IN: 3/day/device
- NO_INTERNET: 5/day/device
- LOST_INTERNET: 5/day/device
- NETWORK_SWITCH: 3/day/device (turned off right now)
Test: no functional change
Bug:
32198726
Bug:
33030620
(cherry pick from commit
74264329da5c52fbbafc1d20457056fdeabe19dc)
Change-Id: I74702938694fea9b573524d1a2ae3c20ce52b54d
Hugo Benichi [Wed, 7 Dec 2016 05:49:55 +0000 (14:49 +0900)]
DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug:
32198726
(cherry picked from commit
74264329da5c52fbbafc1d20457056fdeabe19dc)
Change-Id: Ib8a725cdd8c708ccb9cffad62321e0db8b27e593
Bill Yi [Thu, 15 Dec 2016 02:56:18 +0000 (18:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5a8c801eacef878f41a988ed655e6fa367909033
Auto-generated-cl: translation import
Wei Huang [Tue, 1 Mar 2016 09:02:40 +0000 (17:02 +0800)]
Adds carrier config to determine if high definition audio is displayed
Adds a carrier config option to remove HD audio property from a
connection so that HD audio related UI is not displayed
even if connection has High Definition audio support.
Bug:
28654645
Bug:
33062999
Change-Id: I71f35854d35ae73741a36c0e2106695b04471b2e
Dan Sandler [Thu, 10 Nov 2016 16:42:34 +0000 (11:42 -0500)]
Avoid NPE in notification inline controls.
Specifically, notifications that come from essential parts
of the system that cannot be blocked or silenced.
Fixes:
32384422
Test: manual: longpress Clock notification, press DONE
Change-Id: Ic43cf90d4d7940b1cbfcedb6934567b799efd12b
Adrian Roos [Sat, 10 Dec 2016 00:10:19 +0000 (16:10 -0800)]
FalsingLog: Fix false positive Log.wtfs
Fixes a frequent case where we do not get notified immediately of the
screen turning on and log a WTF as a result when a touch makes it
through to the lockscreen.
Change-Id: I5437aa0283d78624ffb3a43404e7248b7e91372c
Fixes:
32575746
Kweku Adams [Sat, 10 Dec 2016 03:04:50 +0000 (19:04 -0800)]
Fixing issue in current and max duration calculations.
It looks like one operation was done out of order and some of the times used in
the calculations were leading to incorrect results.
BUG:
31023263
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsDurationTimerTest
Change-Id: I417cc28c5a55748067b6c7f682a66fe3dbc09f09
(cherry picked from commit
47db5a8bf74a77306b811d14e3c052cdf86ef704)
Julius D'souza [Wed, 14 Dec 2016 19:24:01 +0000 (19:24 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71 am:
8cc9f081aa
am:
1838237435
Change-Id: I1db5fee4adb196ff725815c3e4182f7e661e6d26
Julius D'souza [Wed, 14 Dec 2016 19:18:04 +0000 (19:18 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7 am:
20081c4e71
am:
8cc9f081aa
Change-Id: I39ecaf420d8bc4390c737fd378fd0e32202e2d8c
Julius D'souza [Wed, 14 Dec 2016 19:11:59 +0000 (19:11 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am:
e6f8cb29ec -s ours am:
7a69e8f3d8 am:
af0b547fc7
am:
20081c4e71
Change-Id: I5e461a835cf64ba69894da2c5493a9d8a1ebcbcf