Commit Graph

68543 Commits

Author SHA1 Message Date
Makoto Onuki
d0866414f9 Merge \\"Revert \\"Handle package broadcasts before apps do\\"\\" into nyc-mr1-dev am: 7f3187bb0d
am: 5f18bbe034

Change-Id: I05af5e8eb457c19e3dbce414e0e2351c936703ff
2016-07-13 16:58:06 +00:00
Makoto Onuki
5f18bbe034 Merge \"Revert \"Handle package broadcasts before apps do\"\" into nyc-mr1-dev
am: 7f3187bb0d

Change-Id: I15a7629138e1c0b44620bd6239d7a14d3df14b82
2016-07-13 16:47:11 +00:00
Makoto Onuki
7f3187bb0d Merge "Revert "Handle package broadcasts before apps do"" into nyc-mr1-dev 2016-07-13 16:33:39 +00:00
Julia Reynolds
62d1abf0bd Merge \\"Attribute manual zen mode in volume panel footer.\\" into nyc-mr1-dev am: f6d766020f
am: c2381727a7

Change-Id: Ibb38d3a68dd642b5d6507341b7e189b77bba9502
2016-07-13 15:41:55 +00:00
Julia Reynolds
c2381727a7 Merge \"Attribute manual zen mode in volume panel footer.\" into nyc-mr1-dev
am: f6d766020f

Change-Id: I89ee22c5304e7de651aa34bddf5635f2e87e6b01
2016-07-13 15:33:36 +00:00
Julia Reynolds
f6d766020f Merge "Attribute manual zen mode in volume panel footer." into nyc-mr1-dev 2016-07-13 15:26:03 +00:00
Benjamin Franz
e4da41e6be Merge \\"Add hidden API to store whether provisioning config has been applied\\" into nyc-mr1-dev am: 17ca90430b
am: b3fa8d87e0

Change-Id: If65317cf6ec5237cff36fba86ed219ab078776ad
2016-07-13 14:42:22 +00:00
Benjamin Franz
b3fa8d87e0 Merge \"Add hidden API to store whether provisioning config has been applied\" into nyc-mr1-dev
am: 17ca90430b

Change-Id: Ibd92d09022e534df20405af19763d1156f797b4e
2016-07-13 14:35:59 +00:00
Benjamin Franz
17ca90430b Merge "Add hidden API to store whether provisioning config has been applied" into nyc-mr1-dev 2016-07-13 14:31:50 +00:00
Julia Reynolds
44ad6ff4c2 Attribute manual zen mode in volume panel footer.
So users know what app enabled DND.

Change-Id: I0aad862539b28302bf618641ad29cdfa956c8f33
Fixes: 29892371
2016-07-13 10:28:54 -04:00
Mahaver Chopra
e4ffde9cac Merge \\"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\\" into nyc-mr1-dev am: 695a1c50a2
am: e64f60a455

Change-Id: Iedc9544179d3c3de8616375e51f7a60ddd1c8c3b
2016-07-13 12:41:16 +00:00
Mahaver Chopra
e64f60a455 Merge \"Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.\" into nyc-mr1-dev
am: 695a1c50a2

Change-Id: I8976511deb994983abbb17b2830b98878c92631b
2016-07-13 12:33:59 +00:00
Mahaver Chopra
695a1c50a2 Merge "Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED." into nyc-mr1-dev 2016-07-13 12:27:01 +00:00
Zak Cohen
9dc28243c0 Merge \\"Adds a screenshot wallpaper method to WallpaperManagerService.\\" into nyc-mr1-dev am: b4d4ce31ab
am: ee2f46485e

Change-Id: Ia7b738db6f73c89e97537f9b1c0d5cb7fd161616
2016-07-13 10:26:47 +00:00
Zak Cohen
ee2f46485e Merge \"Adds a screenshot wallpaper method to WallpaperManagerService.\" into nyc-mr1-dev
am: b4d4ce31ab

Change-Id: I4737e4d758335240614d2d2b51c11b8c739160fc
2016-07-13 10:22:02 +00:00
Zak Cohen
b4d4ce31ab Merge "Adds a screenshot wallpaper method to WallpaperManagerService." into nyc-mr1-dev 2016-07-13 10:15:02 +00:00
Erik Kline
170a58bd49 Add IPv6 tethering coordinator am: 1eb8c69bed
am: 5b429166fc

Change-Id: I9a5bd7d72ec6a4b63922fc5704d15cb5eafc1e8d
2016-07-13 05:02:13 +00:00
Erik Kline
5b429166fc Add IPv6 tethering coordinator
am: 1eb8c69bed

