OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled" 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

7 years agoMerge changes I1450c126,I8926a922,I54403377,Idf216797 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.

7 years agoMerge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
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

7 years agoMerge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev
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

7 years agoCaptive portals: login activity probes like NetworkMonitor
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

7 years agodocs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am...
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

7 years agodocs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am...
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

7 years agodocs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e
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

7 years agodocs: Add deprecation message for the developer.android.com docs
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
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

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1...
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

7 years agodocs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
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

7 years agodocs: Add deprecation message for the developer.android.com docs
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

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
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

7 years agodocs: update description for BitmapFactory.Options#inBitmap
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

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
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

7 years agoMerge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-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

7 years agodocs: update description for BitmapFactory.Options#inBitmap
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

7 years agoMerge "Fixing issue in current and max duration calculations." into nyc-mr2-dev
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

7 years agoMerge "Assist app is not launched when long-pressing on Home key" 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

7 years agoMerge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." 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

7 years agoReset BatteryStats when too large for clients to handle
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

7 years agoMerge "Add config_demoModePassword" into nyc-mr2-dev
Christine Franks [Fri, 16 Dec 2016 19:10:56 +0000 (19:10 +0000)]
Merge "Add config_demoModePassword" into nyc-mr2-dev

7 years agoAssist app is not launched when long-pressing on Home key
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)

7 years agoMerge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev
Adrian Roos [Fri, 16 Dec 2016 18:49:53 +0000 (18:49 +0000)]
Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev

7 years agoInitialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled
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

7 years agoMerge "Notify user when user fails to connect to the network." into nyc-mr2-dev
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

7 years agoMerge "Don't call into VrManagerService with AM lock." 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

7 years agoMerge "docs: changes to broadcast documentation" into nyc-mr1-dev am: 7b22d549d4
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

7 years agodocs: changes to broadcast documentation am: 33ec106d22
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

7 years agoMerge "docs: changes to broadcast documentation" into nyc-mr1-dev
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

7 years agodocs: changes to broadcast documentation
Mark Lu [Fri, 16 Dec 2016 04:59:08 +0000 (04:59 +0000)]
docs: changes to broadcast documentation
am: 33ec106d22

Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987

7 years agoDon't call into VrManagerService with AM lock.
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

7 years agoMerge "docs: changes to broadcast documentation" into nyc-mr1-dev
Mark Lu [Fri, 16 Dec 2016 04:48:36 +0000 (04:48 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev

7 years agoAdd config_demoModePassword
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

7 years agoNotify user when user fails to connect to the network.
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

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
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

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed" into...
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

7 years agoMerge "DirectReply: Show bouncer when occluded" 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

7 years agoMerge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-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

7 years agoFix swipe-to-dismiss to properly react to swipe gestures.
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

7 years agoMerge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
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

7 years agoAdd null check to a11y interrupt.
Phil Weaver [Thu, 15 Dec 2016 19:04:59 +0000 (19:04 +0000)]
Add null check to a11y interrupt.
am: 74f9e1b867

Change-Id: I8bb63b88a12ab6f8dfae42918ab9fdf4b1a457b5

7 years agoDO NOT MERGE IP Connectivity metrics: add connect() statistics
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

7 years agoDO NOT MERGE Make NetworkLogger.mIsLoggingEnabled an AtomicBoolean
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

7 years agoDO NOT MERGE Fix IP connectivity metrics tests
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

7 years agoDO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
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

7 years agoDO NOT MERGE IP connectivity metrics: add transport field.
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

7 years agoDO NOT MERGE Netd events: record connect() success/errno
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

7 years agoDO NOT MERGE Network notifications: revamp keying scheme
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

7 years agoMerge "Have IpManager track L2-L4 signaling traffic required for IP connectivity...
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

7 years agoHave IpManager track L2-L4 signaling traffic required for IP connectivity.
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

7 years agoAdd null check to a11y interrupt.
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)

7 years agoDO NOT MERGE Define Network notification proto constants.
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

7 years agoDO NOT MERGE Unit tests for NetworkNotificationManager
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoAdds carrier config to determine if high definition audio is displayed
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

7 years agoFalsingLog: Fix false positive Log.wtfs
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

7 years agoFixing issue in current and max duration calculations.
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)

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
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

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
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

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
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

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
Julius D'souza [Wed, 14 Dec 2016 19:06:29 +0000 (19:06 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours am: 7a69e8f3d8
am: af0b547fc7

