Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
273,667 Commits 3 Branches 0 Tags
2cd9eb7c353a2e4d2ad63ec7ff705385a29aee87
Commit Graph

68575 Commits

Author SHA1 Message Date
Wei Liu
2cd9eb7c35 Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am: 6e8630307a 
am: 05c2c22a80

Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029
 2016-07-14 00:15:25 +00:00
Wei Liu
05c2c22a80 Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev 
am: 6e8630307a

Change-Id: I7e381d5d62f9c79b0c604518ff6ea2d1d9c38dc4
 2016-07-14 00:08:07 +00:00
Wei Liu
6e8630307a Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev 2016-07-13 23:59:28 +00:00
Ashutosh Joshi
5bcbe74198 Merge \"Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am: 2e42020eab\" into nyc-mr1-dev-plus-aosp 
am: 5c99851d23

Change-Id: I0f52f1406840b9ddcfe9dd30c19c5ea01755039f
 2016-07-13 23:46:22 +00:00
Ashutosh Joshi
0ce29c421e Merge \\"MediaPlayer: fix typo for OnInfoListener.\\" into nyc-mr1-dev am: ebc3c9ca3f 
am: 3ed59e2fda

Change-Id: Ib10558712b5e7abe1b0a853eceb4c20beacd6153
 2016-07-13 23:31:13 +00:00
Ashutosh Joshi
d9a081e27a Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev 
am: 2e42020eab

Change-Id: Ie2899e0eb301fd33ca2546fe854a5109a24906b2
 2016-07-13 23:25:48 +00:00
Wei Jia
3ed59e2fda Merge \"MediaPlayer: fix typo for OnInfoListener.\" into nyc-mr1-dev 
am: ebc3c9ca3f

Change-Id: I768ec161cc5350d6014127269c9b1f0901a1a923
 2016-07-13 23:15:10 +00:00
Ashutosh Joshi
2e42020eab Merge "Add state for loading/unloading apps" into nyc-mr1-dev 2016-07-13 23:04:47 +00:00
Ashutosh Joshi
54787a5f9f Add state for loading/unloading apps 
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Fix Build Breakage due to uninitalized variables.

Bug: 29193948
Change-Id: Ibebecf704bb3ad2583e110f1fcf05400a53b1b4c
 2016-07-13 15:28:16 -07:00
Ashutosh Joshi
ebc3c9ca3f Merge "Revert "Add state for loading/unloading apps"" into nyc-mr1-dev 2016-07-13 22:17:37 +00:00
Ashutosh Joshi
f6029bbbcf Revert "Add state for loading/unloading apps" 
This reverts commit 00b351aeef.

Change-Id: Iee229adff8fec4f2407aa895886e63953f0d7d32
 2016-07-13 22:15:19 +00:00
Ashutosh Joshi
49805052e8 Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am: a980cba4d8 
am: f4ba21c420

Change-Id: I51c696280b4fd322cde7f4701bbf6b0042a7ab3e
 2016-07-13 22:03:05 +00:00
Ashutosh Joshi
f4ba21c420 Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev 
am: a980cba4d8

Change-Id: I49333eb66bf8846e370b94b3c0c10c72664b5b2b
 2016-07-13 21:57:29 +00:00
Ashutosh Joshi
a980cba4d8 Merge "Add state for loading/unloading apps" into nyc-mr1-dev 2016-07-13 21:51:32 +00:00
Adrian Roos
52396abf56 Merge \\"ApplicationErrorReport: Sanitize stack trace\\" into nyc-mr1-dev am: a07af1ee35 
am: f1d5c81aa0

Change-Id: I8ae41d7eb65ad5e3907880df2ca2dcf503735d2d
 2016-07-13 21:45:09 +00:00
Adrian Roos
f1d5c81aa0 Merge \"ApplicationErrorReport: Sanitize stack trace\" into nyc-mr1-dev 
am: a07af1ee35

Change-Id: I26689370456dd424474683fca95950bd229bbe73
 2016-07-13 21:39:59 +00:00
Adrian Roos
a07af1ee35 Merge "ApplicationErrorReport: Sanitize stack trace" into nyc-mr1-dev 2016-07-13 21:34:19 +00:00
Makoto Onuki
c7b4815f23 Merge \\"Revert \\"Revert \\"Revert \\"Handle package broadcasts before apps do\\"\\"\\"\\" into nyc-mr1-dev am: 6eefe67b2c 
am: a74fce83ae