Change-Id: Icf8034276d4edc7167ad03ff8860ac8e3d05c464
2016-07-13 04:57:17 +00:00
Erik Kline
1eb8c69bed Add IPv6 tethering coordinator
Add an IPv6TetheringCoordinator to TetheringMaster StateMachine, which
receives and processes NetworkState updates and passes the necessary IPv6
information to the revelant TetherInterfaceStateMachine.

Add an IPv6TetheringInterfaceServices to TetherInterfaceStateMachine, which
is responsible for adding local network routes and managing an IPv6
RouterAdvertisementDaemon.

Bug: 9580643
Change-Id: I3eaae460b80752e2115359d7bde873a1e9ea515a
2016-07-13 12:08:06 +09:00
Adrian Roos
a47967b820 Merge \\"Allow LockPatternUtils usage on non-looper threads\\" into nyc-mr1-dev am: feaa2bfb39
am: 1642d8df0d

Change-Id: I0bfc272cef3cee1e76f1b3bc5f8f0908bd24f2e5
2016-07-13 02:15:39 +00:00
Adrian Roos
1642d8df0d Merge \"Allow LockPatternUtils usage on non-looper threads\" into nyc-mr1-dev
am: feaa2bfb39

Change-Id: I22afcc4e7307e3c64a92fdcef82f2d1344fbb5df
2016-07-13 02:09:03 +00:00
Adrian Roos
feaa2bfb39 Merge "Allow LockPatternUtils usage on non-looper threads" into nyc-mr1-dev 2016-07-13 01:41:16 +00:00
Vladislav Kaznacheev
04e15b8a23 Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53 am: 9ac6a460c8
am: 9c225d60e0

Change-Id: I5876ea6cfe8e1711f446c9f9246770ff49fb7380
2016-07-13 00:27:07 +00:00
Vladislav Kaznacheev
9c225d60e0 Fix docs for View.DRAG_FLAG_GLOBAL am: 9a44eaec53
am: 9ac6a460c8

Change-Id: I62af5eba6621e25c51cbcbfe7f9670e7be1449a3
2016-07-13 00:17:39 +00:00
Vladislav Kaznacheev
9ac6a460c8 Fix docs for View.DRAG_FLAG_GLOBAL
am: 9a44eaec53

Change-Id: I82786f107815361b73655b92dc4e54ee255296d9
2016-07-13 00:08:50 +00:00
Adrian Roos
7a3bf7c46e Allow LockPatternUtils usage on non-looper threads
Fixes an issue where LPU could no longer
be used on a non-looper thread even though
the looper is only used for a certain callback.

Now only using that callback mechanism is fatal
on a non-looper thread.

Change-Id: I2d766bd6c913e345ed6a3500b486263c8bc12b07
Fixes: 30076804
2016-07-12 15:32:04 -07:00
Vladislav Kaznacheev
9a44eaec53 Fix docs for View.DRAG_FLAG_GLOBAL
Document that cross-app drags only involve apps compiled for API 24 or later.

