Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Jensen
90df265f2f Merge "Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 916f79882d am: 0c67999abd" into nyc-mr1-dev-plus-aosp 
am: 782b01f981

* commit '782b01f98101a6d5855ebfb764bed174924430be':

Change-Id: Iaaedb0df6e1969e5960ffc54ffd364e9d8259504
 2016-06-06 11:41:04 +00:00
Paul Jensen
5bd1dc555d Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 916f79882d am: 9a33e1c81e 
am: 28e7754522

* commit '28e77545225a10424fc9307aecfe7236852b8253':
  Include network name in validation logs for dumpsys

Change-Id: If8d42bb7a355d1134ea24e4ad02acca1cd52e70c
 2016-06-06 11:41:00 +00:00
Android Build Merger (Role)
782b01f981 Merge "Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 916f79882d am: 0c67999abd" into nyc-mr1-dev-plus-aosp 2016-06-06 11:34:40 +00:00
Paul Jensen
f3034e21bc Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 916f79882d 
am: 0c67999abd

* commit '0c67999abd2ed2a3ff3c78a74f0c65688505df1e':
  Include network name in validation logs for dumpsys

Change-Id: Ie6778a47bab7e52795684d46672e42630c192d64
 2016-06-06 11:34:10 +00:00
Paul Jensen
28e7754522 Merge "Include network name in validation logs for dumpsys" into nyc-dev am: 916f79882d 
am: 9a33e1c81e

* commit '9a33e1c81e2b133d28fd57e013a2858818789541':
  Include network name in validation logs for dumpsys

Change-Id: I448ed66de8de6444f4506892fd3e8043f203cc11
 2016-06-06 11:34:06 +00:00
Paul Jensen
0c67999abd Merge "Include network name in validation logs for dumpsys" into nyc-dev 
am: 916f79882d

* commit '916f79882d7867d27fbd7abb32ec53028d9d3951':
  Include network name in validation logs for dumpsys

Change-Id: I157481d338e65d7e89e4f97382f84ab2a3110e20
 2016-06-06 11:23:57 +00:00
Paul Jensen
9a33e1c81e Merge "Include network name in validation logs for dumpsys" into nyc-dev 
am: 916f79882d

* commit '916f79882d7867d27fbd7abb32ec53028d9d3951':
  Include network name in validation logs for dumpsys

Change-Id: Ic5345cb7f309e509c7b9d7cb7b7ec4b95b8f1102
 2016-06-06 11:23:51 +00:00
Paul Jensen
916f79882d Merge "Include network name in validation logs for dumpsys" into nyc-dev 2016-06-06 11:08:45 +00:00
Robin Lee
c3c247560e Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: d2cf835880" into nyc-mr1-dev-plus-aosp 
am: aeb86ec3bf

* commit 'aeb86ec3bf8c39a29efe8a846472846cbec16103':

Change-Id: I84476b69eac613027d239b9b07b639d071aa3e29
 2016-06-06 10:51:32 +00:00
Victor Chang
4aca318f09 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: 6cbf4e5119 
am: 01dbfb8b2e

* commit '01dbfb8b2e36ffe7b047395f5a66f8196a6fc0d3':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I4641b2813820c82cc8509e0ba27f679733d45d6b
 2016-06-06 10:51:29 +00:00
Android Build Merger (Role)
aeb86ec3bf Merge "Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: d2cf835880" into nyc-mr1-dev-plus-aosp 2016-06-06 10:44:21 +00:00
Robin Lee
51261c6451 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee 
am: d2cf835880

* commit 'd2cf835880f2207e2df090599130f32ccb73f23d':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I676da29aa5322563b20a95afd504e3b4d68fd2a0
 2016-06-06 10:43:54 +00:00
Robin Lee
01dbfb8b2e Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee 
am: 6cbf4e5119

* commit '6cbf4e51199e12d1d935415f6fa38031cb53ac4d':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I931c5d99282a6350e15aefbf400c90935237e679
 2016-06-06 10:43:51 +00:00
Victor Chang
6cbf4e5119 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev 
am: 265f4113ee

* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: Iba3df72496f067c5e0291449be3bfbd9ce2031ff
 2016-06-06 10:33:00 +00:00
Victor Chang
d2cf835880 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev 
am: 265f4113ee

* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d
 2016-06-06 10:30:42 +00:00
Robin Lee
265f4113ee Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev 2016-06-06 10:10:56 +00:00
Seigo Nonaka
614c25a0a1 Merge "Introduce initial perf test for framework/base/core." 2016-06-06 05:10:34 +00:00
Dianne Hackborn
6da315f262 Merge "Fix issue #29006049: Add logging for implicit broadcasts am: bc02a3901d am: 13c2764cef" into nyc-mr1-dev-plus-aosp 
am: e473da278f

* commit 'e473da278f70bda98a08a96f656f639c3e3fd2a0':

Change-Id: Ibed6ca9ca26b23e893ed8e9916fd13039a0bcefe
 2016-06-05 18:33:36 +00:00
Dianne Hackborn
60137f4f3f Fix issue #29006049: Add logging for implicit broadcasts am: bc02a3901d am: ced0e2960d 
am: cb369c20ad

* commit 'cb369c20ad99f461ec55d5eec3ea1dbad7d3e512':
  Fix issue #29006049: Add logging for implicit broadcasts

Change-Id: If8bbd41a7884eaa1cdd0e757bfffc059caff44e0
 2016-06-05 18:33:28 +00:00
Android Build Merger (Role)
e473da278f Merge "Fix issue #29006049: Add logging for implicit broadcasts am: bc02a3901d am: 13c2764cef" into nyc-mr1-dev-plus-aosp 2016-06-05 18:23:56 +00:00
Dianne Hackborn
778b6b7c2a Fix issue #29006049: Add logging for implicit broadcasts am: bc02a3901d 
am: 13c2764cef

* commit '13c2764cef15b9fe4b67f98be458f3108a9137f3':
  Fix issue #29006049: Add logging for implicit broadcasts

Change-Id: Ifc45426f34e0aad7c6f29a06a99ade35fd5528e9
 2016-06-05 18:23:24 +00:00
Dianne Hackborn
cb369c20ad Fix issue #29006049: Add logging for implicit broadcasts am: bc02a3901d 
am: ced0e2960d

* commit 'ced0e2960d1608df92d7de28fffc6c51001843d2':
  Fix issue #29006049: Add logging for implicit broadcasts

Change-Id: I17bcafe217d4f138410c18a6f3f52bc4fb2d2c29
 2016-06-05 18:23:21 +00:00
Dianne Hackborn
ced0e2960d Fix issue #29006049: Add logging for implicit broadcasts 
am: bc02a3901d

* commit 'bc02a3901dea52d236dd855722191155156cb856':
  Fix issue #29006049: Add logging for implicit broadcasts

Change-Id: I291b4639b55b690ff6e817f87aee5d69986fbe3b
 2016-06-05 18:17:01 +00:00
Dianne Hackborn
13c2764cef Fix issue #29006049: Add logging for implicit broadcasts 
am: bc02a3901d

* commit 'bc02a3901dea52d236dd855722191155156cb856':
  Fix issue #29006049: Add logging for implicit broadcasts

Change-Id: Ifd88a4ce68bd9c2853d085bb10f74df682ae8ee6
 2016-06-05 18:17:01 +00:00
Dianne Hackborn
bc02a3901d Fix issue #29006049: Add logging for implicit broadcasts 
We now have stats on broadcasts.  We collect them over a day and
then reset, retaining the last days stats.  When a checkin happens,
we return either the last day or the current stats and then clear
them.  Not bothing to persist anything to storage, this data is
not that critical.

Change-Id: I1c3b331bcd03f79fa5e10575d9bc2ad7d9104f6f
 2016-06-04 23:40:12 -07:00
Aurimas Liutikas
6b2b65e8fb Merge "Remove duplicate the from AppBar documentation." 2016-06-04 19:41:44 +00:00
Chen Xu
ac5392467a Merge "cold sim clean up" into nyc-mr1-dev am: ba3428f01b 
am: 2581d13f25

