git.osdn.net Git - android-x86/frameworks-base.git/log

Alan Viverette [Fri, 6 Feb 2015 16:36:31 +0000 (16:36 +0000)]

am bbde1213: am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev

* commit 'bbde12138c748fbe136db5fa9f101ccb9c52ab7b':

commit | commitdiff | tree

Elliott Hughes [Fri, 6 Feb 2015 05:50:01 +0000 (05:50 +0000)]

am ae0bee53: am 81b84311: Merge "Fix clang build."

* commit 'ae0bee53b84d4ffda84270852ace1841e13f5db8':
Fix clang build.

commit | commitdiff | tree

Elliott Hughes [Fri, 6 Feb 2015 05:43:15 +0000 (05:43 +0000)]

am 81b84311: Merge "Fix clang build."

* commit '81b8431173837fe9ea21990948d6af30809fb056':
Fix clang build.

commit | commitdiff | tree

Elliott Hughes [Fri, 6 Feb 2015 05:37:33 +0000 (05:37 +0000)]

Merge "Fix clang build."

commit | commitdiff | tree

Elliott Hughes [Fri, 6 Feb 2015 05:36:10 +0000 (21:36 -0800)]

Fix clang build.

Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507

commit | commitdiff | tree

Chong Zhang [Fri, 6 Feb 2015 03:17:36 +0000 (03:17 +0000)]

am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev
automerge: eceae03

* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
reset col position to 1 on row PAC

commit | commitdiff | tree

Chong Zhang [Fri, 6 Feb 2015 02:12:16 +0000 (02:12 +0000)]

am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev

* commit '6cad6513e0058467d11f4cf99519cf79eb65d48f':
reset col position to 1 on row PAC

commit | commitdiff | tree

Chong Zhang [Fri, 6 Feb 2015 02:06:23 +0000 (02:06 +0000)]

Merge "reset col position to 1 on row PAC" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Fri, 6 Feb 2015 00:53:09 +0000 (00:53 +0000)]

am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev
automerge: 80b381c

* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
Mutate scroll bar drawables

commit | commitdiff | tree

Chong Zhang [Fri, 6 Feb 2015 00:46:06 +0000 (16:46 -0800)]

reset col position to 1 on row PAC

bug: 19284568
Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478

commit | commitdiff | tree

Alan Viverette [Fri, 6 Feb 2015 00:31:37 +0000 (00:31 +0000)]

am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev

* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
Mutate scroll bar drawables

commit | commitdiff | tree

Alan Viverette [Fri, 6 Feb 2015 00:25:33 +0000 (00:25 +0000)]

am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev

* commit '9a166c7da3d77c4b9801dbe249f78149649d5b0e':
Mutate scroll bar drawables

commit | commitdiff | tree

Alan Viverette [Fri, 6 Feb 2015 00:19:43 +0000 (00:19 +0000)]

Merge "Mutate scroll bar drawables" into lmp-mr1-dev

commit | commitdiff | tree

Filip Gruszczynski [Fri, 6 Feb 2015 00:09:41 +0000 (00:09 +0000)]

am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev

* commit '7acd679cb3f3c543ad71aaeb1057bcbef3a880e5':
Add wallpaper controlling system apis.

commit | commitdiff | tree

Filip Gruszczynski [Fri, 6 Feb 2015 00:09:35 +0000 (00:09 +0000)]

am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev

* commit '00de5c9f04e42045bd0299c06a9cc05187b1dff0':
Add hidden shutdown method to PowerManager.

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 23:58:56 +0000 (15:58 -0800)]

Mutate scroll bar drawables

Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858

commit | commitdiff | tree

Filip Gruszczynski [Thu, 5 Feb 2015 23:19:00 +0000 (23:19 +0000)]

Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev

commit | commitdiff | tree

Filip Gruszczynski [Thu, 5 Feb 2015 23:18:39 +0000 (23:18 +0000)]

Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 23:12:34 +0000 (23:12 +0000)]

am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev
automerge: eb6f3f8

* commit 'eb6f3f885154914eec6a747265d1f568ae50380c':
Update preference dialog padding to Material

commit | commitdiff | tree

Sanket Padawe [Thu, 5 Feb 2015 23:10:57 +0000 (23:10 +0000)]

am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev
automerge: 4eed340

* commit '4eed340437d23a9b4fabf2881557325b863af23c':
Suppress phone number from logcat.

