Commit Graph

326029 Commits

Author SHA1 Message Date
TreeHugger Robot
58977d1035 Merge "Update strings for modem restricted state." into oc-dev 2017-06-07 21:42:37 +00:00
TreeHugger Robot
fc1753d495 Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev 2017-06-07 21:40:04 +00:00
Android Build Merger (Role)
06cc1610c6 Merge "Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf936 am: 334964899f" into oc-dr1-dev-plus-aosp 2017-06-07 21:13:29 +00:00
Selim Cinek
d9509202c4 Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf936
am: 334964899f

Change-Id: If6944735499ebd79b722cb1d9cefd4ee49e24234
2017-06-07 21:11:32 +00:00
Selim Cinek
ce40da8070 Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf936
am: 80b417c731

Change-Id: I37a02992a66fb0b9c1cceba926340690db014f87
2017-06-07 21:11:20 +00:00
Android Build Merger (Role)
ec643782bc Merge "Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3 am: 550d5da702" into oc-dr1-dev-plus-aosp 2017-06-07 21:08:26 +00:00
Winson Chung
f94e715b19 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3
am: 550d5da702

Change-Id: Ib31e7a0bf89db9fb347309fd14b44b0a3ca8cde2
2017-06-07 21:06:03 +00:00
Winson Chung
cb04745fd2 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am: fd6b3c6da3
am: f676ac8ce5

Change-Id: I35612147fad06e390887931d57325ae82976e4bf
2017-06-07 21:04:30 +00:00
Selim Cinek
334964899f Merge "Fixed a flicker of group notifications" into oc-dev
am: beba1bf936

Change-Id: I22d44dde99093cbcf10ca8cddb3beccfdc9bdafb
2017-06-07 21:03:12 +00:00
Hall Liu
0842831e23 Embms download setup
Add MbmsDownloadReceiver and MbmsTempFileProvider to facilitate MBMS
download.
Fill in the download method in MbmsDownloadManager

Test: testapps
Change-Id: Ibb30f3b2b9d14b9df6b53c06916c21e3ca3a42c6
2017-06-07 13:58:18 -07:00
Selim Cinek
80b417c731 Merge "Fixed a flicker of group notifications" into oc-dev
am: beba1bf936

Change-Id: Ia5a12355fd1ed7ec8c9e4cea68e5b17764479ebd
2017-06-07 20:58:11 +00:00
Winson Chung
f676ac8ce5 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am: fd6b3c6da3

Change-Id: Ia156853dacf464f80ea46b35806c1f40d3107ecd
2017-06-07 20:57:41 +00:00
Winson Chung
550d5da702 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am: fd6b3c6da3

Change-Id: I262857f51aff127c3e1c4a223e22e7129060a9e7
2017-06-07 20:53:42 +00:00
Android Build Merger (Role)
7695c09dff Merge "Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am: 8d5b58a660 am: a3da26e146" into oc-dr1-dev-plus-aosp 2017-06-07 20:49:54 +00:00
Selim Cinek
beba1bf936 Merge "Fixed a flicker of group notifications" into oc-dev 2017-06-07 20:47:52 +00:00
Jian Sun
41324aef60 Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am: 8d5b58a660
am: a3da26e146

Change-Id: Idc1f787b542d116cdad62eb6a4406605d035f8ae
2017-06-07 20:47:34 +00:00
Jian Sun
cae2b1e7e3 Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am: 8d5b58a660
am: da93f30457

Change-Id: I2bd6be07162547385edf08d5fccc88a7cfe559ad
2017-06-07 20:47:30 +00:00
TreeHugger Robot
fd6b3c6da3 Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev 2017-06-07 20:46:20 +00:00
Julia Reynolds
add112d200 Merge "Revert "Change default for group alert behavior"" into oc-dev am: 6e96251d92
am: f9f6424adb

Change-Id: I46ff1e1af158a8af1a27da04304a7bda4a60ebe9
2017-06-07 20:38:41 +00:00
Jian Sun
a3da26e146 Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am: 8d5b58a660

Change-Id: I21f8e344b794a5e24f92a0895843b7875b764eba
2017-06-07 20:37:51 +00:00
Jian Sun
da93f30457 Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am: 8d5b58a660

Change-Id: Id381a515c44253dc2c3cfa7a74e855fda981580f
2017-06-07 20:37:45 +00:00
Jeff Sharkey
65ac7619f9 Add timeout to StrictMode flash.
Consider an app that requests that a StrictMode border be shown, and
then immediately crashes.  We'd end up showing the bars indefinitely,
which is a terrible UX.

This CL enqueues a second message to tear down the bars if nobody
asks for them to be taken down within 1 second.

Test: manual app that crashed after showing violation bars
Bug: 37787765
Change-Id: I45d2078d0dcaa94e8f24087d028f5f06d12c4349
2017-06-07 14:36:03 -06:00
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