* commit '2581d13f25878caf6011a2498b869d1dc84115ca':
  cold sim clean up

Change-Id: Ie35dd1dbede46a1ae6f6a1c902e8d54321325500
 2016-06-04 05:58:44 +00:00
fionaxu
2581d13f25 Merge "cold sim clean up" into nyc-mr1-dev 
am: ba3428f01b

* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
  cold sim clean up

Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
 2016-06-04 05:53:44 +00:00
Chen Xu
ba3428f01b Merge "cold sim clean up" into nyc-mr1-dev 2016-06-04 05:48:47 +00:00
Adarsh Fernando
c302c298ba DOCS: Updated Java 8 language support list with Type Annotations. 
Change-Id: I88773fbf1ce884bd625b3db72c36765871bb9fcc
 2016-06-03 19:35:59 -07:00
Michael Wright
9e0af7f07d Merge "Rename PointerIcon and Pointer Capture APIs" 2016-06-04 02:15:31 +00:00
Jorim Jaggi
5c12b923ff Fix delayed light status bar animation am: 72a6f058cf 
am: 2e94e8e925

* commit '2e94e8e925514b186848ff59c2e162a2d0a3872a':
  Fix delayed light status bar animation

Change-Id: I3109d00739a2cc2c9663796268c2c32fbcf52988
 2016-06-04 01:49:15 +00:00
Jorim Jaggi
2e94e8e925 Fix delayed light status bar animation 
am: 72a6f058cf

* commit '72a6f058cfcb72cad4da5ec8c84bc0a2b0d533a0':
  Fix delayed light status bar animation

Change-Id: I438a2c78f34676bd1040f3212af55e0141d48c9c
 2016-06-04 01:44:23 +00:00
Michael Wright
e051f6f1fd Rename PointerIcon and Pointer Capture APIs 
This is a response to API council feedback.

Bug: 26830970
Change-Id: I1be541a53e3943d06640169671824f7daea15462
 2016-06-04 02:20:21 +01:00
Jorim Jaggi
72a6f058cf Fix delayed light status bar animation 
Make sure to do another layout when we show the dim layer so PWM
can pick up the change and send it to SysUI.

Bug: 28434629
Change-Id: I877669ede8534601933043f60c8cef8502918c7b
 2016-06-04 01:17:31 +00:00
Jorim Jaggi
f5e5c3a72a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev am: c27660d45a 
am: acfed07f72

* commit 'acfed07f725466e866445cfdf4fda94fa0e8f0a0':
  Add new attributes for wallpaper info

Change-Id: Ie439547cb6964c1f90b2ac313408a502027ccd25
 2016-06-04 00:41:07 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
 2016-06-04 00:27:04 +00:00
TreeHugger Robot
c27660d45a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 2016-06-04 00:22:06 +00:00
James Hawkins
8c0f669605 Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 am: 45735b4c53 
am: a1a96e000e

* commit 'a1a96e000e37bd3884cde3d5c8def5f8017ca280':

Change-Id: I5e0c401e9e800e7f10e7db1a0440af4b6443467e
 2016-06-04 00:10:39 +00:00
Selim Cinek
cc74377095 Merge "Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 am: f7b21e1db0" into nyc-mr1-dev-plus-aosp 
am: fc32a305f0

* commit 'fc32a305f0dbdc0c35b9061d594ed75eea611407':

Change-Id: Id5ee6f4ee939a14c0a61f42d0e9a5974fba982ae
 2016-06-04 00:10:38 +00:00
George Mount
a9e1ad04fb Merge "Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev am: 3af59ef42c" into nyc-mr1-dev-plus-aosp 
am: 74babe679b

* commit '74babe679b0f8e17ed73280b18bc19153764c55e':
  Internal API for cross-task Activity used by assistant.

Change-Id: I985c67a465e88f74e66600709c187c3dfc9734e9
 2016-06-04 00:10:35 +00:00
