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

159956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
13e659cc55 am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '869939a186c610de90d247bc27f26260a26c3daa':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:54:10 +00:00
Mathieu Chartier
4084fe72bb am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '890ef76560d34e325b82e1bf72336de8de838844':
  Fix dalvik map names
 2014-09-24 22:54:05 +00:00
Chet Haase
4999b789a7 am a37758c8: am 62a7327e: am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit 'a37758c8c96b472ee09c67638f518c124be1bf75':
  Avoid drawing the starting window twice
 2014-09-24 22:54:00 +00:00
Selim Cinek
40f6384b64 am c23d37aa: am 31dc5801: Only show FAB for the frontmost task 
* commit 'c23d37aae690001d7f5fd82c9db80fd01876e079':
  Only show FAB for the frontmost task
 2014-09-24 22:53:56 +00:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
 2014-09-24 15:47:36 -07:00
Derek Sollenberger
102a9826b0 am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '946c697abc160fc49446fa68976aff45efcd9005':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:44:15 +00:00
Mathieu Chartier
23f88f2ff1 am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '025b8203ffa22a7f6fc9aa3f054ab5f903735233':
  Fix dalvik map names
 2014-09-24 22:44:11 +00:00
Chet Haase
b4c610199e am 62a7327e: am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit '62a7327e74f1915d0fdb9b45b3e4f17e3967e1a4':
  Avoid drawing the starting window twice
 2014-09-24 22:44:06 +00:00
Selim Cinek
959d2c4066 am 31dc5801: Only show FAB for the frontmost task 
* commit '31dc5801f9da5acd8a250abc5c12d5e2bcf5da5d':
  Only show FAB for the frontmost task
 2014-09-24 22:44:01 +00:00
Derek Sollenberger
b468bba92a am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '07f751baac5be1184fa8868176fc7e8b4791c3f9':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:27:00 +00:00
Mathieu Chartier
f5ced0a9ed am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '443c76479684c6aecf132b415aa7052c6bd9d174':
  Fix dalvik map names
 2014-09-24 22:26:56 +00:00
Chet Haase
5dfd08882c am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit '326c443e1bed7d0bd711ebfeb7f5c0003d534281':
  Avoid drawing the starting window twice
 2014-09-24 22:25:58 +00:00
Andreas Gampe
dfdabe3728 am 6f954cf2: Merge "Frameworks/base: Early init native bridge" 
* commit '6f954cf2eb2baadf26bc0aba6272ef19b5dd45a0':
  Frameworks/base: Early init native bridge
 2014-09-24 22:10:15 +00:00
Selim Cinek
104aae1dcc Only show FAB for the frontmost task 
Bug: 17522143
Change-Id: I882185f27a4e9da57007818f678451a7e6e1ef81
 2014-09-24 22:05:59 +00:00
Andreas Gampe
6f954cf2eb Merge "Frameworks/base: Early init native bridge" 2014-09-24 21:59:51 +00:00
George Mount
da083bfd03 am 028332e9: am 5506d92e: Fix NPE when detached View is added as a shared element. 
* commit '028332e93e885d260c6214ca14e02035242c8dfe':
  Fix NPE when detached View is added as a shared element.
 2014-09-24 20:49:33 +00:00
George Mount
0a90597a29 am 5506d92e: Fix NPE when detached View is added as a shared element. 
* commit '5506d92e98f69c81ec2f5bbf82726e3333cf7e85':
  Fix NPE when detached View is added as a shared element.
 2014-09-24 20:34:09 +00:00
Derek Sollenberger
ddc61b9741 am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit 'c37e905a245e3134a417677b93d5a020bab62d75':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 20:33:50 +00:00
Derek Sollenberger
a14ec04b1e Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 2014-09-24 20:21:55 +00:00
Mathieu Chartier
7731a1f53e am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit 'a061388d3f230072661c55fcb4158f383fd9fe94':
  Fix dalvik map names
 2014-09-24 19:39:11 +00:00
George Mount
c9a5227292 Fix NPE when detached View is added as a shared element. 
Bug 17632940

This won't solve all problems in which the parent becomes null,
but it will protect against shared elements being added that aren't
attached when mapped.

Change-Id: I991722c671c57048aea84b59a3c187c77c93450f
 2014-09-24 12:39:08 -07:00
Mathieu Chartier
544300db17 Merge "Fix dalvik map names" into lmp-dev 2014-09-24 19:30:38 +00:00
Mathieu Chartier
eee9764418 Fix dalvik map names 
Some maps which should have been dalvik other were incorrectly
accounted for in dalvik heap.

Bug: 17632563

Change-Id: I90d0bebf700650a445b19c4c72674b2941868d8b
 2014-09-24 11:55:31 -07:00
Chet Haase
6ed218bad1 am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit '66287788d35687a140df10ac96646cdf04f91a88':
  Avoid drawing the starting window twice
 2014-09-24 18:41:06 +00:00
Chet Haase
ee9d415f9b Merge "Avoid drawing the starting window twice" into lmp-dev 2014-09-24 18:31:07 +00:00
Ruben Brunk
0298d5cfe0 am 58dfddad: am b0069340: am 96cf7438: am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 
* commit '58dfddad306abffc036b1bb875f4480a638e158a':
  camera2: Update CamcorderProfile documentation.
 2014-09-24 18:27:51 +00:00
Baligh Uddin
0b000c66a6 am 796ac655: (-s ours) am b6954a4b: (-s ours) am af1d623d: (-s ours) am 0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '796ac655824237bad9cbe216193413cb0417f7ed':
  Import translations. DO NOT MERGE
 2014-09-24 18:27:47 +00:00
