OSDN Git Service
Android Build Merger (Role) [Thu, 8 Jun 2017 00:10:59 +0000 (00:10 +0000)]
Merge "Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a am:
dacd9ed196" into oc-dr1-dev-plus-aosp
Adrian Roos [Thu, 8 Jun 2017 00:08:30 +0000 (00:08 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a
am:
dacd9ed196
Change-Id: I72b507987f85e2b17f8a98de72a61e64f7b980bd
Adrian Roos [Thu, 8 Jun 2017 00:08:22 +0000 (00:08 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev am:
2ff366a39a
am:
b42e50a3a0
Change-Id: I1ca543cb1b23221adf96a7d09a152fea4461b8f5
Adrian Roos [Thu, 8 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d
Adrian Roos [Wed, 7 Jun 2017 23:59:53 +0000 (23:59 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9
Adrian Roos [Wed, 7 Jun 2017 23:54:00 +0000 (23:54 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:48:03 +0000 (23:48 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
am:
4317e457ba
Change-Id: Ieef81f7433083085e8c4ad9e503ba2d333c90cd1
Android Build Merger (Role) [Wed, 7 Jun 2017 23:42:55 +0000 (23:42 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
cf8cfc4412" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 7 Jun 2017 23:41:57 +0000 (23:41 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f
am:
cf8cfc4412
Change-Id: Iceb7d0a6b88b3bf011e585ead483e924e1cc1b98
Android Build Merger (Role) [Wed, 7 Jun 2017 23:41:51 +0000 (23:41 +0000)]
Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f am:
50caf4af60" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 7 Jun 2017 23:40:32 +0000 (23:40 +0000)]
Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
Bryce Lee [Wed, 7 Jun 2017 23:40:06 +0000 (23:40 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am:
f867733d4f
am:
50caf4af60
Change-Id: I46c77e2180b981e1d9e89b81d73e9f47a3519c55
Sundeep Ghuman [Wed, 7 Jun 2017 23:39:00 +0000 (23:39 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad
am:
8d4014995d
Change-Id: I26ab39fbc393a8fcf89c1daad50a8b02081c947a
Android Build Merger (Role) [Wed, 7 Jun 2017 23:36:20 +0000 (23:36 +0000)]
Merge "Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad am:
216f596cee" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Wed, 7 Jun 2017 23:35:32 +0000 (23:35 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev am:
09d06437ad
am:
216f596cee
Change-Id: I99adff8d11f498a8f640689e6a472dc26a83ad04
Android Build Merger (Role) [Wed, 7 Jun 2017 23:35:08 +0000 (23:35 +0000)]
Merge "Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 -s ours am:
788b2b9364 -s ours" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 7 Jun 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: I7436b4e82365c2d83c1f38a856324e8e309920aa
Sundeep Ghuman [Wed, 7 Jun 2017 23:31:52 +0000 (23:31 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1
am:
8695bda38e -s ours
Change-Id: I5c9c69aab0789b8b741353936bd753ea491972c6
Sundeep Ghuman [Wed, 7 Jun 2017 23:31:49 +0000 (23:31 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev am:
584406f8e1 -s ours
am:
788b2b9364 -s ours
Change-Id: Id8c23e19ad74c5bac9097f4c123d385ff2503b60
Bryce Lee [Wed, 7 Jun 2017 23:31:48 +0000 (23:31 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am:
f867733d4f
Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
Sundeep Ghuman [Wed, 7 Jun 2017 23:28:29 +0000 (23:28 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: I939b42d12919635ddac9bdf91a17323f154001a9
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:57 +0000 (23:25 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1
Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82
Sundeep Ghuman [Wed, 7 Jun 2017 23:25:50 +0000 (23:25 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
am:
09d06437ad
Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589
Bryce Lee [Wed, 7 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
Sundeep Ghuman [Wed, 7 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am:
584406f8e1 -s ours
Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9
TreeHugger Robot [Wed, 7 Jun 2017 23:19:04 +0000 (23:19 +0000)]
Merge "Remove Wifi Badges from platform." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 23:18:07 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 23:09:37 +0000 (23:09 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
am:
ab67c300f3
Change-Id: I593cd3dd18eaf6a11f3eb961c0185150131772e6
Bryce Lee [Wed, 7 Jun 2017 23:01:56 +0000 (23:01 +0000)]
Revert "Coordinate configuration changes and window frame size."
This reverts commit
afb45bba8379df530182dae882ec70329423dcfe.
Bug:
32839232
Fixes:
62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
Selim Cinek [Wed, 7 Jun 2017 22:57:54 +0000 (22:57 +0000)]
Merge "Fixed an issue where the qs panel wasn't properly placed" into oc-dr1-dev
Sanket Padawe [Wed, 7 Jun 2017 22:08:26 +0000 (22:08 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035
am:
6ef238a51c
Change-Id: I89e7d1ca10ec3e9519e3afc92a40b3e0dfc4ac98
Sanket Padawe [Wed, 7 Jun 2017 22:01:52 +0000 (22:01 +0000)]
Merge "Update strings for modem restricted state." into oc-dev am:
58977d1035
am:
6acd6102c9
Change-Id: I8429e585c54f1336ba70311a012c019e30680fb8
Android Build Merger (Role) [Wed, 7 Jun 2017 21:58:48 +0000 (21:58 +0000)]
Merge "Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495 am:
52e73d8ffb" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Wed, 7 Jun 2017 21:57:52 +0000 (21:57 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495
am:
52e73d8ffb
Change-Id: Ic7db17b6e523db3360d57a686abb802975240fef
Jorim Jaggi [Wed, 7 Jun 2017 21:56:25 +0000 (21:56 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev am:
fc1753d495
am:
59fe02cf95
Change-Id: If712fd817a0179f6437dce5d234990a28743fedf
Sanket Padawe [Wed, 7 Jun 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: Id08df9dfdc858dfc4dfb31e7c6ad85fbe2b1869a
Sanket Padawe [Wed, 7 Jun 2017 21:50:30 +0000 (21:50 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
am:
58977d1035
Change-Id: I44ee9421ee32c68dd880176f12a89c8ecb3ae03b
Jorim Jaggi [Wed, 7 Jun 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I5cd92b3e08e812f6634f7a8c793b8ac9ef3bcc00
Jorim Jaggi [Wed, 7 Jun 2017 21:46:41 +0000 (21:46 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
am:
fc1753d495
Change-Id: I2024b1b5e967fc64a4b068fd47643f94478dcf5c
TreeHugger Robot [Wed, 7 Jun 2017 21:42:33 +0000 (21:42 +0000)]
Merge "Update strings for modem restricted state." into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 21:40:00 +0000 (21:40 +0000)]
Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev
Android Build Merger (Role) [Wed, 7 Jun 2017 21:13:22 +0000 (21:13 +0000)]
Merge "Merge "Fixed a flicker of group notifications" into oc-dev am:
beba1bf936 am:
334964899f" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 7 Jun 2017 21:11:32 +0000 (21:11 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev am:
beba1bf936
am:
334964899f
Change-Id: If6944735499ebd79b722cb1d9cefd4ee49e24234
Selim Cinek [Wed, 7 Jun 2017 21:11:20 +0000 (21:11 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev am:
beba1bf936
am:
80b417c731
Change-Id: I37a02992a66fb0b9c1cceba926340690db014f87
Android Build Merger (Role) [Wed, 7 Jun 2017 21:08:13 +0000 (21:08 +0000)]
Merge "Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am:
fd6b3c6da3 am:
550d5da702" into oc-dr1-dev-plus-aosp
Winson Chung [Wed, 7 Jun 2017 21:06:03 +0000 (21:06 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am:
fd6b3c6da3
am:
550d5da702
Change-Id: Ib31e7a0bf89db9fb347309fd14b44b0a3ca8cde2
Winson Chung [Wed, 7 Jun 2017 21:04:30 +0000 (21:04 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev am:
fd6b3c6da3
am:
f676ac8ce5
Change-Id: I35612147fad06e390887931d57325ae82976e4bf
Selim Cinek [Wed, 7 Jun 2017 21:03:12 +0000 (21:03 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am:
beba1bf936
Change-Id: I22d44dde99093cbcf10ca8cddb3beccfdc9bdafb
Selim Cinek [Wed, 7 Jun 2017 20:58:11 +0000 (20:58 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
am:
beba1bf936
Change-Id: Ia5a12355fd1ed7ec8c9e4cea68e5b17764479ebd
Winson Chung [Wed, 7 Jun 2017 20:57:41 +0000 (20:57 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am:
fd6b3c6da3
Change-Id: Ia156853dacf464f80ea46b35806c1f40d3107ecd
Winson Chung [Wed, 7 Jun 2017 20:53:42 +0000 (20:53 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
am:
fd6b3c6da3
Change-Id: I262857f51aff127c3e1c4a223e22e7129060a9e7
Android Build Merger (Role) [Wed, 7 Jun 2017 20:49:41 +0000 (20:49 +0000)]
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
Selim Cinek [Wed, 7 Jun 2017 20:47:47 +0000 (20:47 +0000)]
Merge "Fixed a flicker of group notifications" into oc-dev
Jian Sun [Wed, 7 Jun 2017 20:47:34 +0000 (20:47 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am:
8d5b58a660
am:
a3da26e146
Change-Id: Idc1f787b542d116cdad62eb6a4406605d035f8ae
Jian Sun [Wed, 7 Jun 2017 20:47:30 +0000 (20:47 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev am:
8d5b58a660
am:
da93f30457
Change-Id: I2bd6be07162547385edf08d5fccc88a7cfe559ad
TreeHugger Robot [Wed, 7 Jun 2017 20:46:15 +0000 (20:46 +0000)]
Merge "Run explicit GC to clear references to bitmaps earlier." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:38:41 +0000 (20:38 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev am:
6e96251d92
am:
f9f6424adb
Change-Id: I46ff1e1af158a8af1a27da04304a7bda4a60ebe9
Jian Sun [Wed, 7 Jun 2017 20:37:51 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: I21f8e344b794a5e24f92a0895843b7875b764eba
Jian Sun [Wed, 7 Jun 2017 20:37:45 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: Id381a515c44253dc2c3cfa7a74e855fda981580f
Adrian Roos [Wed, 7 Jun 2017 19:18:05 +0000 (12:18 -0700)]
Keyguard: Increase clock size
Test: observe that keyguard clock looks slightly bigger now
Change-Id: Ic55582abb1cf82bf104afce7d1271e456c78aa1b
Fixes:
62105028
Jian Sun [Wed, 7 Jun 2017 20:31:00 +0000 (20:31 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:28:53 +0000 (20:28 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev am:
6e96251d92
am:
1732aae9e5
Change-Id: If434921580905cc668c9f4d4294124b9d534baa0
Julia Reynolds [Wed, 7 Jun 2017 20:21:38 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: I167f941e2f09f240dd6109f849ccd87dee57f47c
Julia Reynolds [Wed, 7 Jun 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
Adrian Roos [Fri, 2 Jun 2017 00:55:05 +0000 (17:55 -0700)]
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
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
Sundeep Ghuman [Tue, 6 Jun 2017 19:27:25 +0000 (12:27 -0700)]
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
Android Build Merger (Role) [Wed, 7 Jun 2017 19:49:25 +0000 (19:49 +0000)]
Merge "Merge "Better error message for AVD" into oc-dev am:
cabf9cdc2e am:
7bbb50e21d" into oc-dr1-dev-plus-aosp
Doris Liu [Wed, 7 Jun 2017 19:46:59 +0000 (19:46 +0000)]
Merge "Better error message for AVD" into oc-dev am:
cabf9cdc2e
am:
7bbb50e21d
Change-Id: I118c4b4ba07f0774a59bfcf17b2246713e72b2dc
Doris Liu [Wed, 7 Jun 2017 19:45:52 +0000 (19:45 +0000)]
Merge "Better error message for AVD" into oc-dev am:
cabf9cdc2e
am:
cab35e9b0e
Change-Id: I48726108f88abbe3d08973259e1be1a1683df797
Doris Liu [Wed, 7 Jun 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I6e63b81fd2168780d23a88d7340812b55db98497
Jorim Jaggi [Wed, 7 Jun 2017 19:38:19 +0000 (12:38 -0700)]
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
Doris Liu [Wed, 7 Jun 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I96b7ac9525e4096da2662f1c1973e2ee52008cfc
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" into oc-dev
Android Build Merger (Role) [Wed, 7 Jun 2017 19:23:14 +0000 (19:23 +0000)]
Merge "Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am:
6746aa8c4d am:
dab10f2bb3" into oc-dr1-dev-plus-aosp
Jeff Sharkey [Wed, 7 Jun 2017 19:22:26 +0000 (19:22 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am:
6746aa8c4d
am:
dab10f2bb3
Change-Id: Icd84601fa67c3ae5d9e3a26709022760d1fe22c8
Jeff Sharkey [Wed, 7 Jun 2017 19:20:01 +0000 (19:20 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am:
6746aa8c4d
am:
3471981ddc
Change-Id: I1d308a6ef5ad479c152b8db1264842caefc36295
Jeff Sharkey [Wed, 7 Jun 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I32f223228c45a4949ebf53c1ab73d20fa9950ed6
Jeff Sharkey [Wed, 7 Jun 2017 19:12:59 +0000 (19:12 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d
Selim Cinek [Fri, 2 Jun 2017 00:36:46 +0000 (17:36 -0700)]
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
Jeff Sharkey [Wed, 7 Jun 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Todd Kennedy [Wed, 7 Jun 2017 19:00:23 +0000 (19:00 +0000)]
Merge "always adjust per-user application info" into oc-dev am:
91a9d65e42
am:
dcbfba2a45
Change-Id: I0da0ecb0ed9430e059bc13e73226d43275bef934
Todd Kennedy [Wed, 7 Jun 2017 18:55:19 +0000 (18:55 +0000)]
Merge "always adjust per-user application info" into oc-dev am:
91a9d65e42
am:
1581bb0b75
Change-Id: Ic1935a6051c78ffba6b1963373dc784d711c1c53
Todd Kennedy [Wed, 7 Jun 2017 18:52:27 +0000 (18:52 +0000)]
Merge "always adjust per-user application info" into oc-dev
am:
91a9d65e42
Change-Id: I1c7af6ce2ef12fd445389325e98b84b552efae88
Android Build Merger (Role) [Wed, 7 Jun 2017 18:50:59 +0000 (18:50 +0000)]
Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am:
28afa23a8f am:
4710a7ad03" into oc-dr1-dev-plus-aosp
Todd Kennedy [Wed, 7 Jun 2017 18:50:33 +0000 (18:50 +0000)]
Merge "always adjust per-user application info" into oc-dev
am:
91a9d65e42
Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
Makoto Onuki [Wed, 7 Jun 2017 18:49:58 +0000 (18:49 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am:
28afa23a8f
am:
4710a7ad03
Change-Id: I802eeffca56af708e47bcc1932708ac27f8e3262
Makoto Onuki [Wed, 7 Jun 2017 18:47:27 +0000 (18:47 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am:
28afa23a8f
am:
dd0f409b16
Change-Id: I9567a83070a1203e58615e1f87a3e217371dbc3e
Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]
Merge "always adjust per-user application info" into oc-dev
Makoto Onuki [Wed, 7 Jun 2017 18:40:46 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am:
28afa23a8f
Change-Id: I3d1079365f13400d1f23f6e61122e00c67432dd1
Makoto Onuki [Wed, 7 Jun 2017 18:40:44 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am:
28afa23a8f
Change-Id: I4c3561c8496a3892ca7a0ea425b979298b20acde
Android Build Merger (Role) [Wed, 7 Jun 2017 18:35:16 +0000 (18:35 +0000)]
Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e am:
3158673eeb" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 7 Jun 2017 18:34:18 +0000 (18:34 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e
am:
3158673eeb
Change-Id: I2001475c549a1ecf1dec7e469bddc3a22ce86b57
Android Build Merger (Role) [Wed, 7 Jun 2017 18:33:57 +0000 (18:33 +0000)]
Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e am:
0151c6886f" into oc-dr1-dev-plus-aosp
Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 18:33:05 +0000 (18:33 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am:
295dd7193e
am:
0151c6886f
Change-Id: I9bc738f6bad45e314e077c2250fe3e086571db7a
Albert Chaulk [Wed, 7 Jun 2017 18:29:53 +0000 (18:29 +0000)]
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
am:
44bb9c7281
Change-Id: I6ed7f3aa0ceef0bac2ec44889bb19c757d07f10d
Selim Cinek [Wed, 7 Jun 2017 18:25:12 +0000 (18:25 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am:
295dd7193e
Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893
TreeHugger Robot [Wed, 7 Jun 2017 18:23:11 +0000 (18:23 +0000)]
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
Selim Cinek [Wed, 7 Jun 2017 18:22:09 +0000 (18:22 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am:
295dd7193e
Change-Id: I8b80da001d23932c48e9721ee1f23850cf4dcb31
OSDN Git Service