Change-Id: I23ef765ebbd2dde2110946fcc46c6b61e11733f2

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec ...
Julius D'souza [Wed, 14 Dec 2016 19:00:38 +0000 (19:00 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours
am: 7a69e8f3d8

Change-Id: I581e1cd6ef0dec7042802b29dd76db8ffc02cec3

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController
Julius D'souza [Wed, 14 Dec 2016 18:54:02 +0000 (18:54 +0000)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController
am: e6f8cb29ec  -s ours

Change-Id: Ia7bdba0fd3d52bb2d7c33f81d376336563f3a5cb

7 years agofix case issues with mGoingIdleWakeLock in DeviceIdleController
Julius D'souza [Wed, 14 Dec 2016 18:30:25 +0000 (10:30 -0800)]
fix case issues with mGoingIdleWakeLock in DeviceIdleController

Bug: 31900521

Change-Id: I9484b10f0e6b99dfaf11266bb275a31d7ff3868c

7 years agoDO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle...
Julius D'souza [Wed, 14 Dec 2016 18:15:47 +0000 (18:15 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8  -s ours am: 589f83e686  -s ours am: 495aa09cc6  -s ours am: 10a9005003  -s ours am: 03c946e06b  -s ours
am: c2aed112a7  -s ours

Change-Id: Icf2354559cf4c0cac6d61d89378b00e9831e9e14

7 years agoMerge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev
Philip P. Moltmann [Wed, 14 Dec 2016 18:13:31 +0000 (18:13 +0000)]
Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev

* changes:
  Do not write if apply() did not change the file.
  Only persist last Shared Preferences state

7 years agoDO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle...
Julius D'souza [Wed, 14 Dec 2016 18:09:25 +0000 (18:09 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8  -s ours am: 589f83e686  -s ours am: 495aa09cc6  -s ours am: 10a9005003  -s ours
am: 03c946e06b  -s ours

Change-Id: I75323469d9e15ea3b8652bb5f972d0e14a06cc7a

7 years agoDO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle...
Julius D'souza [Wed, 14 Dec 2016 18:03:26 +0000 (18:03 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8  -s ours am: 589f83e686  -s ours am: 495aa09cc6  -s ours
am: 10a9005003  -s ours

Change-Id: I7a1d2d5b60b27765b2381e6d85fd3f8e967a40e1

7 years agoDO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle...
Julius D'souza [Wed, 14 Dec 2016 17:56:53 +0000 (17:56 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8  -s ours am: 589f83e686  -s ours
am: 495aa09cc6  -s ours

Change-Id: I0f1a50fac9a6fc8a5c21b890aaa3aea5ea2aca74

7 years agoDO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle...
Julius D'souza [Wed, 14 Dec 2016 17:51:28 +0000 (17:51 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8  -s ours
am: 589f83e686  -s ours

Change-Id: I76a619ed9824174735d0a86c55fe13a3d6e90ec5

7 years agoDO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle.
Julius D'souza [Wed, 14 Dec 2016 17:44:27 +0000 (17:44 +0000)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle.
am: f9f39cc4a8  -s ours

Change-Id: Ibd0b18a9e833afcc85845f4db57a927e80739cc2

7 years agoMerge "More correct startup and shutdown procedures." into nyc-mr2-dev
TreeHugger Robot [Wed, 14 Dec 2016 11:33:35 +0000 (11:33 +0000)]
Merge "More correct startup and shutdown procedures." into nyc-mr2-dev

7 years agoMerge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev
Michal Karpinski [Wed, 14 Dec 2016 10:44:19 +0000 (10:44 +0000)]
Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev

