OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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 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

7 years agoDO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
Michal Karpinski [Tue, 15 Nov 2016 17:22:34 +0000 (17:22 +0000)]
DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called

We should disable those features before the DO is actually cleared.

Bug: 32901196
Bug: 29748723

(cherry picked from commit c44e67961170ddfb668372dc6e9ce6b391e3740f)

Change-Id: I74679abc26753585f302f3d52bca81fe21e2e668

7 years agoDO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
Michal Karpinski [Mon, 14 Nov 2016 12:10:32 +0000 (12:10 +0000)]
DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler

Added a comment and renamed field to follow mConvention.

Test: will be CTS tested once APIs unhidden
Bug: 29748723

(cherry picked from commit aabe96db87838501d3abeb96c25a4b1c50b9c12c)

Change-Id: I7ef118723d13ce1d313c3c56299c2dca2411eee6

7 years agoDO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve
Michal Karpinski [Thu, 3 Nov 2016 15:46:17 +0000 (15:46 +0000)]
DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve
the same batch many times

This allows DO to:
a) know that some logs were dropped (by trying with token and not
getting anything)
b) know how many logs were there in each batch (useful especially
for the dropped ones)
c) retry batch retrieval if it failed

Test: will be CTS tested once APIs unhidden
Bug: 29748723

(cherry picked from commit a9ff206af26871695bfce54969428b8ad03e31e6)

Change-Id: Iac10e61cdf3b100719a9c029ff897bd5ef5c8e2f

7 years agoDO NOT MERGE [DPM] Management and retrieval of network logs
Michal Karpinski [Wed, 12 Oct 2016 15:40:06 +0000 (16:40 +0100)]
DO NOT MERGE [DPM] Management and retrieval of network logs

This CL follows up on ag/1530343 and adds:
1) Various network events.
2) Retrieval method in DPM and APIs in DeviceAdminReceiver.
3) Extension of NetworkLogger and it's NetworkLoggingHandler.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Bug: 29748723
Change-Id: I42a1a477e7c75c109a3982f809c22732b814e8b2

7 years agoDO NOT MERGE [DPM] DO can start network logging and listen for events
Michal Karpinski [Wed, 12 Oct 2016 13:59:26 +0000 (14:59 +0100)]
DO NOT MERGE [DPM] DO can start network logging and listen for events

This CL adds:
1) Setter and getter in DPM to manipulate logging switch (retrieval
method to come in a subsequent CL(s)).
2) A way for DPM to register to listen for events.
3) Skeleton of NetworkLogger class (more to come in subsequent CL(s)).

Bug: 29748723
Change-Id: I5c04662ccc6febd2ba294b0eaca1ed1da9c16e47

