Commit Graph

326561 Commits

Author SHA1 Message Date
Adrian Roos
dea3c986bc Keyguard: Increase clock size
Test: observe that keyguard clock looks slightly bigger now
Change-Id: Ic55582abb1cf82bf104afce7d1271e456c78aa1b
Fixes: 62105028
2017-06-07 20:34:08 +00:00
Jian Sun
8d5b58a660 Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev 2017-06-07 20:31:08 +00:00
Bookatz
6d79993cb3 Avoid background getTotalTimeLocked misreporting
It has been discovered that for background values of
AggregatedWakelock, Sync, Job, and partial wakelocks,
the value of getTotalTimeLocked is wrong and often very
negative. getTotalDurationMsLocked, which should provide the exact same
value in all of these cases (since background data is never pooled),
does not have this problem. So while the source of the bug is sought
out, we should use getTotalDurationMsLocked instead of getTotalTimeLocked for
these data.

Bug: 62352334
Test: cts-tradefed run cts-dev -m CtsDumpsysHostTestCases -t android.dumpsys.cts.BatteryStatsDumpsysTest
Change-Id: I78e84368615578483ab8e9e5f0ee1d067491be08
2017-06-07 13:29:41 -07:00
Julia Reynolds
fec2890cc8 Merge "Revert "Change default for group alert behavior"" into oc-dev am: 6e96251d92
am: 1732aae9e5

Change-Id: If434921580905cc668c9f4d4294124b9d534baa0
2017-06-07 20:28:53 +00:00
Todd Kennedy
4e4769c120 Final changes to protect the API surface
This is it. The last set of changes to protect instant apps
from full apps.

Bug: 35871369
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual; install instant app and ensure it runs
Change-Id: If71385bcc9a5637590fbd99b0ffcd5ed8809509c
2017-06-07 13:22:51 -07:00
Julia Reynolds
1732aae9e5 Merge "Revert "Change default for group alert behavior"" into oc-dev
am: 6e96251d92

Change-Id: I167f941e2f09f240dd6109f849ccd87dee57f47c
2017-06-07 20:21:38 +00:00
Julia Reynolds
f9f6424adb Merge "Revert "Change default for group alert behavior"" into oc-dev
am: 6e96251d92

Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
2017-06-07 20:21:26 +00:00
Adrian Roos
c18a13d97f AmbientIndication: Add tap again hint
Adds a hint for tapping the ambient indication again to open.
Also fixes an issue where the indication bottom padding was not correctly
updated if the indication was shown while the panel is collapsed.

Bug: 38387500
Test: tap indication, verify it shows the tap-again-to-open hint. Also verify that if the indication gets set while the phone is unlocked that sufficient space is reserved after transitioning to the lockscreen.
Change-Id: Ie9a152b0bd86807958376fd278ef9502c03af6b2
2017-06-07 20:20:43 +00:00
Julia Reynolds
6e96251d92 Merge "Revert "Change default for group alert behavior"" into oc-dev 2017-06-07 20:12:28 +00:00
Andreas Gampe
dc7f65ac64 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

(cherry picked from commit d52cad2cc9)

Bug: 37272346
Test: m
Test: Device boots
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 20:08:44 +00:00
Sundeep Ghuman
889e961477 DO NOT MERGE: Kill Wifi Badging in OC.
Speed labeling is turned on in O-DR hence this CL should not be merged
into master. Using the merged in tag below which implements speed
labeling (ag/2346102) to prevent this CL from being merged into upstream
branches which need scoring ui.

Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed

Bug: b/35628911
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5
2017-06-07 12:56:33 -07:00
Android Build Merger (Role)
523f7d58fb Merge "Merge "Better error message for AVD" into oc-dev am: cabf9cdc2e am: 7bbb50e21d" into oc-dr1-dev-plus-aosp 2017-06-07 19:49:30 +00:00
Doris Liu
efeec3f14e Merge "Better error message for AVD" into oc-dev am: cabf9cdc2e
am: 7bbb50e21d

