Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,245 Commits 3 Branches 0 Tags
906bf903b4c2160080c53a6103494de40fa00d81
Commit Graph

60006 Commits

Author SHA1 Message Date
Android Build Merger (Role)
f07abaa6cb Merge "Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac am: 45c6eb2164" 2016-05-05 19:58:23 +00:00
Ian Rogers
26b522c6e3 Merge "Fix divergent equals and hashCode behavior." 2016-05-05 19:57:46 +00:00
Robert Carr
4d1cd18333 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 am: b9d2502eac 
am: 45c6eb2164

* commit '45c6eb21648f9977057471d1f41beb275512a449':
  Prepare to replace windows across recreate().

Change-Id: I08c6f599d36fabb4f52ba23e9794c28203cc65b5
 2016-05-05 19:57:27 +00:00
Robert Carr
45c6eb2164 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 
am: b9d2502eac

* commit 'b9d2502eac428ee8021bcfa43977479032a88bfc':
  Prepare to replace windows across recreate().

Change-Id: Ia144fd6e15340d062d659903548e48121c43f8c4
 2016-05-05 19:52:27 +00:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev 
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
 2016-05-05 19:47:36 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Alan Viverette
4b5f0abb5f Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c75 am: ff71f781a3 
am: 91aefd574c

* commit '91aefd574c24ac84f77319163249156baa2fab2b':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I020369fa95fc497d3551678b815dba50d64085a6
 2016-05-05 19:03:37 +00:00
Alan Viverette
91aefd574c Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c75 
am: ff71f781a3

* commit 'ff71f781a369dd1e5231dbbd13981bbb320d49ab':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I9bc9d812b9e08f73d53f8243bf0ae78d7853d72b
 2016-05-05 18:58:59 +00:00
Alan Viverette
ff71f781a3 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 
am: 3a3fb73c75

* commit '3a3fb73c753efb2114693b1943246bc6c47f9470':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I292d86c36049afe621f559d01a12976c9f6068ca
 2016-05-05 18:54:34 +00:00
Alan Viverette
3a3fb73c75 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 2016-05-05 18:37:43 +00:00
Alan Viverette
61c41bf617 Revert "Always assign leftover pixels to last weighted child" 
This reverts commit cc26636f08.

Bug: 27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
 2016-05-05 17:54:36 +00:00
Jason Monk
d7216d34a8 Merge "Add action to launch webview implementation settings" into nyc-dev am: c91f5e2971 am: eb435a3a4c 
am: ef8fd63228

* commit 'ef8fd6322863fc4cd2a7913d98bc55df8ff64d12':
  Add action to launch webview implementation settings

Change-Id: I7428a61f23573e2ce91d181c7238195f661ca43a
 2016-05-05 17:15:19 +00:00
Jason Monk
ef8fd63228 Merge "Add action to launch webview implementation settings" into nyc-dev am: c91f5e2971 
am: eb435a3a4c

* commit 'eb435a3a4cd186ada82fae4dcd3083d65ceab603':
  Add action to launch webview implementation settings

Change-Id: I29656ef85a9dda4988ff85e99eda883995538d61
 2016-05-05 17:11:00 +00:00
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev 
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
 2016-05-05 17:07:12 +00:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Rubin Xu
eae1425bf6 Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95 am: b9d94a454d 
am: c926f0eb0f

* commit 'c926f0eb0fbc58a53e0ffdbf0fc9a994a95e886d':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: Ic07faee56bbed2f5f18a35fc0a42e149a055961e
 2016-05-05 13:22:34 +00:00
Rubin Xu
c926f0eb0f Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95 
am: b9d94a454d

* commit 'b9d94a454d426e86f7c032f130d089af65120bf4':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I25456d9756eefb619d446f23d48b0919a53c073f
 2016-05-05 13:16:55 +00:00
Rubin Xu
b9d94a454d Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev 
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
 2016-05-05 13:12:45 +00:00