* changes:
  DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
  DO NOT MERGE Fix Lint errors for network logging API
  DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
  DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users
  DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
  DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
  DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
  DO NOT MERGE [DPM] Management and retrieval of network logs
  DO NOT MERGE [DPM] DO can start network logging and listen for events

7 years agoMore correct startup and shutdown procedures.
Erik Kline [Mon, 12 Dec 2016 12:21:40 +0000 (21:21 +0900)]
More correct startup and shutdown procedures.

During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.

During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.

Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710

7 years agoMerge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev
TreeHugger Robot [Wed, 14 Dec 2016 08:22:29 +0000 (08:22 +0000)]
Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev

7 years agoMerge "Display "Sign into network" in settings when on a captive portal." into nyc...
Lorenzo Colitti [Wed, 14 Dec 2016 04:48:36 +0000 (04:48 +0000)]
Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev

7 years agodocs: changes to broadcast documentation
Mark Lu [Mon, 5 Dec 2016 18:57:55 +0000 (10:57 -0800)]
docs: changes to broadcast documentation

- move BroadcastReceiver info to developer guide. see cl/140402421
- add usage note to CONNECTIVITY_ACTION broadcast

bug:32533262
bug:33106411

Change-Id: Ic2aa517831d29418e0c42aa6fc1e7f9aeb50f802

7 years agoDO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController
Julius D'souza [Tue, 13 Dec 2016 01:15:17 +0000 (17:15 -0800)]
DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController
is going idle.

The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it.  But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.

It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.

Bug: 31900521
Change-Id: I706045aa189147824c9214c57abc13993aee9a5b

7 years agoFix VR interaction with screen on/off/lockscreen.
Ruben Brunk [Sat, 29 Oct 2016 03:18:57 +0000 (20:18 -0700)]
Fix VR interaction with screen on/off/lockscreen.

- Add mechanism to prevent VR mode from being enabled.
- Disable VR mode while screen is off, or user is in lockscreen,
  and re-enable when this is no longer the case.

Merged-In: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2

Bug: 31665197
Change-Id: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2

7 years agoFix swipe-to-dismiss to properly react to swipe gestures.
Michael Kwan [Wed, 14 Dec 2016 01:10:12 +0000 (17:10 -0800)]
Fix swipe-to-dismiss to properly react to swipe gestures.

Test: manual test
Bug: 33588580
Change-Id: If8d03f90a25e989e254e3a21bafef4e76bab5d7b

7 years agoDo not write if apply() did not change the file.
Philip P. Moltmann [Wed, 14 Dec 2016 00:32:06 +0000 (16:32 -0800)]
Do not write if apply() did not change the file.

Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136

7 years agoOnly persist last Shared Preferences state
Philip P. Moltmann [Wed, 14 Dec 2016 00:23:21 +0000 (16:23 -0800)]
Only persist last Shared Preferences state

If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.

For commit() we need to make sure that we have at least persisted the
state of the commit.

Generation counts are 64 bit, hence they never overflow.

Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6

7 years agoMerge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev
TreeHugger Robot [Wed, 14 Dec 2016 00:55:36 +0000 (00:55 +0000)]
Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev

7 years agoMerge "Prevent crash on uninstall." into nyc-mr2-dev
Ruben Brunk [Wed, 14 Dec 2016 00:24:38 +0000 (00:24 +0000)]
Merge "Prevent crash on uninstall." into nyc-mr2-dev

7 years agoDirectReply: Show bouncer when occluded
Adrian Roos [Tue, 13 Dec 2016 23:12:02 +0000 (15:12 -0800)]
DirectReply: Show bouncer when occluded

Fixes a bug where Direct Reply would not work when the
lockscreen is occluded.

Change-Id: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Merged-In: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Fixes: 32558539
Test: Open navigation, lock phone, turn phone on, direct reply to a notification

7 years agoAdd carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
Junda Liu [Mon, 12 Dec 2016 23:33:39 +0000 (15:33 -0800)]
Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.

Default false. If true, will allow use edited tether APN to take effect.

Bug: b/30622475
Change-Id: I526e41e816582e1c5219600d74980fd7754361e6