7 years agoMerge changes from topic 'f-radio-toggle' into cw-f-dev
Ivan Podogov [Tue, 13 Dec 2016 16:02:45 +0000 (16:02 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev
am: e5592abb83

Change-Id: I7b7052c0402a73bda44db5970f96b6d7226361fc

7 years agoAdd WiFi toggle prompts - framework
Svetoslav Ganov [Tue, 13 Dec 2016 16:02:23 +0000 (16:02 +0000)]
Add WiFi toggle prompts - framework
am: 82737b42a6

Change-Id: Ia8958b54d04fff971b96fc6d29771eb94fd9b17e

7 years agoAdd Bluetooth toggle prompts - framework
Svetoslav Ganov [Tue, 13 Dec 2016 16:01:39 +0000 (16:01 +0000)]
Add Bluetooth toggle prompts - framework
am: b1e2da7c24

Change-Id: I29c038d23488c504c838a85bd97c255b84919aab

7 years agoMerge changes from topic 'f-radio-toggle' into cw-f-dev
Ivan Podogov [Tue, 13 Dec 2016 15:55:24 +0000 (15:55 +0000)]
Merge changes from topic 'f-radio-toggle' into cw-f-dev

* changes:
  Add WiFi toggle prompts - framework
  Add Bluetooth toggle prompts - framework

7 years agoDisplay "Sign into network" in settings when on a captive portal.
Lorenzo Colitti [Tue, 13 Dec 2016 04:30:07 +0000 (13:30 +0900)]
Display "Sign into network" in settings when on a captive portal.

Test: Manually observed UI when connected to captive portal.
Bug: 33532675
Change-Id: I3906cd7c13f7bb14242d8a4ec1ca37febccee8c6

7 years agoMerge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc...
Hugo Benichi [Tue, 13 Dec 2016 03:55:29 +0000 (03:55 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev

7 years agoMerge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc...
Hugo Benichi [Tue, 13 Dec 2016 03:54:21 +0000 (03:54 +0000)]
Merge "DO NOT MERGE IpConnectivityMetrics reads buffer size in settings" into nyc-mr2-dev

7 years agoMerge "DO NOT MERGE TokenBucket for rate-limiting and throttling" into nyc-mr2-dev
Hugo Benichi [Tue, 13 Dec 2016 03:54:14 +0000 (03:54 +0000)]
Merge "DO NOT MERGE TokenBucket for rate-limiting and throttling" into nyc-mr2-dev

7 years agoMerge "DO NOT MERGE IpConnectivity metrics: add version number" into nyc-mr2-dev
Hugo Benichi [Tue, 13 Dec 2016 03:52:38 +0000 (03:52 +0000)]
Merge "DO NOT MERGE IpConnectivity metrics: add version number" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Tue, 13 Dec 2016 03:42:55 +0000 (03:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev
Ben Lin [Tue, 13 Dec 2016 01:34:39 +0000 (01:34 +0000)]
Merge "DO NOT MERGE ANYWHERE" into nyc-mr2-dev

7 years agoDO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents
Hugo Benichi [Tue, 18 Oct 2016 01:36:33 +0000 (10:36 +0900)]
DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents

This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).

Test: new test in IpConnectivityMetricsTest
Bug: 1550402

(cherry picked from commit e1c173d2240a8eedf7685c9371087dc047a6931f)

Change-Id: Ibe41e9a76db36ea502697a5f19fc0d91c40a3087

7 years agoDO NOT MERGE IpConnectivityMetrics reads buffer size in settings
Hugo Benichi [Wed, 19 Oct 2016 02:17:28 +0000 (11:17 +0900)]
DO NOT MERGE IpConnectivityMetrics reads buffer size in settings

Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug: 32198637

(cherry pick from commit 05686dbb6b965eb1a54591d2ed2334337886c6ee)

Change-Id: Ie7ca1638533479601c5983bb6e54705003561b6c

7 years agoDO NOT MERGE TokenBucket for rate-limiting and throttling
Hugo Benichi [Mon, 17 Oct 2016 23:43:30 +0000 (08:43 +0900)]
DO NOT MERGE TokenBucket for rate-limiting and throttling

This patch adds a TokenBucket class that can accumulate and distribute
tokens over time.

Test: comes with unit tests.
Bug: 32198637

(cherry picked from commit 998493f0ee39ae0e9ffdea27f48f1b11b0807fcb)

Change-Id: Iaf477c7bb14f8ddb293b7a907e2ab0cf76d09e07

7 years agoDO NOT MERGE IpConnectivity metrics: add version number
Hugo Benichi [Thu, 13 Oct 2016 04:16:16 +0000 (13:16 +0900)]
DO NOT MERGE IpConnectivity metrics: add version number

This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.

Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug: 32127906

(cherry picked from commit d680d4c856f54bea0c60dea74ba4204822391e49)

Change-Id: I5f37633afd9ec82f5402c5b6670fe2febae82a14

7 years agoMerge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc...
Hugo Benichi [Tue, 13 Dec 2016 00:27:32 +0000 (00:27 +0000)]
Merge "DO NOT MERGE Logging improvements in CaptivePortalLoginActivity" into nyc-mr2-dev

7 years agoDO NOT MERGE Logging improvements in CaptivePortalLoginActivity
Hugo Benichi [Tue, 6 Dec 2016 06:36:30 +0000 (15:36 +0900)]
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity

Logging improvements to help debugging captive portal issues.

Test: manually tested
Bug: 33126342

(cherry picked from commit 87de0c206709d3a170649b535a973de8f9c0fb0c)

Change-Id: I3ac1773e07827194d854ebad4c27c48da106154b

7 years agoMerge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev
Hugo Benichi [Tue, 13 Dec 2016 00:22:31 +0000 (00:22 +0000)]
Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev

* changes:
  DO NOT MERGE NetworkMonitor: send one DNS probe per web probe
  DO NOT MERGE NetworkMonitor metrics: add first validation information
  DO NOT MERGE Captive portal systel log improvements

7 years agoMerge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev
Hugo Benichi [Tue, 13 Dec 2016 00:21:43 +0000 (00:21 +0000)]
Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev

7 years agoMerge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev
Xiaohui Chen [Mon, 12 Dec 2016 23:36:51 +0000 (23:36 +0000)]
Merge "sysui: add assets and dimentions for sw900dp" into nyc-mr2-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 12 Dec 2016 23:29:24 +0000 (15:29 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iac15928717cf7dc2caa8a2ed0c0e9fb7d6d09011
Auto-generated-cl: translation import

7 years agoMerge "Fix animations for app QS tiles." into nyc-mr2-dev
Jason Monk [Mon, 12 Dec 2016 20:22:19 +0000 (20:22 +0000)]
Merge "Fix animations for app QS tiles." into nyc-mr2-dev

7 years agoMerge "Fix loading bar positioning." into nyc-mr2-dev
Jason Monk [Mon, 12 Dec 2016 20:21:56 +0000 (20:21 +0000)]
Merge "Fix loading bar positioning." into nyc-mr2-dev

7 years agoMerge "Add missing API diffs for support library 25.1.0" into nyc-mr2-dev
Alan Viverette [Mon, 12 Dec 2016 19:50:47 +0000 (19:50 +0000)]
Merge "Add missing API diffs for support library 25.1.0" into nyc-mr2-dev

7 years agoFix loading bar positioning.
Jason Monk [Mon, 12 Dec 2016 18:07:50 +0000 (13:07 -0500)]
Fix loading bar positioning.

Move it down and make sure it covers entire width.

Change-Id: If906ea86ae1e78b7a75e2376c65f0ff0e191b86c
Fixes: 30292983
Test: Manual visual inspection of UI element locations

7 years agoMerge "Add reason code used to tell dialer when call failed due to WFC being off...
Tyler Gunn [Mon, 12 Dec 2016 17:09:35 +0000 (17:09 +0000)]
Merge "Add reason code used to tell dialer when call failed due to WFC being off." into nyc-mr2-dev

7 years agoMerge "[DO NOT MERGE] Switch to using UMS.mUserStates" into nyc-mr2-dev
TreeHugger Robot [Mon, 12 Dec 2016 17:05:06 +0000 (17:05 +0000)]
Merge "[DO NOT MERGE] Switch to using UMS.mUserStates" into nyc-mr2-dev

7 years agoFix animations for app QS tiles.
Jason Monk [Mon, 12 Dec 2016 17:02:16 +0000 (12:02 -0500)]
Fix animations for app QS tiles.

Use correct context for third party tile drawable creation, also
fix comparison so that AVDs don't animate multiple times.

Change-Id: Ifcf7b818304d6677eacf080ed8c22893c91fdf73
Fixes: 32779384
Test: Install app with animated app QS tile.

7 years agoMerge "DO NOT MERGE API for reporting IMS registration failures" into nyc-mr2-dev
Meng Wang [Sat, 10 Dec 2016 00:08:20 +0000 (00:08 +0000)]
Merge "DO NOT MERGE API for reporting IMS registration failures" into nyc-mr2-dev

7 years ago[DO NOT MERGE] Switch to using UMS.mUserStates
Fyodor Kupolov [Mon, 5 Dec 2016 21:23:28 +0000 (13:23 -0800)]
[DO NOT MERGE] Switch to using UMS.mUserStates

UserManager.isUserUnlocked/isUserRunning/isUserUnlockingOrUnlocked now
return state from UMS.mUserStates that is pushed from ActivityManager.

Test: create managed profile using TestDPC and check Launcher3
Test: manually create unstarted managed profile and check launchers
Bug: 33232933
Change-Id: I6b619ba1880188eabdd6e3e4cc7eb60d3a22a977

7 years agoMerge "Add API info about Keyframe and PropertyValuesHolder" into nyc-mr2-dev
Doris Liu [Fri, 9 Dec 2016 21:13:37 +0000 (21:13 +0000)]
Merge "Add API info about Keyframe and PropertyValuesHolder" into nyc-mr2-dev

7 years agoMerge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev
Fyodor Kupolov [Fri, 9 Dec 2016 19:58:18 +0000 (19:58 +0000)]
Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev

7 years agoMerge "Fix race condition bug related to freezing apps." into cw-f-dev
Jeff Sharkey [Fri, 9 Dec 2016 17:28:47 +0000 (17:28 +0000)]
Merge "Fix race condition bug related to freezing apps." into cw-f-dev
am: 3350ae9c82

Change-Id: Ia1f4349217b2baca92678c74d20196a3b332f008

7 years agoFix race condition bug related to freezing apps.
Jeff Sharkey [Fri, 9 Dec 2016 17:28:43 +0000 (17:28 +0000)]
Fix race condition bug related to freezing apps.
am: 41d2be0f0f

Change-Id: I012093b52efda2cdffa47143c40e2708007158f5

7 years agoMerge "Fix race condition bug related to freezing apps." into cw-f-dev
TreeHugger Robot [Fri, 9 Dec 2016 17:22:19 +0000 (17:22 +0000)]
Merge "Fix race condition bug related to freezing apps." into cw-f-dev

7 years agoFix race condition bug related to freezing apps.
Jeff Sharkey [Fri, 9 Dec 2016 16:06:12 +0000 (09:06 -0700)]
Fix race condition bug related to freezing apps.

Consider the following situation:

1. Package is frozen.
2. We try forking the app while frozen, causing a ProcessRecord with
PID 0 to be recorded in mProcessNames. As a result of the failed
fork, removeProcessLocked() tears down that ProcessRecord, but a
special case records it into mRemovedProcesses.
3. Package is unfrozen.
4. We try forking the app, and this time it proceeds normally now
that we're unfrozen.  The new valid ProcessRecord is recorded in
mProcessNames.
5. activityIdleInternalLocked() triggers a clean-up pass of
mRemovedProcesses.  trimApplications() ends up cleaning up the
stale reference from (2) above *by hash key* and not *by reference*,
which causes us to remove the new valid ProcessRecord.  This results
in the valid ProcessRecord in (4) becoming an orphaned PID, which
starts a chain reaction of havoc that ensues.

This issue is fixed by checking the expected ProcessRecord by value
before actually removing it, thus preventing orphaned PIDs.

Test: builds, boots, over 600 installs without orphaned PIDs
Bug: 28395549
Change-Id: I5ea1b31c3fd374ea7f5cc40ff35bb9195d9f3e2b

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Fri, 9 Dec 2016 12:02:42 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 9 Dec 2016 08:08:50 +0000 (00:08 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1b452aa96ca024ffc792815917b75f8b777e7a81
Auto-generated-cl: translation import

7 years agoDO NOT MERGE NetworkMonitor: send one DNS probe per web probe
Hugo Benichi [Wed, 16 Nov 2016 09:18:08 +0000 (18:18 +0900)]
DO NOT MERGE NetworkMonitor: send one DNS probe per web probe

This patch changes sligthly the two web probes mechanism for captive
portal detection and network validation so that DNS resolution is always
done for both probes.

In general the target web servers of the two parallel HTTP and HTTPS probes
are now different. This introduces a bias in the latency measurement of
th HTTPS probe since this latency will also include DNS resolution in
general.

Test: manual verification + $ runtest frameworks-net
Bug: 32198726

(cherry picked from commit ab61e7c324b24e46829495bc2597e42ea907c53d)

Change-Id: Ic83c3f8f46d32269bca1b90ae192ef648d5df6c3

7 years agoDO NOT MERGE NetworkMonitor metrics: add first validation information
Hugo Benichi [Tue, 15 Nov 2016 14:23:24 +0000 (23:23 +0900)]
DO NOT MERGE NetworkMonitor metrics: add first validation information

This patch adds first validation information to:
  - ValidationProbeEvent, by extending the probe_type int field of to
    also include a bit indicating if the probe was part of a first
    validation attempt or not.
  - NetworkMonitorEvent, by defining new contants for the event_type
    field.

Test: $ runtest frameworks-net
      + manually generating events and inspecting the
        output of $ adb shell dumpsys connmetrics list
Bug: b/32198726

(cherry picked from commit 147aa6d53bc1e9f8a3632553abcf936023806e1d)

Change-Id: I7ed954dee006f8804a5bf8940eec180714bddd07

7 years agoDO NOT MERGE Captive portal systel log improvements
Hugo Benichi [Mon, 21 Nov 2016 04:50:05 +0000 (13:50 +0900)]
DO NOT MERGE Captive portal systel log improvements

This patch improves system logging around captive portal detection to
make inspection of bug reports sligthly easier:

- NetworkMonitor now logs by default CMD_CAPTIVE_PORTAL_RECHECK and
  CMD_CAPTIVE_PORTAL_APP_FINISHED. Other system logs are kept off with
  a new VDBG boolean contant,
- NetworkNotificationManager now prints the notification id at
  notification time. This allows to easily correlate show and clear.
- errors in NetworkNotificationManager are logged as Throwable instead
  of through their implicit toString() method.

Test: $ runtest frameworks-net
Bug: 32198726

(cherry picked from commit 8b025bf108c729156b40159038befa0e6c5bebce)

Change-Id: I7780c389a94c4b9fa226f53b02fe5960d1c08618

7 years agoDO NOT MERGE APF: also drop any ICMPv6 RSs
Hugo Benichi [Thu, 8 Dec 2016 07:34:46 +0000 (16:34 +0900)]
DO NOT MERGE APF: also drop any ICMPv6 RSs

Test: new unit test + $ runtest franeworks-net
Bug: 32833400

(cherry picked from commit f98182ef5e80ede5de7f2c2a5f40fc92a46c9704)

Change-Id: I4c46304b9dc8105123fc02a29f99dbc835248eb0

7 years agoFix vulnerability in MemoryIntArray am: 1181f448c1 am: d08cf2b071
Svetoslav Ganov [Fri, 9 Dec 2016 01:52:48 +0000 (01:52 +0000)]
Fix vulnerability in MemoryIntArray am: 1181f448c1 am: d08cf2b071
am: 385277305e

Change-Id: Ie90f6504f26526256671b057dfbb0c93e8c193c5

7 years ago[DO NOT MERGE] Increased user switch timeout to 3s
Fyodor Kupolov [Tue, 6 Dec 2016 19:46:56 +0000 (11:46 -0800)]
[DO NOT MERGE] Increased user switch timeout to 3s

Also report the actual delay if sendResult is eventually called.

Test: Manual - device boots, no timeouts
Bug: 30813554
Change-Id: I1271181ab9d2653fad1167049c84a6780ad46ff0

7 years agoFix vulnerability in MemoryIntArray am: 1181f448c1
Svetoslav Ganov [Fri, 9 Dec 2016 01:48:16 +0000 (01:48 +0000)]
Fix vulnerability in MemoryIntArray am: 1181f448c1
am: d08cf2b071

Change-Id: I436a09f1e49626fa45a7f6cc6bff92b2e5486a97

7 years agoFix vulnerability in MemoryIntArray
Svetoslav Ganov [Fri, 9 Dec 2016 01:43:52 +0000 (01:43 +0000)]
Fix vulnerability in MemoryIntArray
am: 1181f448c1

Change-Id: I4217066be49bb9525e945f110c22eb864ec6c212

7 years agoFix vulnerability in MemoryIntArray
Svetoslav Ganov [Thu, 8 Dec 2016 23:58:02 +0000 (23:58 +0000)]
Fix vulnerability in MemoryIntArray

MemoryIntArray was using the size of the undelying
ashmem region to mmap the data but the ashmem size
can be changed until the former is memory mapped.
Since we use the ashmem region size for boundary
checking and memory unmapping if it does not match
the size used while mapping an attacker can force
the system to unmap memory or to access undefined
memory and crash.

Also we were passing the memory address where the
ashmem region is mapped in the owner process to
support cases where the client can pass back the
MemoryIntArray instance. This allows an attacker
to put invalid address and cause arbitrary memory
to be freed.

Now we no longer support passing back the instance
to the owner process (the passed back instance is
read only), so no need to pass the memory adress
of the owner's mapping, thus not allowing freeing
arbitrary memory.

Further, we now check the memory mapped size against
the size of the underlying ashmem region after we do
the memory mapping (to fix the ahsmem size) and if
an attacker changed the size under us we throw.

Tests: Updated the tests and they pass.

bug:33039926
bug:33042690

Change-Id: Ibf56827209a9b791aa83ae679219baf829ffc2ac

7 years agoRevert "Fix vulnerability in MemoryIntArray am: a97171ec49" am: 43966dafb3 am: 498547ec6c
Bill Napier [Thu, 8 Dec 2016 22:40:05 +0000 (22:40 +0000)]
Revert "Fix vulnerability in MemoryIntArray am: a97171ec49" am: 43966dafb3 am: 498547ec6c
am: ef435f6780

Change-Id: Ib5c8b17acafa4a2c55666c2dbc1591bbbeac51a7

7 years agoRevert "Fix vulnerability in MemoryIntArray am: a97171ec49" am: 43966dafb3
Bill Napier [Thu, 8 Dec 2016 22:34:34 +0000 (22:34 +0000)]
Revert "Fix vulnerability in MemoryIntArray am: a97171ec49" am: 43966dafb3
am: 498547ec6c

Change-Id: I8874250d553a7271305efc3f027c933e4aad3b1d

7 years agoRevert "Fix vulnerability in MemoryIntArray am: a97171ec49"
Bill Napier [Thu, 8 Dec 2016 22:30:02 +0000 (22:30 +0000)]
Revert "Fix vulnerability in MemoryIntArray am: a97171ec49"
am: 43966dafb3

Change-Id: I01bc83edd411dc39cb696e64ea35b5d4a8497fbf

7 years agoRevert "Fix vulnerability in MemoryIntArray am: a97171ec49"
Bill Napier [Thu, 8 Dec 2016 22:22:38 +0000 (22:22 +0000)]
Revert "Fix vulnerability in MemoryIntArray am: a97171ec49"

This reverts commit fb12dd509f8e106d034f67c2e404845128128994.

Change-Id: I9e1b22b8df0e754095541a758096cba279a81ab1

7 years agoFix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029
Svetoslav Ganov [Thu, 8 Dec 2016 21:51:00 +0000 (21:51 +0000)]
Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f am: a5ee109029
am: 5250d90637

Change-Id: I08c3a670598d8d26694b7d282d0bd18ffb4faf9b

7 years agoFix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f
Svetoslav Ganov [Thu, 8 Dec 2016 21:46:34 +0000 (21:46 +0000)]
Fix vulnerability in MemoryIntArray am: a97171ec49 am: fb12dd509f
am: a5ee109029

Change-Id: If1b852faa812b0bcb7419ae0f75a3e2349926de0

7 years agoFix vulnerability in MemoryIntArray am: a97171ec49
Svetoslav Ganov [Thu, 8 Dec 2016 21:42:05 +0000 (21:42 +0000)]
Fix vulnerability in MemoryIntArray am: a97171ec49
am: fb12dd509f

Change-Id: I269ec7d61ebdc9f485d759d1398d5fa4eacf868f

7 years agoFix vulnerability in MemoryIntArray
Svetoslav Ganov [Thu, 8 Dec 2016 21:37:33 +0000 (21:37 +0000)]
Fix vulnerability in MemoryIntArray
am: a97171ec49

Change-Id: Ifa2221a9b8ca705ef0239d61772938ac11761ce2

7 years agoAdd missing API diffs for support library 25.1.0
Alan Viverette [Thu, 8 Dec 2016 21:31:09 +0000 (16:31 -0500)]
Add missing API diffs for support library 25.1.0

Bug: 33457676
Change-Id: I8be25b41fe54ec3cd328373d4577ee3e292f5581

7 years agosysui: add assets and dimentions for sw900dp
Xiaohui Chen [Thu, 8 Dec 2016 20:03:09 +0000 (12:03 -0800)]
sysui: add assets and dimentions for sw900dp

We are enabling all large (sw900dp) Android devices to have a
consistent sysui designed for bigger screen similar to Pixel C.

Bug: 32516898
Test: Locally on pixel c
Change-Id: Iefd81225dd8801d41976f080e1fa71a1712f92de

7 years agoFix vulnerability in MemoryIntArray
Svetoslav Ganov [Thu, 8 Dec 2016 19:48:19 +0000 (11:48 -0800)]
Fix vulnerability in MemoryIntArray

MemoryIntArray was using the size of the undelying
ashmem region to mmap the data but the ashmem size
can be changed until the former is memory mapped.
Since we use the ashmem region size for boundary
checking and memory unmapping if it does not match
the size used while mapping an attacker can force
the system to unmap memory or to access undefined
memory and crash.

Also we were passing the memory address where the
ashmem region is mapped in the owner process to
support cases where the client can pass back the
MemoryIntArray instance. This allows an attacker
to put invalid address and cause arbitrary memory
to be freed.

Now we no longer support passing back the instance
to the owner process (the passed back instance is
read only), so no need to pass the memory adress
of the owner's mapping, thus not allowing freeing
arbitrary memory.

 Further, we now check the memory mapped size against
 the size of the underlying ashmem region after we do
 the memory mapping (to fix the ahsmem size) and if
 an attacker changed the size under us we throw.

 Tests: Updated the tests and they pass.

 bug:33039926
 bug:33042690

Change-Id: I1004579181ff7a223ef659e85c46100c47ab2409

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 8 Dec 2016 17:16:51 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: c0b7e766b0  -s ours

Change-Id: I00f0418ff736f2cb861ae7f1339f9ed477215b74

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 8 Dec 2016 17:16:49 +0000 (17:16 +0000)]
Import translations. DO NOT MERGE
am: b004945727  -s ours

Change-Id: I4287af7000efb01c1203276a6e1817f52504a560