Change-Id: I8dcd074a8075e38416da0d6e3570545f17d6bc15
 2016-07-13 20:27:48 +00:00
Makoto Onuki
a74fce83ae Merge \"Revert \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\"\" into nyc-mr1-dev 
am: 6eefe67b2c

Change-Id: I514fb0b48c79644f7bc3154b3a18fabfc4c35d15
 2016-07-13 20:21:56 +00:00
Makoto Onuki
6eefe67b2c Merge "Revert "Revert "Revert "Handle package broadcasts before apps do"""" into nyc-mr1-dev 2016-07-13 20:13:53 +00:00
Chong Zhang
9c68b2b076 Merge \\"Revert changes to force layout after insets changes\\" into nyc-mr1-dev am: 185131442b 
am: 12fad318b1

Change-Id: I881ff5642a7b1b748d948345728acd3ceb4b9855
 2016-07-13 19:50:18 +00:00
Chong Zhang
12fad318b1 Merge \"Revert changes to force layout after insets changes\" into nyc-mr1-dev 
am: 185131442b

Change-Id: I7d3eaa1d0337c0ae62ee24169b76f1938b8b9e68
 2016-07-13 19:44:37 +00:00
Chong Zhang
185131442b Merge "Revert changes to force layout after insets changes" into nyc-mr1-dev 2016-07-13 19:39:08 +00:00
Ashutosh Joshi
00b351aeef Add state for loading/unloading apps 
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.

Bug: 29193948

Change-Id: I700f3bdbb8e84413455751dec02a812a639421b3
 2016-07-13 12:29:19 -07:00
Chong Zhang
75eccbd0ff Revert changes to force layout after insets changes 
Alternative fix for b/29391054 ag/1152795 sends an MOVE message to
client which also force a layout, so we no longer need to force
it after the insets change in the traversal.

Reverting the following two related fixes as it does more
measures than necessary.

bug: 29391054
bug: 29533997
bug: 29634368

Revert "Fix layout issue after insets changed"

This reverts commit 76fdbb72c9.

Revert "Do a forceLayout if pending insets is changed after relayout window"

This reverts commit 71f2c31469.
 2016-07-13 19:24:04 +00:00
Makoto Onuki
f34c308dfd Revert "Revert "Revert "Handle package broadcasts before apps do""" 
This reverts commit 886ba78dfb.

With the tests updated.

Change-Id: I162e6ca23c667f90feddc1e9f42b554a416295cf
 2016-07-13 10:40:31 -07:00
Makoto Onuki
2adc0c392e Merge \\"Revert \\"Revert \\"Handle package broadcasts before apps do\\"\\"\\" into nyc-mr1-dev am: 98802f6007 
am: 80dd14e061

Change-Id: I32fcfdc3fb90fe7b0ac14239a721769234c7cb2f
 2016-07-13 17:34:11 +00:00
Adrian Roos
732ae95fbf ApplicationErrorReport: Sanitize stack trace 
Makes sure that the size of the stack trace does not exceed
40 KiBi, to ensure that even errors with large stack traces
are properly reported to ActivityManagerService. For good
measure, also ensure that the exception message is not too
long either.

Change-Id: Id8a99094023c15a981b1b79fd9ee0d803921e220
Fixes: 29918978
 2016-07-13 17:25:18 +00:00
Makoto Onuki
80dd14e061 Merge \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\" into nyc-mr1-dev 
am: 98802f6007

Change-Id: I51e9cedb8cba67b987f8ed6b92bcf66082594990
 2016-07-13 17:18:16 +00:00
Makoto Onuki
98802f6007 Merge "Revert "Revert "Handle package broadcasts before apps do""" into nyc-mr1-dev 2016-07-13 17:09:37 +00:00
Makoto Onuki
886ba78dfb Revert "Revert "Handle package broadcasts before apps do"" 
This reverts commit efbbe7ea9d.

Change-Id: I3dbb080db5121307f533a7d411f4f5d47225500e
 2016-07-13 17:08:26 +00:00
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