Bug: 30076806
Change-Id: Ia630f4623c23d787b52692ff1f6475408cefa177
2016-07-12 15:24:48 -07:00
Makoto Onuki
efbbe7ea9d Revert "Handle package broadcasts before apps do"
And fix b/29939691 (don't try to load locked users) in a different way

Bug 29939691
Bug 29895275

Change-Id: Ib55f9c5d5547c54daa4e05c1e50bf4bbceaf1991
2016-07-12 14:47:20 -07:00
Rob Carr
5ddb26eace Merge "Remove unused SurfaceView state." 2016-07-12 21:20:02 +00:00
Fyodor Kupolov
62e9a55f82 Merge \\"Don\\'t hold a lock while loading default wallpaper\\" into nyc-mr1-dev am: 2921dfac50
am: 1028c16d76

Change-Id: I6f3b0064bd5ac6640e453476bcd6a63e740460ae
2016-07-12 19:36:32 +00:00
TreeHugger Robot
736a4ac099 Merge "LOG, Y U NO TAG?" 2016-07-12 19:32:33 +00:00
Fyodor Kupolov
1028c16d76 Merge \"Don\'t hold a lock while loading default wallpaper\" into nyc-mr1-dev
am: 2921dfac50

Change-Id: Iaa22bed019f30b340d7ef7011c2d8b14629efe33
2016-07-12 19:30:08 +00:00
TreeHugger Robot
2921dfac50 Merge "Don't hold a lock while loading default wallpaper" into nyc-mr1-dev 2016-07-12 19:18:08 +00:00
TreeHugger Robot
62005aa1d7 Merge "resolve merge conflicts of 7b84987 to master" 2016-07-12 18:44:51 +00:00
Mahaver Chopra
3d9805d502 Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED.
Currently we used global setting to restrict user from enabling oem
unlock. As global settings can be chagned using adb, using user
restrictions instead.

Bug: 29893399
Change-Id: Ic83112a4838b8279bf50408a29ae205e0b8639ee
2016-07-12 19:29:14 +01:00
Alan Viverette
a3a489a53c Merge \\"Set up view state before attaching, jump drawables if needed\\" into nyc-mr1-dev am: 2c5da6668c
am: 10d3f9850b

Change-Id: Ie23d54c6ab61b7e2423201613dee0b495b718bef
2016-07-12 18:28:53 +00:00
Alan Viverette
10d3f9850b Merge \"Set up view state before attaching, jump drawables if needed\" into nyc-mr1-dev
am: 2c5da6668c

Change-Id: I1377f24fbf1a9f95072c14c9518261ad3591323f
2016-07-12 18:23:01 +00:00
Alan Viverette
2c5da6668c Merge "Set up view state before attaching, jump drawables if needed" into nyc-mr1-dev 2016-07-12 18:13:22 +00:00
Amith Yamasani
634841d448 Merge \\"Merge \\\"Include new constant for encryption status in the getter\\\'s javadoc\\\" into nyc-dev am: e278cf7665\\" into nyc-mr1-dev am: d2e6a62838
am: b493ce833b

Change-Id: I10fdd234351c534269187c0e1fb2d8745be51b54
2016-07-12 18:05:39 +00:00
Felipe Leme
978bf2a2e2 LOG, Y U NO TAG?
Change-Id: I9b6cfba865647efc3c803dee1e769e70a4ad17d0
Fixes: 29941527
2016-07-12 10:55:45 -07:00
Amith Yamasani
b493ce833b Merge \"Merge \\"Include new constant for encryption status in the getter\\'s javadoc\\" into nyc-dev am: e278cf7665\" into nyc-mr1-dev
am: d2e6a62838

Change-Id: I5d11b5f95bab3f5b581f0fab176efc5c349adb55
2016-07-12 17:55:05 +00:00
Amith Yamasani
3bfbc531b3 Merge \"Include new constant for encryption status in the getter\'s javadoc\" into nyc-dev
am: e278cf7665

Change-Id: I22c884f8982d3a1aaf7baf1b981a3d3d8d8ab624
2016-07-12 17:46:58 +00:00
Amith Yamasani
e278cf7665 Merge "Include new constant for encryption status in the getter's javadoc" into nyc-dev 2016-07-12 17:40:13 +00:00
Fyodor Kupolov
b6378cf4ae Don't hold a lock while loading default wallpaper
It currently causes lock contention during user switch, when instance of
WallpaperManager in SystemUI is accessed from multiple threads

Bug: 29039588
Change-Id: I4b827d54d10fbd3b188fb94f47e78a2967ecb480
2016-07-12 10:39:56 -07:00
Makoto Onuki
be0e56e9d2 Merge \\"Throw ActivityNotFoundException when failed to launch shortcut\\" into nyc-mr1-dev am: 50752f7391
am: b1e0982173

Change-Id: I466a7c5985cb080e6e2780cfbafa3bb90cc58dbf
2016-07-12 17:19:36 +00:00
Zak Cohen
3683fb1e1d Adds a screenshot wallpaper method to WallpaperManagerService.
Bug: 29963541

Change-Id: If0a574004f8bddf1ba170587a8187253fe045ef4
2016-07-12 17:18:36 +00:00
Makoto Onuki
b1e0982173 Merge \"Throw ActivityNotFoundException when failed to launch shortcut\" into nyc-mr1-dev
am: 50752f7391

Change-Id: I0dcb7b89a32de22dee41ebe617e47ae935ac8227
2016-07-12 17:14:56 +00:00
Makoto Onuki
50752f7391 Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev 2016-07-12 17:09:32 +00:00
Etan Cohen
207cd8534b resolve merge conflicts of 7b84987 to master
Change-Id: Ib300a32277a4bb21ed9f5a024118370d361aa1c1
2016-07-12 10:09:16 -07:00
Benjamin Franz
2aa9bab8a1 Add hidden API to store whether provisioning config has been applied
Bug: 29629204
Change-Id: Iaf4164357868b17dbc6615a77babb0e7cbc183b7
2016-07-12 17:20:18 +01:00