commit | commitdiff | tree

John Spurlock [Thu, 5 Feb 2015 23:08:51 +0000 (23:08 +0000)]

am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.
automerge: 29fabd8

* commit '29fabd8988b95e5ff41167a74dfc67937988b3db':
Fix a few typos in Parcel.java.

commit | commitdiff | tree

Ruben Brunk [Thu, 5 Feb 2015 23:07:13 +0000 (23:07 +0000)]

am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
automerge: 2a11473

* commit '2a114737c636e69a65478778c6edb24c2266518e':
camera2: Make legacy error handling more robust.

commit | commitdiff | tree

Adam Lesinski [Thu, 5 Feb 2015 23:05:40 +0000 (23:05 +0000)]

am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
automerge: abc88d0

* commit 'abc88d0743924441bf7fcd3085e3305b076f5af5':
Make ArrayMap.EMPTY immutable

commit | commitdiff | tree

Dianne Hackborn [Thu, 5 Feb 2015 23:04:21 +0000 (23:04 +0000)]

am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev
automerge: 29039a2

* commit '29039a2bdbadcc427a966f5e7a6021fd424c4266':
Always re-establish kernel alarms when considering new alarm set

commit | commitdiff | tree

Jason Monk [Thu, 5 Feb 2015 23:02:57 +0000 (23:02 +0000)]

am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev
automerge: 6d72d46

* commit '6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52':
Ellipsize QS detail items when needed

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 23:00:44 +0000 (23:00 +0000)]

am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
automerge: f1a4d0e

* commit 'f1a4d0e864f17c59c0e292e8f1161ab4397e5ba4':
Invalidate SubtitleView during setText()

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 22:11:32 +0000 (22:11 +0000)]

am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev

* commit '69a62a8b0df71b0a26d55c29c71dd311dbe174c7':
Update preference dialog padding to Material

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 22:06:35 +0000 (22:06 +0000)]

Merge "Update preference dialog padding to Material" into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Thu, 5 Feb 2015 20:56:31 +0000 (20:56 +0000)]

am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev

* commit '04db979728ce0c2ea67c5ac5d7a1c2f02f53863d':
Suppress phone number from logcat.

commit | commitdiff | tree

Sanket Padawe [Thu, 5 Feb 2015 20:51:09 +0000 (20:51 +0000)]

Merge "Suppress phone number from logcat." into lmp-mr1-dev

commit | commitdiff | tree

John Spurlock [Thu, 5 Feb 2015 20:47:23 +0000 (20:47 +0000)]

am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.

* commit '9adf1c54226940e9f9065d92b4edd2b232122302':
Fix a few typos in Parcel.java.

commit | commitdiff | tree

John Spurlock [Thu, 5 Feb 2015 20:39:36 +0000 (20:39 +0000)]

am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.

* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
Fix a few typos in Parcel.java.

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 20:35:07 +0000 (12:35 -0800)]

Update preference dialog padding to Material

Mostly copy/paste of the Holo with some padding fiddling to make the
EditText, which has baked-in padding, and TextView line up.

Bug: 19280124
Change-Id: I4a8ad7dcc1f1bd519f4d1c506984871a25a1db31

commit | commitdiff | tree

Filip Gruszczynski [Wed, 28 Jan 2015 23:59:46 +0000 (15:59 -0800)]

Add wallpaper controlling system apis.

Change-Id: Ibaa8009e9b9d2e58254a4d9107a316c7f1de2211

commit | commitdiff | tree

John Spurlock [Thu, 5 Feb 2015 20:27:59 +0000 (20:27 +0000)]

am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.

* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
Fix a few typos in Parcel.java.

commit | commitdiff | tree

Ruben Brunk [Thu, 5 Feb 2015 20:19:55 +0000 (20:19 +0000)]

am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev

* commit 'cd0d7cdefef0dbf395e5b159dccb6e884a2077b7':
camera2: Make legacy error handling more robust.

commit | commitdiff | tree

John Spurlock [Thu, 5 Feb 2015 20:18:03 +0000 (20:18 +0000)]

am e0852368: Fix a few typos in Parcel.java.

* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
Fix a few typos in Parcel.java.

commit | commitdiff | tree

Filip Gruszczynski [Wed, 4 Feb 2015 17:48:47 +0000 (09:48 -0800)]

Add hidden shutdown method to PowerManager.

Bug: 17420540