Change-Id: I118c4b4ba07f0774a59bfcf17b2246713e72b2dc
2017-06-07 19:46:59 +00:00
Doris Liu
21d562c122 Merge "Better error message for AVD" into oc-dev am: cabf9cdc2e
am: cab35e9b0e

Change-Id: I48726108f88abbe3d08973259e1be1a1683df797
2017-06-07 19:45:52 +00:00
Doris Liu
7bbb50e21d Merge "Better error message for AVD" into oc-dev
am: cabf9cdc2e

Change-Id: I6e63b81fd2168780d23a88d7340812b55db98497
2017-06-07 19:40:53 +00:00
Jorim Jaggi
d261632710 Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND
To make sure we won't cause SystemUI to draw the black status bar
background while the starting window is visible.

Test: Warm open chrome
Test: go/wm-smoke
Bug: 38136531
Change-Id: I8dfc0926cafef9d41e78a637523316ac46ce05df
2017-06-07 12:38:19 -07:00
Doris Liu
cab35e9b0e Merge "Better error message for AVD" into oc-dev
am: cabf9cdc2e

Change-Id: I96b7ac9525e4096da2662f1c1973e2ee52008cfc
2017-06-07 19:37:26 +00:00
Doris Liu
cabf9cdc2e Merge "Better error message for AVD" into oc-dev 2017-06-07 19:31:14 +00:00
Android Build Merger (Role)
d37ba3bc38 Merge "Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am: 6746aa8c4d am: dab10f2bb3" into oc-dr1-dev-plus-aosp 2017-06-07 19:23:20 +00:00
Jeff Sharkey
726982296a Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am: 6746aa8c4d
am: dab10f2bb3

Change-Id: Icd84601fa67c3ae5d9e3a26709022760d1fe22c8
2017-06-07 19:22:26 +00:00
Jeff Sharkey
0996488311 Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am: 6746aa8c4d
am: 3471981ddc

Change-Id: I1d308a6ef5ad479c152b8db1264842caefc36295
2017-06-07 19:20:01 +00:00
Jeff Sharkey
dab10f2bb3 Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am: 6746aa8c4d

Change-Id: I32f223228c45a4949ebf53c1ab73d20fa9950ed6
2017-06-07 19:13:01 +00:00
Jeff Sharkey
3471981ddc Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am: 6746aa8c4d

Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d
2017-06-07 19:12:59 +00:00
Selim Cinek
5cf1d0589a Fixed an issue where the qs panel wasn't properly placed
The QS panel should only be placed below the notifications
if it has notifications above the shelf. This ensures that
all animations including icons are appearing in the right
place.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/AboveShelfObserverTest.java
Fixes: 35305470
Change-Id: I97fb0c76ed69b7638ce83a7c06856d87bf6bf65f
2017-06-07 19:08:39 +00:00
Etan Cohen
486a411224 [AWARE] Add validity check on PMK/Passphrase lengths
Bug: 62376042
Test: unit tests + inegrated (sl4a) tests
Change-Id: Ib6383a0ba9ef61114eb72b9a04cc683792b8e89d
2017-06-07 12:08:09 -07:00
Jeff Sharkey
6746aa8c4d Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev 2017-06-07 19:03:57 +00:00
Jason Monk
01df36f37f Move QS cell indicator back into mobile data tile
Remove it from the header and drop it back in its old location.

This reverts commit 10b4c8a4ab.

Test: runtest systemui
Fixes: 62331189
Change-Id: I087589c256894e0972656619e665b6a16536ce6c
2017-06-07 15:00:23 -04:00
Todd Kennedy
cce2c5501a Merge "always adjust per-user application info" into oc-dev am: 91a9d65e42
am: dcbfba2a45

Change-Id: I0da0ecb0ed9430e059bc13e73226d43275bef934
2017-06-07 19:00:23 +00:00
Todd Kennedy
443761ae57 Merge "always adjust per-user application info" into oc-dev am: 91a9d65e42
am: 1581bb0b75

