Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,569 Commits 3 Branches 0 Tags
e97c19f59fa17d581e355d428ced35dc0691d157
Commit Graph

244569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
e97c19f59f Merge "Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev am: 57b615c am: 52375d7" into nyc-mr1-dev-plus-aosp 2016-04-19 17:47:58 +00:00
Bo Liu
5c568dbdfe Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev am: 57b615c 
am: 52375d7

* commit '52375d730bcded99132df236bcc4f196d214bba6':
  Expose DisplayListCanvas.drawGLFunctor to webview

Change-Id: I67efceccecd05dd9d19bf184d173bbffeb6895fe
 2016-04-19 17:47:37 +00:00
Bo Liu
49b608a95f Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev am: 57b615c 
am: 39e562d

* commit '39e562df80d20510b1edfbed870abe0eeb431d95':
  Expose DisplayListCanvas.drawGLFunctor to webview

Change-Id: I6dd2a77387b36dae67c5ca15b40ba985fa1addaa
 2016-04-19 17:47:34 +00:00
Bo Liu
39e562df80 Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev 
am: 57b615c

* commit '57b615c3fd3f920523b2dd34041cf1e135f5c172':
  Expose DisplayListCanvas.drawGLFunctor to webview

Change-Id: I715aa5644d405a8e484ddd633e01f5f0336b99b7
 2016-04-19 17:44:19 +00:00
Bo Liu
52375d730b Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev 
am: 57b615c

* commit '57b615c3fd3f920523b2dd34041cf1e135f5c172':
  Expose DisplayListCanvas.drawGLFunctor to webview

Change-Id: I830405c78ee848334d8b1be6f13be5449d80de81
 2016-04-19 17:44:18 +00:00
Samuel Tan
5c23e2c582 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev am: e749cd3 
am: 17804ab

* commit '17804abf32a1a1652b91eca159e11e431709fd43':

Change-Id: Ib09b0357d9626375a64198881182412de54bdc45
 2016-04-19 17:41:01 +00:00
Bo Liu
57b615c3fd Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev 2016-04-19 17:39:17 +00:00
Samuel Tan
d20aa3666b Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev am: e749cd3 
am: da3b2b7

* commit 'da3b2b7fd793d8f9f767ada6e0ecafaac54d4def':
  StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize

Change-Id: Ica2d794be865b7eb05d8a3ad38ea9e2636410a3f
 2016-04-19 17:38:23 +00:00
Samuel Tan
da3b2b7fd7 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev 
am: e749cd3

* commit 'e749cd3b15bb14e6dc4ff2724ec1ed56ba269b4c':
  StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize

Change-Id: I994e596e3d85daf89ac1ebb81a1856e57c22f2bc
 2016-04-19 17:35:11 +00:00
Samuel Tan
17804abf32 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev 
am: e749cd3

* commit 'e749cd3b15bb14e6dc4ff2724ec1ed56ba269b4c':
  StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize

Change-Id: I6c1091f9374d759da67a72703e1f688b8cd1f13d
 2016-04-19 17:35:10 +00:00
Samuel Tan
e749cd3b15 Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev 2016-04-19 17:25:33 +00:00
Android Build Merger (Role)
3f1f6a414f Merge "Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f am: 4dc65d3" into nyc-mr1-dev-plus-aosp 2016-04-19 17:24:16 +00:00
Android Build Merger (Role)
d43a354aef Merge "Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad am: 091fba4" into nyc-mr1-dev-plus-aosp 2016-04-19 17:24:02 +00:00
Android Build Merger (Role)
309e29e375 Merge "Merge "Handle null uris in content changed events." into nyc-dev am: 00c9815 am: a7f5e8a" into nyc-mr1-dev-plus-aosp 2016-04-19 17:23:47 +00:00
Jeff Sharkey
cff9f44023 Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f 
am: 4dc65d3

* commit '4dc65d31a1c6c974a76d36732199a66a61db3289':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: I783b7626a45c083efb5121f66618f103f3178b97
 2016-04-19 17:23:06 +00:00
Jeff Sharkey
391246aec8 Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad 
am: 091fba4

* commit '091fba4449fc226ceb4de19a86e152b9478e374f':
  Disable "defusable" logging for now.

Change-Id: I4d2f2ae3a99ff9ab946e256e59ef77b2ddceb7ec
 2016-04-19 17:23:05 +00:00
Steve McKay
7d333ce1c4 Merge "Handle null uris in content changed events." into nyc-dev am: 00c9815 
am: a7f5e8a

* commit 'a7f5e8a23f9fe3276a14209905edd16c1a135373':
  Handle null uris in content changed events.

Change-Id: Ida7759d2f8aa502f674831d530f8c62b9afe5e12
 2016-04-19 17:23:03 +00:00
Jeff Sharkey
4d341a5a1c Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev am: 89fa73f 
am: 25b3756

* commit '25b37561104a3dfb5cc52d076f904fe0e8313217':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: Ieba43635739603787daa110a0bf35381c0e09574
 2016-04-19 17:22:36 +00:00
Jeff Sharkey
df6d01463a Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad 
am: ea54db6