Baligh Uddin
1f419267fe am 90e6dfa8: (-s ours) am 2785a7c2: (-s ours) am d763ec35: (-s ours) am 5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '90e6dfa873ef114ff08ee6715e27e90cd0a32555':
  Import translations. DO NOT MERGE
 2014-09-24 18:27:43 +00:00
Ruben Brunk
7e21053d9e am b0069340: am 96cf7438: am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 
* commit 'b0069340eb5c36a177f3d1140deaad1424f71087':
  camera2: Update CamcorderProfile documentation.
 2014-09-24 18:21:36 +00:00
Baligh Uddin
c245f361c2 am b6954a4b: (-s ours) am af1d623d: (-s ours) am 0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'b6954a4b9892a71de8572fafc42c10f1f71faa40':
  Import translations. DO NOT MERGE
 2014-09-24 18:21:33 +00:00
Baligh Uddin
c1ebacc78c am 2785a7c2: (-s ours) am d763ec35: (-s ours) am 5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '2785a7c23b6d29e6488da10c55611389b045039f':
  Import translations. DO NOT MERGE
 2014-09-24 18:21:29 +00:00
Baligh Uddin
1666aa744e am 1b39d8d1: (-s ours) am 2f1eb1b5: (-s ours) am f4b606b6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '1b39d8d1f1e66dec6908343ec224bad62bcfcb89':
  Import translations. DO NOT MERGE
 2014-09-24 18:17:01 +00:00
Baligh Uddin
380f8d4098 am 5b92a3f2: (-s ours) am ec5d4aa1: (-s ours) am a78321d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5b92a3f22ca8e24e369e23d5b4150de5aef2a590':
  Import translations. DO NOT MERGE
 2014-09-24 18:16:56 +00:00
Ruben Brunk
80c2e16f34 am 96cf7438: am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 
* commit '96cf7438e380ae59e4d3973d866547bf5c9496e7':
  camera2: Update CamcorderProfile documentation.
 2014-09-24 18:09:54 +00:00
Baligh Uddin
11d451ab10 am af1d623d: (-s ours) am 0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'af1d623d074328bf40a0c2e6199ea6ffe1f8935f':
  Import translations. DO NOT MERGE
 2014-09-24 18:09:51 +00:00
Baligh Uddin
6589e36d31 am d763ec35: (-s ours) am 5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd763ec35079c683f2c39e524215a2c089ed37045':
  Import translations. DO NOT MERGE
 2014-09-24 18:09:48 +00:00
Baligh Uddin
d16f5fc663 am 2f1eb1b5: (-s ours) am f4b606b6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2f1eb1b51babf23146a7b33f42e1bb1982be82c2':
  Import translations. DO NOT MERGE
 2014-09-24 18:08:54 +00:00
Baligh Uddin
7f1af878f9 am 75ea2606: (-s ours) am 1bf1a02a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '75ea26069ae5d697fa5c593dacbf3d55bfd76635':
  Import translations. DO NOT MERGE
 2014-09-24 18:08:50 +00:00
Baligh Uddin
3325d27b36 am ec5d4aa1: (-s ours) am a78321d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'ec5d4aa1f7ed1a03747655438a60d21e9971d2e7':
  Import translations. DO NOT MERGE
 2014-09-24 18:08:50 +00:00
Baligh Uddin
3f693dbae1 am 75ca2568: (-s ours) am 8427b62b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '75ca2568b8c4383a2e6e164849b4ec366838fd58':
  Import translations. DO NOT MERGE
 2014-09-24 18:08:44 +00:00
Ruben Brunk
85e8131f0d am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 
* commit 'e9858c6a5aefe2aec45a89204fab34246ff4448a':
  camera2: Update CamcorderProfile documentation.
 2014-09-24 17:58:35 +00:00
Baligh Uddin
3f35305928 am 0f77230a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '0f77230ab52f2a991dadc142bcc533093c55e463':
  Import translations. DO NOT MERGE
 2014-09-24 17:58:31 +00:00
Baligh Uddin
b7f44193b0 am 5de699d1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5de699d1bc625e81f19c1c50916f8666f2da76da':
  Import translations. DO NOT MERGE
 2014-09-24 17:58:27 +00:00
Baligh Uddin
fdf2e71e14 am 31560bd1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '31560bd1c7288a8be7ed6bcda7102b08f2a19ab9':
  Import translations. DO NOT MERGE
 2014-09-24 17:58:25 +00:00
Dianne Hackborn
ae2682690e am 8d084fa2: am 9727cd7f: am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit '8d084fa29e95c5d5f15322e2931948cfddc3dd29':
  Fix issue #17632804: Add resource padding
 2014-09-24 17:58:21 +00:00
Robin Lee
659c2a438e am eed5e6bf: am 1e1c2822: am 9b1fea82: am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev 
* commit 'eed5e6bf7cb2ba1ea2b9e8891fab3df4ea382a12':
  Reset keystore when user is added or removed
 2014-09-24 17:58:16 +00:00
Baligh Uddin
8a39a9dd2f am 3acdc5cc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3acdc5ccc71b4f9ce7ec2fd885e83798499afad0':
  Import translations. DO NOT MERGE
 2014-09-24 17:58:13 +00:00
Baligh Uddin
c40155fd23 am 1bf1a02a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '1bf1a02ad05cb1fb2b489609d37104fe5aaba105':
  Import translations. DO NOT MERGE
 2014-09-24 17:57:55 +00:00
Baligh Uddin
84d9bbdcd4 am 8427b62b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '8427b62b2eb9770fe5769fe818aacd3349752aaa':
  Import translations. DO NOT MERGE
 2014-09-24 17:57:52 +00:00
Baligh Uddin
d90521f505 am f4b606b6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f4b606b60c971fac3c592537160057a71bb64962':
  Import translations. DO NOT MERGE
 2014-09-24 17:57:17 +00:00