Change-Id: Ic1935a6051c78ffba6b1963373dc784d711c1c53
2017-06-07 18:55:19 +00:00
Todd Kennedy
dcbfba2a45 Merge "always adjust per-user application info" into oc-dev
am: 91a9d65e42

Change-Id: I1c7af6ce2ef12fd445389325e98b84b552efae88
2017-06-07 18:52:27 +00:00
Android Build Merger (Role)
27e5b1676b Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f am: 4710a7ad03" into oc-dr1-dev-plus-aosp 2017-06-07 18:51:15 +00:00
Todd Kennedy
1581bb0b75 Merge "always adjust per-user application info" into oc-dev
am: 91a9d65e42

Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
2017-06-07 18:50:33 +00:00
Makoto Onuki
c93a5358c4 Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f
am: 4710a7ad03

Change-Id: I802eeffca56af708e47bcc1932708ac27f8e3262
2017-06-07 18:49:58 +00:00
Makoto Onuki
9476d61c81 Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f
am: dd0f409b16

Change-Id: I9567a83070a1203e58615e1f87a3e217371dbc3e
2017-06-07 18:47:27 +00:00
Todd Kennedy
91a9d65e42 Merge "always adjust per-user application info" into oc-dev 2017-06-07 18:42:13 +00:00
Makoto Onuki
dd0f409b16 Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am: 28afa23a8f

Change-Id: I3d1079365f13400d1f23f6e61122e00c67432dd1
2017-06-07 18:40:46 +00:00
Makoto Onuki
4710a7ad03 Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am: 28afa23a8f

Change-Id: I4c3561c8496a3892ca7a0ea425b979298b20acde
2017-06-07 18:40:44 +00:00
Android Build Merger (Role)
dca73f48ce Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 3158673eeb" into oc-dr1-dev-plus-aosp 2017-06-07 18:35:29 +00:00
Selim Cinek
65a5c680e2 Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e
am: 3158673eeb

Change-Id: I2001475c549a1ecf1dec7e469bddc3a22ce86b57
2017-06-07 18:34:18 +00:00
Android Build Merger (Role)
0b28195727 Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 0151c6886f" into oc-dr1-dev-plus-aosp 2017-06-07 18:34:02 +00:00
Makoto Onuki
28afa23a8f Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev 2017-06-07 18:33:24 +00:00
Selim Cinek
53d851191b Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e
am: 0151c6886f

Change-Id: I9bc738f6bad45e314e077c2250fe3e086571db7a
2017-06-07 18:33:05 +00:00
Albert Chaulk
8411eaf266 Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
am: 44bb9c7281

Change-Id: I6ed7f3aa0ceef0bac2ec44889bb19c757d07f10d
2017-06-07 18:29:53 +00:00
Andreas Gampe
5085ef71e9 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

Bug: 37272346
Test: m
Test: Device boots
Merged-In: I64d77244b5816ef1f605d19530b96be38f5c1bc6
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 11:26:15 -07:00
Selim Cinek
3158673eeb Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am: 295dd7193e

Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893
2017-06-07 18:25:12 +00:00
TreeHugger Robot
44bb9c7281 Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev 2017-06-07 18:23:17 +00:00
Selim Cinek
0151c6886f Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am: 295dd7193e

Change-Id: I8b80da001d23932c48e9721ee1f23850cf4dcb31
2017-06-07 18:22:09 +00:00
Selim Cinek
295dd7193e Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev 2017-06-07 18:13:35 +00:00
Android Build Merger (Role)
910563fca0 Merge "Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c am: df8c918129" into oc-dr1-dev-plus-aosp 2017-06-07 17:39:32 +00:00
Jason Monk
aa6c28a011 Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
am: df8c918129

Change-Id: I27f8a61c638ab63f6b0960884e60b8bed35df812
2017-06-07 17:36:43 +00:00