drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,690 Commits 1 Branch 0 Tags
Commit Graph

178690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vandwalle
1c9c3f4e9b am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 
automerge: 67878bb

* commit '67878bb5ea8b4cc873a25ab577a94a8d6f122dc1':
  add debug logs to confirm network flapping issue is fixed Bug:18706288
 2014-12-18 22:28:38 +00:00
vandwalle
67878bb5ea am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 
* commit 'a3c187bc1f97dc098ff939cfe937a482a9bdf7fb':
  add debug logs to confirm network flapping issue is fixed Bug:18706288
 2014-12-18 22:26:38 +00:00
vandwalle
a3c187bc1f am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 
* commit 'f87606fe25acff86807ef0514b478359bcb52f84':
  add debug logs to confirm network flapping issue is fixed Bug:18706288
 2014-12-18 22:20:27 +00:00
vandwalle
f87606fe25 Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev 2014-12-18 22:16:30 +00:00
Craig Mautner
6c13f5921d am 2eb575b4: am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 
automerge: 4ed8a33

* commit '4ed8a336efc76847fbf3e11a0ae66aa74c422846':
  Make window mgr stack movement track activity mgr
 2014-12-18 21:57:36 +00:00
Winson Chung
f69fe23bff am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
automerge: 5d40d0b

* commit '5d40d0b645e31063d08e304e4ba2880b267234b9':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:56:20 +00:00
Craig Mautner
4ed8a336ef am 2eb575b4: am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 
* commit '2eb575b4b0429d42c14627627d9630ba6056262e':
  Make window mgr stack movement track activity mgr
 2014-12-18 21:53:43 +00:00
Winson Chung
5d40d0b645 am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit '4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:53:36 +00:00
John Reck
536fbce41d Merge "Split hwui's makefile" 2014-12-18 21:40:16 +00:00
John Reck
35cf58ab28 Split hwui's makefile 
Change-Id: I7ad1a692e708cad052e8ca5b412c17e25992862c
 2014-12-18 13:14:40 -08:00
Jeff Hao
a6ad625cc7 am e06184e4: Merge "Add mips64 support to app_process." automerge: 51bdc62 
automerge: 093dad2

* commit '093dad2a47aed9f16fd4190af4b3070b49b982f1':
  Add mips64 support to app_process.
 2014-12-18 21:04:52 +00:00
Alex Klyubin
bdd637a3ff am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes." automerge: e48aec9 
automerge: 22810c4

* commit '22810c4d171a1057bd2f36cb62664a242e7be0b9':
  Remove DefaultHostnameVerifier from preloaded-classes.
 2014-12-18 21:03:25 +00:00
Olawale Ogunwale
b0767c8c35 am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." automerge: 5cb6837 
automerge: a96b61d

* commit 'a96b61d931df00ab5744c53a87008a9cce461329':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.
 2014-12-18 21:02:00 +00:00
Elliott Hughes
496894b0e1 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." automerge: e37f3af 
automerge: e6f2f9d

* commit 'e6f2f9db42632f581d221ece90e1824e114f2f12':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 21:00:53 +00:00
Jeff Hao
093dad2a47 am e06184e4: Merge "Add mips64 support to app_process." 
automerge: 51bdc62

* commit '51bdc629f59b45fa64331e3c41ac35147ed4c7f6':
  Add mips64 support to app_process.
 2014-12-18 20:58:17 +00:00
Alex Klyubin
22810c4d17 am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes." 
automerge: e48aec9

* commit 'e48aec9e7fd8be25ac43a4a6e69b1829f0d57d38':
  Remove DefaultHostnameVerifier from preloaded-classes.
 2014-12-18 20:56:54 +00:00
Olawale Ogunwale
a96b61d931 am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 
automerge: 5cb6837

* commit '5cb6837f288e3f1e0ff8f6f9b571a85ebb34bca7':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.
 2014-12-18 20:55:34 +00:00
Elliott Hughes
e6f2f9db42 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." 
automerge: e37f3af

* commit 'e37f3af76dc0c876ea7169b9153f79175d0c703d':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 20:54:28 +00:00
Craig Mautner
2eb575b4b0 am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 
* commit '2281e7d6a18e4eebea602c8093ec7cb6541f2960':
  Make window mgr stack movement track activity mgr
 2014-12-18 20:26:00 +00:00
Winson Chung
4edaa5e4b6 am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit 'a320b2176c9e6a5b3f2c3fe6f80ca9b14e088e9a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 20:25:55 +00:00
Jeff Hao
51bdc629f5 am e06184e4: Merge "Add mips64 support to app_process." 
* commit 'e06184e4b1f2228f404a3346b7355219b437c28a':
  Add mips64 support to app_process.
 2014-12-18 20:25:39 +00:00
Craig Mautner
2281e7d6a1 Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev 2014-12-18 19:55:51 +00:00
Winson Chung
a320b2176c Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 2014-12-18 19:30:40 +00:00
Winson Chung
e494c382c0 Bug 18784289: Fix issue with transition animation callback. 
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback.  This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.

Bug: 18784289

Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
 2014-12-18 11:27:18 -08:00
Jeff Hao
e06184e4b1 Merge "Add mips64 support to app_process." 2014-12-18 19:18:54 +00:00
Alex Klyubin
e48aec9e7f am ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes." 
* commit 'ff35642e4732771a275e0ba8147af4a5d77f8419':
  Remove DefaultHostnameVerifier from preloaded-classes.
 2014-12-18 17:45:35 +00:00
