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

160041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
ac46aec36c am a78321d7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a78321d7616ead50ee4d0fa66dee4a06b9e8a850':
  Import translations. DO NOT MERGE
 2014-09-24 17:57:13 +00:00
Dianne Hackborn
ff072725e3 Work on issue #17624121: Settings crash while launching on wiped device 
Cleaner paths and better error reporting when a problem goes wrong
while binding an application.  This gets rid of the (recently added)
error about removing a process that hasn't been killed, and cleanly
kills the process along with more detailed errors about where things
failed.

Change-Id: I710a209c14da1515929e6254396b793177eee115
 2014-09-24 10:56:28 -07:00
Ruben Brunk
63c8e126e7 Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 2014-09-24 17:54:18 +00:00
Baligh Uddin
4149138abf Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-24 17:49:37 +00:00
Baligh Uddin
a9ec2ea832 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-24 17:49:36 +00:00
Baligh Uddin
e9cc776346 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-24 17:49:25 +00:00
Baligh Uddin
da1e729297 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-24 17:49:14 +00:00
Dianne Hackborn
f31f1d5b79 am 9727cd7f: am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit '9727cd7f20fdb0f5037857b2567609e33b040897':
  Fix issue #17632804: Add resource padding
 2014-09-24 17:46:00 +00:00
Robin Lee
63c8c85e24 am 1e1c2822: am 9b1fea82: am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev 
* commit '1e1c282208caa930529ec3fc2f21e3470cd66b42':
  Reset keystore when user is added or removed
 2014-09-24 17:45:51 +00:00
Baligh Uddin
59c8cee55f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-24 17:44:04 +00:00
Baligh Uddin
91a32a05ff Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-09-24 17:44:02 +00:00
Baligh Uddin
af60ac6984 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-09-24 17:44:02 +00:00
Baligh Uddin
1d51b534b0 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-24 17:43:58 +00:00
Ruben Brunk
0fd198ad89 camera2: Hide JPEGs in RGBA gralloc buffers. 
Bug: 17379185

- WAR for SW Write usage flags being unavailable on
  certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
 2014-09-24 10:43:12 -07:00
Dianne Hackborn
3756b414de am 98769dc2: am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit '98769dc2d46b020e64961b73567d5731d404d0dd':
  Fix issue #17632804: Add resource padding
 2014-09-24 17:37:05 +00:00
Robin Lee
ec16ecc68a am 9b1fea82: am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev 
* commit '9b1fea82c7ed98b8189a61c37796e37631c923a1':
  Reset keystore when user is added or removed
 2014-09-24 17:32:34 +00:00
Adrian Roos
bb25830886 am f3cd66e1: am fe660c17: am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev 
* commit 'f3cd66e11359885980c6f2a16f6e0705bbdf5500':
  Fix ColorInversionTile for secondary users
 2014-09-24 17:30:17 +00:00
Dianne Hackborn
e3185cba6d am c0e5eb2b: Merge "Fix issue #17632804: Add resource padding" into lmp-dev 
* commit 'c0e5eb2b4310b14bbf1829ce4516084462e9cf8b':
  Fix issue #17632804: Add resource padding
 2014-09-24 17:30:02 +00:00
Adrian Roos
dba31c4cab am fe660c17: am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev 
* commit 'fe660c1788a1cacb070f6bda0a352bfcd4ffe34b':
  Fix ColorInversionTile for secondary users
 2014-09-24 17:23:22 +00:00
Robin Lee
9686582f4f am 0a803fcc: Merge "Reset keystore when user is added or removed" into lmp-dev 
* commit '0a803fcc2a000985a42072db5b4c9d4917139fcf':
  Reset keystore when user is added or removed
 2014-09-24 17:20:26 +00:00
Dianne Hackborn
b1aed18d9b Merge "Fix issue #17632804: Add resource padding" into lmp-dev 2014-09-24 17:17:40 +00:00
Adrian Roos
00f484f970 am 060dd970: am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev 
* commit '060dd970e09a3474174250f2e7cd0611d01815ba':
  Fix ColorInversionTile for secondary users
 2014-09-24 17:11:37 +00:00
Bill Yi
017e87b624 am 6471a6fa: (-s ours) am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE" 
* commit '6471a6faf5289fbd697548eddccf45b6e43148cc':
  Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE
 2014-09-24 17:11:05 +00:00
Robin Lee
de3c3f6f1d Merge "Reset keystore when user is added or removed" into lmp-dev 2014-09-24 17:03:33 +00:00
Adrian Roos
500d0714e9 am 291d6e0f: Merge "Fix ColorInversionTile for secondary users" into lmp-dev 
* commit '291d6e0f59f479b8d451293e72a7a834a8cf375d':
  Fix ColorInversionTile for secondary users
 2014-09-24 16:59:10 +00:00