* commit 'ea54db6b48dea0c13f6b5a32dbc9fa66faf6206f':
  Disable "defusable" logging for now.

Change-Id: Ie1bb02c88e7cea2db99da9c06ae2778363f42f1b
 2016-04-19 17:22:34 +00:00
Steve McKay
8a5139ab69 Merge "Handle null uris in content changed events." into nyc-dev am: 00c9815 
am: 1e92215

* commit '1e92215278dc677a943b5fb258ed5588246ae371':
  Handle null uris in content changed events.

Change-Id: I69ab40f2fdd8544ff08aebd17ff4de1ac585c32c
 2016-04-19 17:22:30 +00:00
Jeff Sharkey
25b3756110 Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev 
am: 89fa73f

* commit '89fa73fd7abe0f87634d2914163a8fc79ba2f738':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: I67f594584458beb08dc6fc9e61174759d2c143b5
 2016-04-19 17:16:31 +00:00
Jeff Sharkey
ea54db6b48 Merge "Disable "defusable" logging for now." into nyc-dev 
am: d3a25ad

* commit 'd3a25ad4b98d717673cb3a81ae1344ff90107d8c':
  Disable "defusable" logging for now.

Change-Id: I921c3f383a00ac8e8b5b1568b855420a8e191bf8
 2016-04-19 17:16:29 +00:00
Steve McKay
1e92215278 Merge "Handle null uris in content changed events." into nyc-dev 
am: 00c9815

* commit '00c9815d942265719de92a19e243c1c970929210':
  Handle null uris in content changed events.

Change-Id: Ic249a09d6cdbc04acab19e2b64a12f59faeff51f
 2016-04-19 17:16:27 +00:00
Jeff Sharkey
4dc65d31a1 Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev 
am: 89fa73f

* commit '89fa73fd7abe0f87634d2914163a8fc79ba2f738':
  Unlock should always wait for pending PRE_BOOT.

Change-Id: I0043da18fabef2c5c916a2e5562d9e613c2b057c
 2016-04-19 17:16:25 +00:00
Jeff Sharkey
091fba4449 Merge "Disable "defusable" logging for now." into nyc-dev 
am: d3a25ad

* commit 'd3a25ad4b98d717673cb3a81ae1344ff90107d8c':
  Disable "defusable" logging for now.

Change-Id: Ibd04f5de04ada226a210414755de4f80d9d2e889
 2016-04-19 17:16:22 +00:00
Steve McKay
a7f5e8a23f Merge "Handle null uris in content changed events." into nyc-dev 
am: 00c9815

* commit '00c9815d942265719de92a19e243c1c970929210':
  Handle null uris in content changed events.

Change-Id: I2945895f58795dce9a439e58844b1406dec7abf1
 2016-04-19 17:16:20 +00:00
Eric Laurent
f6f4014b30 Merge "AudioSystem: allow platforms no audio ports" into nyc-dev am: 0b724f8 
am: 869ec0f

* commit '869ec0f337d059328168e101102f0adcc2828cf6':

Change-Id: Ib5beec45cf487e5cbc364e22ab3c5405f557eddf
 2016-04-19 17:16:00 +00:00
Siyamed Sinir
34d68a9886 Merge "Request re-layout after setText if layout width is 0" into nyc-dev am: d01e6f9 
am: 677736b

* commit '677736bd88a780c3af396df98077e9ebcac3d224':

Change-Id: Iad522567a6c900b559661445b9cf02fee821071f
 2016-04-19 17:15:58 +00:00
Eric Laurent
4700433dcb Merge "AudioSystem: allow platforms no audio ports" into nyc-dev am: 0b724f8 
am: 0991b3a

* commit '0991b3a6208ba794af4a3c0ee4592c57ec9ecb19':
  AudioSystem: allow platforms no audio ports

Change-Id: I4639a58e6743cb715235da0765dffa3e3ab41614
 2016-04-19 17:13:20 +00:00
Siyamed Sinir
a4c7dcdde9 Merge "Request re-layout after setText if layout width is 0" into nyc-dev am: d01e6f9 
am: 5ce80a0

* commit '5ce80a03e7f86e0aae141b2340d13439c65cbf3b':
  Request re-layout after setText if layout width is 0

Change-Id: Ic7dd362f57eb10df8cca6fc8b6720cc0f45fc2f1
 2016-04-19 17:13:18 +00:00
Jeff Sharkey
89fa73fd7a Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev 2016-04-19 17:11:20 +00:00
Jeff Sharkey
d3a25ad4b9 Merge "Disable "defusable" logging for now." into nyc-dev 2016-04-19 17:10:56 +00:00
Steve McKay
00c9815d94 Merge "Handle null uris in content changed events." into nyc-dev 2016-04-19 17:10:25 +00:00
Eric Laurent
869ec0f337 Merge "AudioSystem: allow platforms no audio ports" into nyc-dev 
am: 0b724f8

* commit '0b724f8770dffcda935d6ec5ea50fb93fb7b8891':
  AudioSystem: allow platforms no audio ports

Change-Id: I429d01aa097b846e3ad15580223d3f5472977b58
 2016-04-19 17:10:17 +00:00