Alex Klyubin
ff35642e47 Merge "Remove DefaultHostnameVerifier from preloaded-classes." 2014-12-18 17:40:46 +00:00
Olawale Ogunwale
5cb6837f28 am 07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 
* commit '07bb03c42343d54d0a8eb609c74eebd9ecd0df9d':
  Avoid deadlock between ActivityManagerService and ProcessStatsService.
 2014-12-18 17:00:07 +00:00
Elliott Hughes
e37f3af76d am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." 
* commit '5cd79d070828b79d8b7d4ecdc3bdbf862866ac9a':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 17:00:01 +00:00
Olawale Ogunwale
07bb03c423 Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 2014-12-18 16:55:43 +00:00
Elliott Hughes
5cd79d0708 Merge "Move the remaining ZygoteInit native code over to Java." 2014-12-18 16:55:23 +00:00
Mike Reed
f2883b320f explicitly call tryAllocPixels if you want to check for failure 
allows us to remove SK_SUPPORT_LEGACY_ALLOCPIXELS_BOOL

Change-Id: I095a04e358404bc413ceebe81e7e1adfbbbec027
 2014-12-18 16:47:08 +00:00
Douglas Leung
7e7c603182 Add mips64 support to app_process. 
Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214
 2014-12-17 20:27:25 -08:00
Elliott Hughes
fcc0788419 am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a 
automerge: 9962ed5

* commit '9962ed55759336642cfaba27e8b2a47822f562fe':
  Remove a bitrotted test.
 2014-12-18 02:42:27 +00:00
Elliott Hughes
9962ed5575 am 93241de7: Merge "Remove a bitrotted test." 
automerge: ba6982a

* commit 'ba6982a16cb3b9f6196fdac11d1d90a02eb32cfd':
  Remove a bitrotted test.
 2014-12-18 02:40:10 +00:00
Michael Runge
3fa2307254 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev automerge: 8deabad 
automerge: 647beed

* commit '647beed62236c996b946e85d06fdf4335b6a2a80':
  Increase timeout when uncrypting OTA
 2014-12-18 02:08:44 +00:00
Svetoslav
9f93e272da Merge "Avoid non-static innner classes that are passed over via IPC." 2014-12-18 02:05:40 +00:00
Svetoslav
7643f7e399 Avoid non-static innner classes that are passed over via IPC. 
Change-Id: Ic14565c135b1f2ba50fa57462738b8dbc0e73301
 2014-12-18 02:04:46 +00:00
Rich Slogar
d1a274f283 am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a automerge: bdc1a3d 
automerge: 3a586c0

* commit '3a586c032c2cf39da72882c6466aa198ec7c85dc':
  docs: sdk revision 24.0.2
 2014-12-18 02:03:53 +00:00
Eric Gilmore
6b1ecbea31 am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f automerge: 65e7a2b 
automerge: 982e5eb

* commit '982e5eb3655f20608c1ae492c4366f2fb35cdd2c':
  Adding links for the last few files requested by PMs.
 2014-12-18 02:02:41 +00:00
Pavel Zhamaitsiak
cb4ffae80d am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev automerge: a0fc9f2 
automerge: 11603be

* commit '11603bebfad30ed0cf0f4abbfd7817bc81b40c5e':
  IMS: Set phone account in IMS Conference object
 2014-12-18 02:01:20 +00:00
Michael Runge
647beed622 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 
automerge: 8deabad

* commit '8deabad541984571496456646d6a7a91eccc9e42':
  Increase timeout when uncrypting OTA
 2014-12-18 01:59:10 +00:00
Rich Slogar
3a586c032c am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a 
automerge: bdc1a3d

* commit 'bdc1a3d03a8dee874e782dc9e2423571cce70406':
  docs: sdk revision 24.0.2
 2014-12-18 01:57:51 +00:00
Eric Gilmore
982e5eb365 am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f 
automerge: 65e7a2b

* commit '65e7a2b74f2f01da74ae0c13ada1841b24ea5cf7':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:56:40 +00:00
Pavel Zhamaitsiak
11603bebfa am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev 
automerge: a0fc9f2

* commit 'a0fc9f2dd1820611295c6f83efec60c2a8f37eee':
  IMS: Set phone account in IMS Conference object
 2014-12-18 01:55:06 +00:00
Michael Runge
8deabad541 am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 
* commit '37fed329adec7b339755fde0b38c687f70524e4e':
  Increase timeout when uncrypting OTA
 2014-12-18 01:53:26 +00:00
Michael Runge
37fed329ad Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev 2014-12-18 01:49:08 +00:00
Rich Slogar
bdc1a3d03a am 6dfc3aab: am 879cffde: am 8838a9f0: docs: sdk revision 24.0.2 automerge: 85e645a 
* commit '6dfc3aab025579d0472d99fc80a1a6af0703240b':
  docs: sdk revision 24.0.2
 2014-12-18 01:42:45 +00:00
Eric Gilmore
65e7a2b74f am 2195f583: am 41ea13c8: am fe7b93f4: Adding links for the last few files requested by PMs. automerge: 8d2af0f 
* commit '2195f58301824d995959eafab76ddc630bd0344e':
  Adding links for the last few files requested by PMs.
 2014-12-18 01:42:40 +00:00
Wonsik Kim
874d0c61e3 Merge "TIF: change TvInputHal events to run on its own thread" 2014-12-18 01:40:32 +00:00