We need to be able to shutdown some of wearable devices programatically.
We should be able to do it by connecting to PowerManagerService directly,
but it would be nice to go through the official interface.

Change-Id: Id0cf3b36c03447356fc60fb90cbb2f4b47d8265e

commit | commitdiff | tree

Ruben Brunk [Thu, 5 Feb 2015 19:54:36 +0000 (19:54 +0000)]

Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Thu, 5 Feb 2015 19:45:27 +0000 (11:45 -0800)]

Suppress phone number from logcat.

Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25

commit | commitdiff | tree

Adam Lesinski [Thu, 5 Feb 2015 19:39:27 +0000 (19:39 +0000)]

am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev

* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
Make ArrayMap.EMPTY immutable

commit | commitdiff | tree

Dianne Hackborn [Thu, 5 Feb 2015 19:39:23 +0000 (19:39 +0000)]

am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev

* commit '5c2fdc331f81b671d426f3f5a7e59cd9cbed80bf':
Always re-establish kernel alarms when considering new alarm set

commit | commitdiff | tree

Jason Monk [Thu, 5 Feb 2015 19:39:18 +0000 (19:39 +0000)]

am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev

* commit '3bbc5a113403886b16d276f2438677c5381bfab6':
Ellipsize QS detail items when needed

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 19:39:14 +0000 (19:39 +0000)]

am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev

* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
Invalidate SubtitleView during setText()

commit | commitdiff | tree

Adam Lesinski [Thu, 5 Feb 2015 19:26:58 +0000 (19:26 +0000)]

Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev

commit | commitdiff | tree

Dianne Hackborn [Thu, 5 Feb 2015 19:24:15 +0000 (19:24 +0000)]

Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev

commit | commitdiff | tree

Jason Monk [Thu, 5 Feb 2015 19:19:42 +0000 (19:19 +0000)]

Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 19:16:57 +0000 (19:16 +0000)]

Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev

commit | commitdiff | tree

Adam Lesinski [Thu, 5 Feb 2015 19:11:03 +0000 (11:11 -0800)]

Make ArrayMap.EMPTY immutable

This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349

commit | commitdiff | tree

Kenny Guy [Thu, 5 Feb 2015 18:51:53 +0000 (18:51 +0000)]

am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev
automerge: eeb43fb

* commit 'eeb43fbd61adfc6511528e2e13fd5372a14e2831':
Only switch user if current user is being wiped

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 17:58:49 +0000 (09:58 -0800)]

Invalidate SubtitleView during setText()

Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a

commit | commitdiff | tree

Jason Monk [Thu, 5 Feb 2015 16:54:58 +0000 (11:54 -0500)]

Ellipsize QS detail items when needed

Bug: 19262637
Change-Id: I395125a7c00e558e914aff9cf9c48a363435a9b2

commit | commitdiff | tree

Kenny Guy [Thu, 5 Feb 2015 15:26:09 +0000 (15:26 +0000)]

am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev

* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
Only switch user if current user is being wiped

commit | commitdiff | tree

Kenny Guy [Thu, 5 Feb 2015 12:34:43 +0000 (12:34 +0000)]

Merge "Only switch user if current user is being wiped" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 03:45:31 +0000 (03:45 +0000)]

Move layer-list to be top-level element in seek bar progress automerge: bac8e12
automerge: 6708ac4

* commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7':
Move layer-list to be top-level element in seek bar progress

commit | commitdiff | tree

Zhijun He [Thu, 5 Feb 2015 03:44:01 +0000 (03:44 +0000)]

am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
automerge: 6bafb86

* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
Camera2: relax the EV compensation requirements

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 03:35:27 +0000 (03:35 +0000)]

Move layer-list to be top-level element in seek bar progress
automerge: bac8e12

* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
Move layer-list to be top-level element in seek bar progress

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 02:39:32 +0000 (02:39 +0000)]

Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9
automerge: a638c44

* commit 'a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7':
Allow top-level drawable container in progressDrawable

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 02:38:25 +0000 (02:38 +0000)]

Merge "Replace ic_clear with vector icon" into lmp-mr1-dev automerge: 721a957
automerge: f89e06f

* commit 'f89e06fa58c08ff550a69b268832a2ea338b8700':
Replace ic_clear with vector icon

commit | commitdiff | tree

Yang Ni [Thu, 5 Feb 2015 02:31:46 +0000 (02:31 +0000)]

