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

212327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Chartier
a6358d93a0 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b 
am: efa447e1ab

* commit 'efa447e1ab5a51c96219fc1d6204c128dbbaf661':
  Fix read_mapinfo to recognize free list large object space
 2015-10-19 23:51:35 +00:00
Svetoslav Ganov
7fdc5d95ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad 
am: 2a95159d2c

* commit '2a95159d2cce4321205ca7f40027a97acc2fb77e':
  Don't allow concurrent permission requests.
 2015-10-19 23:50:28 +00:00
Mathieu Chartier
efa447e1ab Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 
am: df0cc41a7b

* commit 'df0cc41a7bfa480ce5584420bceda850ad0c56c8':
  Fix read_mapinfo to recognize free list large object space
 2015-10-19 23:29:56 +00:00
Svetoslav Ganov
2a95159d2c Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 
am: aebff7f1ad

* commit 'aebff7f1ad23299d1ed71e83a3e76619a1a03574':
  Don't allow concurrent permission requests.
 2015-10-19 23:28:55 +00:00
Mathieu Chartier
df0cc41a7b Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev 
am: 7f2deeeef5

* commit '7f2deeeef53887dcad74b8aed86936983353cec4':
  Fix read_mapinfo to recognize free list large object space
 2015-10-19 23:17:09 +00:00
Svetoslav Ganov
aebff7f1ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev 
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.
 2015-10-19 23:13:46 +00:00
Mathieu Chartier
7f2deeeef5 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev 2015-10-19 22:47:45 +00:00
Mathieu Chartier
2e2069d053 Fix read_mapinfo to recognize free list large object space 
Bug: 25081604

(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)

Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
 2015-10-19 15:44:26 -07:00
Svetoslav Ganov
e199016a82 Merge "Don't allow concurrent permission requests." into mnc-dr-dev 2015-10-19 22:41:35 +00:00
Aravind Akella
fd81002e71 am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a 
* commit '73b6750cb6c3c9d5d7602878fd7020fa114a3cd3':
  Fix a possible race condition in SensorManager initialization.
 2015-10-19 21:41:36 +00:00
Aravind Akella
73b6750cb6 am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a 
* commit '005d36d1b0653fccc5aaea2af36a2622f6d74f34':
  Fix a possible race condition in SensorManager initialization.
 2015-10-19 21:36:10 +00:00
Aravind Akella
005d36d1b0 Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev 
am: a817c90a7a

* commit 'a817c90a7ab296473345b0e106acc9be4e5b678c':
  Fix a possible race condition in SensorManager initialization.
 2015-10-19 21:32:25 +00:00
Aravind Akella
a817c90a7a Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev 2015-10-19 21:15:28 +00:00
Aravind Akella
a05df455e8 Fix a possible race condition in SensorManager initialization. 
Bug: 24526176
Change-Id: Ib8bae6eee16a5b787d3c2da6ef03af311cfdfadc
 2015-10-19 12:18:37 -07:00
Geoff Mendal
06efcdc6be am e0f00d04: (-s ours) am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559 -s ours 
* commit 'e0f00d04d4d68348a8baf03f3c51521389aff576':
  Import translations. DO NOT MERGE
 2015-10-19 16:08:22 +00:00
Geoff Mendal
e0f00d04d4 am a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 7ba59c3559 -s ours 
* commit 'a6e7b3ae756946212937054bb079da1d472c0cda':
  Import translations. DO NOT MERGE
 2015-10-19 16:02:57 +00:00
Geoff Mendal
a6e7b3ae75 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: 7ba59c3559  -s ours

* commit '7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
  Import translations. DO NOT MERGE
 2015-10-19 15:59:20 +00:00
Geoff Mendal
7ba59c3559 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-19 15:55:17 +00:00
Geoff Mendal
c555378f4c Import translations. DO NOT MERGE 
Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import
 2015-10-19 08:03:19 -07:00
Geoff Mendal
69988b3cee am ffdbfaaf: (-s ours) am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours 
* commit 'ffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826':
  Import translations. DO NOT MERGE
 2015-10-19 14:22:21 +00:00
Geoff Mendal
ffdbfaaff2 am 2a09706e: (-s ours) Import translations. DO NOT MERGE am: 5e4863205e -s ours 
* commit '2a09706e86794f6482f005f5bcca2ee513a3b1d9':
  Import translations. DO NOT MERGE
 2015-10-19 14:17:11 +00:00
Geoff Mendal
2a09706e86 Import translations. DO NOT MERGE 
am: 5e4863205e  -s ours

* commit '5e4863205ee459cd8813f45e91b2e67c603d38ef':
  Import translations. DO NOT MERGE
 2015-10-19 14:11:34 +00:00
Geoff Mendal
5e4863205e Import translations. DO NOT MERGE 
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
 2015-10-19 07:01:55 -07:00
Chris Wren
fec413dbea am 9c25e23c: am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev 
* commit '9c25e23c4b571f9c9ff3fd69408c4cfd03385e82':
  count notification peeks by window action
 2015-10-17 21:46:00 +00:00