Tony Mak
89f575b631 Merge "No keyguard should be shown after reboot if it is in kiosk mode" 2016-05-05 12:01:37 +00:00
Rubin Xu
0fb6b9e18c Guard retrievePreRebootSecurityLogs with config flag 
Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
 2016-05-05 12:00:50 +01:00
Alan Viverette
363a5d1f2a Merge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412 am: 9204810e66 
am: 8902b96225

* commit '8902b962250439c5a0f80b3cca4c39bc9ee0fa73':
  Always assign leftover pixels to last weighted child

Change-Id: Ib229a7cc5550942eb094c8d549711129af8594a0
 2016-05-05 02:34:30 +00:00
Alan Viverette
8902b96225 Merge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412 
am: 9204810e66

* commit '9204810e668d14e3d739726da996a89488e7e6d9':
  Always assign leftover pixels to last weighted child

Change-Id: I5fe075d83f6b299511a92cc5721f0b68614f6e80
 2016-05-05 02:32:29 +00:00
Alan Viverette
1a1301286c Merge "Always assign leftover pixels to last weighted child" into nyc-dev 
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: I80fbcb2d86b718bd02f7e0528bd498b894381502
 2016-05-05 02:30:18 +00:00
Alan Viverette
9204810e66 Merge "Always assign leftover pixels to last weighted child" into nyc-dev 
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: Ibfaa979ba23c204172015fae11a767be8a4852dc
 2016-05-05 02:29:57 +00:00
Alan Viverette
a11c21b412 Merge "Always assign leftover pixels to last weighted child" into nyc-dev 2016-05-05 02:26:45 +00:00
Ruben Brunk
f9d60d034e Merge "Update VR API docs." into nyc-dev am: 01d232988a am: 2d1a1a4521 
am: d12543c983

* commit 'd12543c9836ebae9f82045ef626d09da2654363f':
  Update VR API docs.

Change-Id: Ic26060e0684b983767b399490e8d47c0420a1c11
 2016-05-05 00:49:47 +00:00
Chong Zhang
43faf5c5cb Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev am: 6afe594461 am: 242eadabea 
am: c4c65f211e

* commit 'c4c65f211e3c40ee00dd0be796fe0d0a4080378b':
  Debug traces to facilitate screen timeout debugging

Change-Id: Id698967d9d1d11c2d086584b60fa1fe3766df091
 2016-05-05 00:34:15 +00:00
Dianne Hackborn
4e1fa3c476 resolve merge conflicts of a14aac9 to master 
Change-Id: If92c42a9e6fbc3cccd24fa2677f0e4c34d65c923
 2016-05-04 16:53:38 -07:00
Ruben Brunk
d12543c983 Merge "Update VR API docs." into nyc-dev am: 01d232988a 
am: 2d1a1a4521

* commit '2d1a1a45219d4946527c284eb801a1c9e966966c':
  Update VR API docs.

Change-Id: I6f3c0348d98db2d7c8f6e3d757ac77f02d4e179f
 2016-05-04 23:44:04 +00:00
Ruben Brunk
17f3a40645 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I1b2cc88ca390c90d42cae3736aaf986e6c0e9396
 2016-05-04 23:43:50 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
 2016-05-04 23:41:38 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Chong Zhang
c4c65f211e Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev am: 6afe594461 
am: 242eadabea

* commit '242eadabeabbd4413a0b92e6176d3fa1fbec1389':
  Debug traces to facilitate screen timeout debugging

Change-Id: I905f70f191f02ced4feed2a4e50366cca0240251
 2016-05-04 22:57:56 +00:00
Dianne Hackborn
a14aac9a2d Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev am: 6eb119c7cb 
am: 5081e36897

* commit '5081e368978e00353c5968f0f7656ca28e963b4a':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I0db52017c4a351341b0823381e7b85b0c641a16d
 2016-05-04 22:57:53 +00:00