am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup"

* commit 'da91dfbdf20271dffce5357195800cf36183ad97':
Adds invocable functions to ScriptGroup

commit | commitdiff | tree

Lorenzo Colitti [Thu, 5 Feb 2015 02:31:40 +0000 (02:31 +0000)]

am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."

* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
Add a unit test for StaticIpConfiguration.

commit | commitdiff | tree

Yang Ni [Thu, 5 Feb 2015 02:24:35 +0000 (02:24 +0000)]

am 1269ff96: Merge "Adds invocable functions to ScriptGroup"

* commit '1269ff961000c726247d510762e42b21562b8c2b':
Adds invocable functions to ScriptGroup

commit | commitdiff | tree

Lorenzo Colitti [Thu, 5 Feb 2015 02:24:31 +0000 (02:24 +0000)]

am 21702263: Merge "Add a unit test for StaticIpConfiguration."

* commit '21702263d96341bc13420e2c74af9a4bec6c7907':
Add a unit test for StaticIpConfiguration.

commit | commitdiff | tree

Zhijun He [Thu, 5 Feb 2015 02:15:49 +0000 (02:15 +0000)]

am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev

* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
Camera2: relax the EV compensation requirements

commit | commitdiff | tree

Ruben Brunk [Thu, 5 Feb 2015 01:26:17 +0000 (17:26 -0800)]

camera2: Make legacy error handling more robust.

- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 01:15:01 +0000 (17:15 -0800)]

Move layer-list to be top-level element in seek bar progress

There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 01:13:06 +0000 (01:13 +0000)]

Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
Allow top-level drawable container in progressDrawable

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 01:11:28 +0000 (01:11 +0000)]

Merge "Replace ic_clear with vector icon" into lmp-mr1-dev
automerge: 721a957

* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
Replace ic_clear with vector icon

commit | commitdiff | tree

Zhijun He [Thu, 5 Feb 2015 01:10:28 +0000 (01:10 +0000)]

Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev

commit | commitdiff | tree

Yang Ni [Thu, 5 Feb 2015 01:05:08 +0000 (01:05 +0000)]

Merge "Adds invocable functions to ScriptGroup"

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 00:47:16 +0000 (00:47 +0000)]

Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 00:44:02 +0000 (16:44 -0800)]

Allow top-level drawable container in progressDrawable

Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0

commit | commitdiff | tree

George Mount [Thu, 5 Feb 2015 00:32:01 +0000 (00:32 +0000)]

Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c
automerge: 23eef1e

* commit '23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.

commit | commitdiff | tree

Miao Wang [Thu, 5 Feb 2015 00:27:49 +0000 (00:27 +0000)]

Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc
automerge: 58fd96c

* commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde':
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)

commit | commitdiff | tree

Yang Ni [Sat, 24 Jan 2015 01:16:02 +0000 (17:16 -0800)]

Adds invocable functions to ScriptGroup

This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856

commit | commitdiff | tree

Lorenzo Colitti [Thu, 5 Feb 2015 00:21:57 +0000 (00:21 +0000)]

Merge "Add a unit test for StaticIpConfiguration."

commit | commitdiff | tree

Alan Viverette [Thu, 5 Feb 2015 00:20:14 +0000 (00:20 +0000)]

Merge "Replace ic_clear with vector icon" into lmp-mr1-dev

commit | commitdiff | tree

George Mount [Thu, 5 Feb 2015 00:15:50 +0000 (00:15 +0000)]

Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
automerge: c3a043c

* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.

commit | commitdiff | tree

Miao Wang [Thu, 5 Feb 2015 00:07:17 +0000 (00:07 +0000)]

Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)"
automerge: 9a55cbc

* commit '9a55cbc0523bb05f15a1ea252c6736ce5060c53e':
make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)

commit | commitdiff | tree

Miao Wang [Thu, 5 Feb 2015 00:01:29 +0000 (00:01 +0000)]

Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)"

commit | commitdiff | tree

George Mount [Wed, 4 Feb 2015 22:37:04 +0000 (14:37 -0800)]

Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.

Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552

commit | commitdiff | tree

John Spurlock [Wed, 4 Feb 2015 20:47:40 +0000 (15:47 -0500)]

Fix a few typos in Parcel.java.

Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16

commit | commitdiff | tree

Alan Viverette [Wed, 4 Feb 2015 22:43:03 +0000 (14:43 -0800)]