Chris Wren
9c25e23c4b am 3472f18e: am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev 
* commit '3472f18e0218c7d7a991da50db8251471fd8c25d':
  count notification peeks by window action
 2015-10-17 21:41:39 +00:00
Chris Wren
3472f18e02 am c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev 
* commit 'c7f2058cefd00bdce31a77646afa407bdf269809':
  count notification peeks by window action
 2015-10-17 21:35:25 +00:00
Chris Wren
c7f2058cef Merge "count notification peeks by window action" into mnc-dr-dev 2015-10-17 21:30:37 +00:00
Ruben Brunk
462b8b3986 am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation. 
* commit '55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
  Fix lens shading map origin calculation.
 2015-10-17 07:13:24 +00:00
Ruben Brunk
55dd957d87 am 7a027807: am c03443b2: Fix lens shading map origin calculation. 
* commit '7a027807a73aaa578d8f7a457438daac73158af0':
  Fix lens shading map origin calculation.
 2015-10-17 07:07:32 +00:00
Ruben Brunk
7a027807a7 am c03443b2: Fix lens shading map origin calculation. 
* commit 'c03443b23de0b474080168d892cd685283c3285b':
  Fix lens shading map origin calculation.
 2015-10-17 07:01:19 +00:00
Ruben Brunk
c03443b23d Fix lens shading map origin calculation. 
Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
 2015-10-17 06:55:15 +00:00
Selim Cinek
4d655e7b98 am 4135092c: am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 
* commit '4135092ce9381d5545f6ef1625a348c969614b33':
  Stopping chronometers now when the shade is closed
 2015-10-16 23:44:59 +00:00
Selim Cinek
4135092ce9 am 303e5c41: am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 
* commit '303e5c410c17b2be84051b3692635e6e24e37530':
  Stopping chronometers now when the shade is closed
 2015-10-16 23:40:12 +00:00
Selim Cinek
303e5c410c am b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 
* commit 'b9a73d2ce34b35684a282c8521d65f52fea1197a':
  Stopping chronometers now when the shade is closed
 2015-10-16 23:34:43 +00:00
Selim Cinek
b9a73d2ce3 Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev 2015-10-16 23:28:46 +00:00
Selim Cinek
98713a4fcf Stopping chronometers now when the shade is closed 
Bug: 23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12
 2015-10-16 15:58:10 -07:00
Bryce Lee
adf38ccb6e am b70426b1: am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 
* commit 'b70426b197c373ccd8ab46c080fedf66e43d52e3':
  Add capability to identify phone accounts that are emergency only.
 2015-10-16 22:33:23 +00:00
Matthew Williams
4b4ac1103e am c85315ac: am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit 'c85315acdf028d09b178e2c9a6ec66374652894a':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:33:17 +00:00
Bryce Lee
b70426b197 am 4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 
* commit '4c9fcd5412a190c6e73f25346cf13c67286fa01e':
  Add capability to identify phone accounts that are emergency only.
 2015-10-16 22:29:32 +00:00
Matthew Williams
c85315acdf am 9a365194: am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit '9a365194861e78dd5edbebf292aaa7e48804ab46':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:29:26 +00:00
Bryce Lee
4c9fcd5412 Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev 2015-10-16 22:26:48 +00:00
Matthew Williams
9a36519486 am 1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime. 
* commit '1f0ec16b6d5f20ed8b6156eb1b5abf4c73548645':
  DO NOT MERGE Sanity check loaded periodics and cap runtime.
 2015-10-16 22:25:12 +00:00
Roozbeh Pournader
ebdf60e7c8 am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit '0221328c3381680631d783c2b9733430f8b0555d':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:12:46 +00:00
Roozbeh Pournader
0221328c33 am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit 'b3538082d78284165ff0dbe5a04992afe2018d0b':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:06:21 +00:00
Roozbeh Pournader
b3538082d7 am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 
* commit '5362f273e91885041b7cb246667cff3ceca74703':
  Fix line height problem with inline images in StaticLayout.
 2015-10-16 22:01:49 +00:00
Matthew Williams
1f0ec16b6d DO NOT MERGE Sanity check loaded periodics and cap runtime. 
BUG: 24900376
We've seen an issue where periodic run times can be massively
inflated after loading from disk.
As a safeguard, cap the period's loaded runtime to be [p, 2p]
from the time of loading.

Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6
(cherry picked from commit fa8e5084eed63ab8d92c71fcff656690a30293c3)
 2015-10-16 21:56:55 +00:00
Roozbeh Pournader
5362f273e9 Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev 2015-10-16 21:54:12 +00:00
Adrian Roos
2de89ae843 am 3c439c72: am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '3c439c720d460266358c10d8d2eea9ef9e79beb0':
  Fix wrongly laid out navigation color view
 2015-10-16 21:12:06 +00:00
Adrian Roos
3c439c720d am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '85fae34e8146eaa25aea7f1d9a68effa0db3ce8e':
  Fix wrongly laid out navigation color view
 2015-10-16 20:54:40 +00:00
Adrian Roos
85fae34e81 am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev 
* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
  Fix wrongly laid out navigation color view
 2015-10-16 20:49:59 +00:00