James Hawkins
c4b5996d10 Merge "Merge "am/UserController: Log system uptime at two \'boot complete\' markers." into nyc-dev am: eb47d6205f am: 440e3c7dfe" into nyc-mr1-dev-plus-aosp 
am: 80267f2b08

* commit '80267f2b08f6814ab23d1436a2a37a1b032374e0':
  am/UserController: Log system uptime at two 'boot complete' markers.

Change-Id: I6fc9be4e3a02a8f32032d20134ca92a50e20a8f2
 2016-06-04 00:08:14 +00:00
Fyodor Kupolov
4a6c8aeebf Merge "Merge "Delete account from DE and CE databases" into nyc-dev am: a087d7f4fa am: 93f4735f2f" into nyc-mr1-dev-plus-aosp 
am: c346a2d872

* commit 'c346a2d8724c0965c5a037c1f0940087430776a4':

Change-Id: Ic546c4183b037160017b32717a69a1ef1be030c7
 2016-06-04 00:08:11 +00:00
Billy Lamberta
7bd034f2e3 Merge "Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev am: c0b602c441 am: 422679c891" into nyc-mr1-dev-plus-aosp 
am: 89a24c4b91

* commit '89a24c4b91723a3be6f9483cac4e28ca413c4f94':

Change-Id: Id725ef2660a0e0647a560fd087cb952e3f2dcfc0
 2016-06-04 00:08:09 +00:00
Andrew Solovay
45bdbdac56 Merge "Merge "docs: Update N release notes for DP4" into nyc-dev am: e20c1e96fc am: 16918804a2" into nyc-mr1-dev-plus-aosp 
am: a19aeccee1

* commit 'a19aeccee192cee4706f24f19a8e6a3ba1569dd9':

Change-Id: I002367730a3f0f60cfbf04f9fdb71aa0e1e52d5f
 2016-06-04 00:08:06 +00:00
Wang Xiaolei
f7183abfb3 Merge "Merge "New prebuilt" into nyc-dev am: 93b34141b1 am: d2568ccdcc" into nyc-mr1-dev-plus-aosp 
am: 95be083280

* commit '95be083280e7981e181e614e38c2b9b68f96c5d1':

Change-Id: I8e53776ce1928b801c749accbb4db5e30c22f00b
 2016-06-04 00:08:03 +00:00
Selim Cinek
d8cbcf0c9a Merge "Fixed a bug where talkback couldn\'t scroll through notifications" into nyc-dev am: 6c94972622 am: 6efad815c2 
am: 3eec7d66de

* commit '3eec7d66dedfc7f769cf154bd1a8a93b3e94460b':
  Fixed a bug where talkback couldn't scroll through notifications

Change-Id: I78e79d6a596dddf3a4a2f7a48b97cc7ee3998127
 2016-06-04 00:00:27 +00:00
Fyodor Kupolov
14f4473ea7 Merge "Delete account from DE and CE databases" into nyc-dev am: a087d7f4fa am: de5521d049 
am: b5a46631c9

* commit 'b5a46631c95c379c560f6d73a5c3ca074e08ad2c':
  Delete account from DE and CE databases

Change-Id: I62b7edd59d738ed46d9277ace4a34a9eecfeda62
 2016-06-04 00:00:24 +00:00
Billy Lamberta
d05a5d6676 Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev am: c0b602c441 am: ce13039f1d 
am: 62c91371ce

* commit '62c91371ce79ad10bafe5f569f748ee7e5b30be7':
  docs: Fix code sample in /work: Set up Single-Purpose Devices

Change-Id: Ia37868f9b7b26dce75df0f9d31763a6efa73a69c
 2016-06-04 00:00:18 +00:00
Andrew Solovay
d6e870d204 Merge "docs: Update N release notes for DP4" into nyc-dev am: e20c1e96fc am: 37286f7092 
am: f01349d16a

* commit 'f01349d16ae4253e6d48c130c55ab081e86bf332':
  docs: Update N release notes for DP4

Change-Id: I8526c3760d5a51efd4495231dbb1d350ca9125ee
 2016-06-04 00:00:13 +00:00