Siyamed Sinir
677736bd88 Merge "Request re-layout after setText if layout width is 0" into nyc-dev 
am: d01e6f9

* commit 'd01e6f90832e7b7d55218836aae227452080f9b8':
  Request re-layout after setText if layout width is 0

Change-Id: I1151616a69aebada2f2738ee248734c9352b8f74
 2016-04-19 17:10:15 +00:00
Eric Laurent
0991b3a620 Merge "AudioSystem: allow platforms no audio ports" into nyc-dev 
am: 0b724f8

* commit '0b724f8770dffcda935d6ec5ea50fb93fb7b8891':
  AudioSystem: allow platforms no audio ports

Change-Id: Ic157385bfad7826e96562a7c2647c1dca26c0548
 2016-04-19 17:09:53 +00:00
Siyamed Sinir
5ce80a03e7 Merge "Request re-layout after setText if layout width is 0" into nyc-dev 
am: d01e6f9

* commit 'd01e6f90832e7b7d55218836aae227452080f9b8':
  Request re-layout after setText if layout width is 0

Change-Id: Ia2ad9975ecbc3ebf2b468f515fcbf82a9bc4bb2d
 2016-04-19 17:09:52 +00:00
Android Build Merger (Role)
88751e132e Merge "Fixed a rebase gone wrong with pageindicator am: 20e84c7 am: f5b74b0" into nyc-mr1-dev-plus-aosp 2016-04-19 17:07:16 +00:00
Selim Cinek
464d257d71 Fixed a rebase gone wrong with pageindicator am: 20e84c7 
am: f5b74b0

* commit 'f5b74b079cdccaed36183c4a68e30f454d49bfa8':
  Fixed a rebase gone wrong with pageindicator

Change-Id: I566859c5b763c5c3df627602b3fc8ede67b63e84
 2016-04-19 17:06:48 +00:00
Selim Cinek
22a6644e88 Fixed a rebase gone wrong with pageindicator am: 20e84c7 
am: 436256a

* commit '436256a90684d8f152897c3b3b9e20d15bdb0023':
  Fixed a rebase gone wrong with pageindicator

Change-Id: I21d81bf19b26dd0cf6e162624f19f337a5f2a62e
 2016-04-19 17:06:43 +00:00
Eric Laurent
0b724f8770 Merge "AudioSystem: allow platforms no audio ports" into nyc-dev 2016-04-19 17:05:01 +00:00
Selim Cinek
f5b74b079c Fixed a rebase gone wrong with pageindicator 
am: 20e84c7

* commit '20e84c750f7ef783344f9890764906e20b0df822':
  Fixed a rebase gone wrong with pageindicator

Change-Id: I08bfc4b3c0cb3a8159645c7ff6d017daa8db6c9e
 2016-04-19 17:03:23 +00:00
Selim Cinek
436256a906 Fixed a rebase gone wrong with pageindicator 
am: 20e84c7

* commit '20e84c750f7ef783344f9890764906e20b0df822':
  Fixed a rebase gone wrong with pageindicator

Change-Id: I8ec5cc5e74498c1ea2ed6eddc33c6f42e1d5b83c
 2016-04-19 17:03:21 +00:00
Siyamed Sinir
d01e6f9083 Merge "Request re-layout after setText if layout width is 0" into nyc-dev 2016-04-19 17:00:15 +00:00
Selim Cinek
20e84c750f Fixed a rebase gone wrong with pageindicator 
The return statement was lost.

Change-Id: Ica403337bf9dce2c0b1c2447a0aa4359f991ac0d
Fixes: 27927374
 2016-04-19 16:52:59 +00:00
Android Build Merger (Role)
5e8b603c83 Merge "Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev am: 0529197 am: 788504f" into nyc-mr1-dev-plus-aosp 2016-04-19 16:51:28 +00:00
Android Build Merger (Role)
6871ccb4d6 Merge "Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev am: a98cc8b am: fbde0d8" into nyc-mr1-dev-plus-aosp 2016-04-19 16:51:16 +00:00
Alan Viverette
67448026a9 Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev am: 0529197 
am: 788504f

* commit '788504faf0f395818c6753dd4b611874133c2dab':
  Use adjusted popup window position when calculating best-fit

Change-Id: Ieb11c6da459c7021a334148a9d772130ad512877
 2016-04-19 16:50:42 +00:00
Alan Viverette
5d2be0c6a0 Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev am: a98cc8b 
am: fbde0d8

* commit 'fbde0d8d85015c261fb748dcedb20218e2b1f277':
  Call OnTimeChangedListener on AM/PM change in clock-style TimePicker

Change-Id: I7addb66bdebe92d908b42abf848cf65edae09122
 2016-04-19 16:50:39 +00:00
Alan Viverette
1676842611 Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev am: 0529197 
am: e30e53b

* commit 'e30e53bd5fbd4e15fd27dccaf3f8a6986f5ba629':
  Use adjusted popup window position when calculating best-fit

Change-Id: I3d1f15fe641c1ab2c72b1ec04bd02447f2ff3b6b
 2016-04-19 16:50:38 +00:00