Chris Craik
0af20e8385 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 am: 2f66d0a849 
am: 115f86846b

* commit '115f86846b74ea45e15f9bc60b9edfee9b13f3c2':
  Fix View leakage from mPreSortedChildren

Change-Id: I77778638af8ae77bfe423c8e617932df606b4268
 2016-05-04 22:55:37 +00:00
Chong Zhang
242eadabea Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I89dad5e66db460af83deac679f2f81bef34d0e69
 2016-05-04 22:52:55 +00:00
Dianne Hackborn
5081e36897 Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I9030b23fc42bc9a13a3a7cb0f1b92142bb6ea546
 2016-05-04 22:52:52 +00:00
Chong Zhang
8babbb3d3c Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I6b04707b616a9251b2ebdd3b02cd5e692a479ceb
 2016-05-04 22:52:50 +00:00
Dianne Hackborn
8e3c8c53c8 Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: Ife9159aa9a689f5309e106e07455b19a456cb642
 2016-05-04 22:52:48 +00:00
Chong Zhang
6afe594461 Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 2016-05-04 22:50:11 +00:00
Dianne Hackborn
6eb119c7cb Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 2016-05-04 22:49:59 +00:00
Chris Craik
115f86846b Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 
am: 2f66d0a849

* commit '2f66d0a8497d1f1247a7f293b2b681cef1f9057f':
  Fix View leakage from mPreSortedChildren

Change-Id: I317fb1f6d5b0e145601649cd0e43730342a0e80d
 2016-05-04 22:33:13 +00:00
Chet Haase
426e872d35 Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7 am: 26a4627102 
am: c96a245e1a

* commit 'c96a245e1a771a2a9b020c14fee90aa60b832318':
  Force second measure pass when there is a configuration change

Change-Id: Ic81ffd3b7ea102f8e4e72a3a6c5d779dfb1b009e
 2016-05-04 22:31:34 +00:00
Yohei Yukawa
f08b176da4 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am: 68c1e1935d am: 8e0e5e8a88 
am: 1cdcbcbc8f

* commit '1cdcbcbc8f065e062c1cb9d914f944e8b1fbbb27':
  Fix a behavior change in "Show software keyboard".

Change-Id: I6a0a06bbbe6d23c9398967d7cb4eb89f90eaae9d
 2016-05-04 22:31:11 +00:00
Chris Craik
2f66d0a849 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: Idd17fa7d0cb1bfbca1725525d85e4068a234c8b6
 2016-05-04 22:30:30 +00:00
Chris Craik
1318ac2c8a Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: I4a2c7016907c22bcb4ae9640aa1feb5a0f812bbb
 2016-05-04 22:30:27 +00:00
TreeHugger Robot
4e34cd0537 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 2016-05-04 22:23:26 +00:00
Makoto Onuki
0e86dfb802 Merge "Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev am: 5b9d876ef5" into nyc-mr1-dev-plus-aosp 
am: ccf9c83765

* commit 'ccf9c8376595ddbed64cedd236349cb99a2e8708':
  ShortcutManaegr: bug fixes

Change-Id: I2aeb67ca5f46165b63e685c90d8acf6cb909b351
 2016-05-04 22:09:57 +00:00
Wale Ogunwale
d622b932fa Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev am: 75179ada54" into nyc-mr1-dev-plus-aosp 
am: c2bef7c6e2

* commit 'c2bef7c6e2eade011a73db1abd4acf2ab8b3aca7':
  Make sure to pause activity before stopping

Change-Id: I4ae725d3d331cf834da1456d6aebcc702e4ad8d6
 2016-05-04 22:09:41 +00:00
Chong Zhang
4ffc318012 Debug traces to facilitate screen timeout debugging 
bug: 27522448
Change-Id: I4d51be316e4aedecffb7001126849d7c6136d517
 2016-05-04 15:09:01 -07:00