7 years agoKeyguard: Don't lock if SIM is NOT_READY
Adrian Roos [Tue, 13 Dec 2016 20:07:09 +0000 (12:07 -0800)]
Keyguard: Don't lock if SIM is NOT_READY

Fixes an issue with MVNOs where the lockscreen
would show in response to a virtual SIM switch.

Now we no longer lock with NOT_READY.

Change-Id: I520200311a5ae3218f1743b1fc9a568c39933ebf
Fixes: 33386149
Bug: 30997251
Test: Set up secure lockscreen, insert Fi SIM, dial *#*#346398#*#*, verify screen does not lock, eject SIM, verify screen locks.

7 years ago[DO NOT MERGE] Prevent crash from early Toast surface destruction.
Robert Carr [Wed, 5 Oct 2016 22:33:16 +0000 (15:33 -0700)]
[DO NOT MERGE] Prevent crash from early Toast surface destruction.

To understand this change it's first helpful to review Toasts.
The ViewRoot is constructed on the client side, but it's added,
to a window token controlled by the NotificationManagerService.
When we call NotificationManagerService#cancelToast, the system
will remove this window token. With the window token removed,
the WindowManager needs to destroy the surface to prevent orphaned
windows. If we destroy the Surface before removing the toast on the
client side however, we've never asked the ViewRoot to stop rendering
and we could have a crash. To solve this we just have to ensure we call
removeView before cancelToast.

Bug: 31547288
Bug: 30150688
Change-Id: I96672b0ac07ff18e9f51348f2ed42913c5a5226f

7 years agoDO NOT MERGE Using Activity#setTitle to have TalkBack announce root
Ben Lin [Tue, 13 Dec 2016 19:31:44 +0000 (11:31 -0800)]
DO NOT MERGE Using Activity#setTitle to have TalkBack announce root
traversal.

Bug: 32260739
Bug: 28275570
Change-Id: Ie3711e8ccbf588838a3f21346f317243516382bd

7 years agoMerge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announc...
Ben Lin [Tue, 13 Dec 2016 19:09:39 +0000 (19:09 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."" into nyc-mr2-dev

7 years agoDO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root...
Ben Lin [Tue, 13 Dec 2016 19:01:14 +0000 (19:01 +0000)]
DO NOT MERGE ANYWHERE Revert "Using Activity#setTitle to have TalkBack announce root traversal."

This reverts commit 4c80659e99b182492a4719560180079d23c1b338.

Change-Id: Id5fa68f37170e61e2e63fdb3a60e8a3db79c81fa

7 years agoDO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
Michal Karpinski [Mon, 5 Dec 2016 13:31:40 +0000 (13:31 +0000)]
DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent

Test: the APIs will be tested by CTS when unhidden
Bug: 29748723

(cherry picked from commit da9d3ad3ac40555cd9e491c864bedf3c24f6289c)

Change-Id: Iaff05eb6d4a2fd12e0271c703d694ecfc0dc9a17

7 years agoDO NOT MERGE Fix Lint errors for network logging API
Michal Karpinski [Fri, 25 Nov 2016 17:17:35 +0000 (17:17 +0000)]
DO NOT MERGE Fix Lint errors for network logging API

Bug: 29748723

(cherry picked from commit 0879eb41ca8c642c8b7391391f6316fe8f5e5906)

Change-Id: I187aa5b96c283323edb6a1ebe5005d70e19bf563

7 years agoDO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
Michal Karpinski [Fri, 25 Nov 2016 15:29:55 +0000 (15:29 +0000)]
DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO

Test: this only adds a log message
Bug: 29748723

(cherry picked from commit bcf1c58ec25f275fa25f8aab1c265da868e64e29)

Change-Id: Iad57528c60f35d4820a2f0196cccc92f7c4d3830

7 years agoDO NOT MERGE Disable DO single user features when clearDeviceOwner() is called
Michal Karpinski [Wed, 16 Nov 2016 13:56:11 +0000 (13:56 +0000)]
DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called
regardless of the amount of users

Bug: 32901196
Bug: 29748723
Change-Id: Ie419b5e496e23656cbe5436942d9aba402bfe68e