Replace ic_clear with vector icon

Fixes the clear icon being really tiny.

Bug: 19248473
Change-Id: I2c87aa9e055d04d96fa6ccf458cfcc642a4d55ab

commit | commitdiff | tree

John Reck [Wed, 4 Feb 2015 22:08:27 +0000 (22:08 +0000)]

am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4

* commit 'af6eaf656ec0de5fcbea03968daffe2c845e2089':
Fix ANR caused by hwuiTask thread

commit | commitdiff | tree

Zhijun He [Wed, 4 Feb 2015 21:55:14 +0000 (13:55 -0800)]

Camera2: relax the EV compensation requirements

FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8

commit | commitdiff | tree

John Reck [Wed, 4 Feb 2015 21:58:39 +0000 (21:58 +0000)]

Merge "Fix ANR caused by hwuiTask thread"
automerge: 5ad36d4

* commit '5ad36d4591e7b3b1b74f0a213d18384f53734ab2':
Fix ANR caused by hwuiTask thread

commit | commitdiff | tree

John Reck [Wed, 4 Feb 2015 21:53:47 +0000 (21:53 +0000)]

Merge "Fix ANR caused by hwuiTask thread"

commit | commitdiff | tree

Christopher Tate [Wed, 4 Feb 2015 21:48:29 +0000 (13:48 -0800)]

Always re-establish kernel alarms when considering new alarm set

As a backstop against missed alarm delivery / wakeups or clock slew,
make sure to always schedule a kernel alarm for the next alarm events
of interest when we've reexamined the set of deliverable alarms.

Bug 19201933

Change-Id: I3cd37a63dfb0c8258941497d4ba516ed00e2edad

commit | commitdiff | tree

Elliott Hughes [Wed, 4 Feb 2015 20:37:59 +0000 (20:37 +0000)]

am b2d7ca7c: am fd2c1307: Merge "Fix build."

* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
Fix build.

commit | commitdiff | tree

Elliott Hughes [Wed, 4 Feb 2015 20:31:45 +0000 (20:31 +0000)]

am fd2c1307: Merge "Fix build."

* commit 'fd2c1307e66573c398ff53eab25ee82735277091':
Fix build.

commit | commitdiff | tree

Elliott Hughes [Wed, 4 Feb 2015 20:26:02 +0000 (20:26 +0000)]

commit | commitdiff | tree

Elliott Hughes [Wed, 4 Feb 2015 20:24:21 +0000 (12:24 -0800)]

Fix build.

Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f

commit | commitdiff | tree

Christopher Ferris [Wed, 4 Feb 2015 19:29:56 +0000 (19:29 +0000)]

am 4fb79d14: Merge "Fix comment according to review."
automerge: ff6cebf

* commit 'ff6cebf0a65f9d6e20497295a1a9c290df85052b':
Fix comment according to review.

commit | commitdiff | tree

Christopher Ferris [Wed, 4 Feb 2015 19:15:47 +0000 (19:15 +0000)]

am 4fb79d14: Merge "Fix comment according to review."

* commit '4fb79d14bb6c81f72a92da85420090a05ec2c76d':
Fix comment according to review.

commit | commitdiff | tree

Christopher Ferris [Wed, 4 Feb 2015 19:07:15 +0000 (19:07 +0000)]

Merge "Fix comment according to review."

commit | commitdiff | tree

Christopher Ferris [Wed, 4 Feb 2015 18:40:12 +0000 (10:40 -0800)]

Fix comment according to review.

Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d

commit | commitdiff | tree

Kenny Guy [Wed, 4 Feb 2015 17:55:42 +0000 (17:55 +0000)]

Only switch user if current user is being wiped

Only try and switch to owner if the current user
is being removed.

Bug: 19252449
Change-Id: I0143d87360db0834876821cbf52fec4933ecbd35

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Feb 2015 14:40:51 +0000 (14:40 +0000)]

Import translations. DO NOT MERGE
automerge: 140a22d -s ours

* commit '140a22de8ead0f166eaea320a37b7134f265353e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 4 Feb 2015 14:28:45 +0000 (06:28 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ibdc0a2c8927af8036040a542f6484db1ea65880d
Auto-generated-cl: translation import

commit | commitdiff | tree

Lorenzo Colitti [Fri, 23 Jan 2015 05:31:30 +0000 (14:31 +0900)]

Add a unit test for StaticIpConfiguration.

Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7