OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 9539f76c: am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into...
Abodunrinwa Toki [Fri, 26 Jun 2015 15:20:58 +0000 (15:20 +0000)]
am 9539f76c: am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev

* commit '9539f76cba4359f4597e193d5eddf49614c5f629':
  Enforce FloatingToolbar themes.

9 years agoam e7fe26c9: am f513006c: am e171899a: Merge "Add JavaDoc for permission protection...
Svetoslav [Fri, 26 Jun 2015 15:20:50 +0000 (15:20 +0000)]
am e7fe26c9: am f513006c: am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev

* commit 'e7fe26c94b46b6e8b4860ceaba46b95584e38914':
  Add JavaDoc for permission protection level

9 years agoam b805067f: am b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or...
Keisuke Kuroyanagi [Fri, 26 Jun 2015 15:20:43 +0000 (15:20 +0000)]
am b805067f: am b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

* commit 'b805067f057084b9241f20aef0526f8edfedc173':
  Fix: Ellipsis is wrongly applied or not applied in TextView.

9 years agoam 4ce47333: am 3178da6b: am 084b7a15: Merge "Do not show selection action mode when...
Seigo Nonaka [Fri, 26 Jun 2015 15:20:36 +0000 (15:20 +0000)]
am 4ce47333: am 3178da6b: am 084b7a15: Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

* commit '4ce47333d035728f7ab416e79dcfe3f7f3f6b1dd':
  Do not show selection action mode when the TextView is not shown.

9 years agoam c84e903b: am 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed...
Robert Schaub [Fri, 26 Jun 2015 15:20:25 +0000 (15:20 +0000)]
am c84e903b: am 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit 'c84e903b7f205166f63adaf0c9a308c0e78dec7d':
  docs: Removed sentence from permissions doc

9 years agoam b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev
Abodunrinwa Toki [Fri, 26 Jun 2015 15:09:53 +0000 (15:09 +0000)]
am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev

* commit 'b5d06f7ab7bb19f39f74d8551c021a70568aaca5':
  Enforce FloatingToolbar themes.

9 years agoam f513006c: am e171899a: Merge "Add JavaDoc for permission protection level" into...
Svetoslav [Fri, 26 Jun 2015 15:09:47 +0000 (15:09 +0000)]
am f513006c: am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev

* commit 'f513006c4b1905de59dc71b629d27b4adcf63cf1':
  Add JavaDoc for permission protection level

9 years agoam b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied...
Keisuke Kuroyanagi [Fri, 26 Jun 2015 15:09:39 +0000 (15:09 +0000)]
am b886aa76: am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

* commit 'b886aa767ed67a7ce0ab2b82372a7b806c1ad02c':
  Fix: Ellipsis is wrongly applied or not applied in TextView.

9 years agoam 3178da6b: am 084b7a15: Merge "Do not show selection action mode when the TextView...
Seigo Nonaka [Fri, 26 Jun 2015 15:09:33 +0000 (15:09 +0000)]
am 3178da6b: am 084b7a15: Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

* commit '3178da6b57a44e137e5f2b904709d35467a64f82':
  Do not show selection action mode when the TextView is not shown.

9 years agoam 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence...
Robert Schaub [Fri, 26 Jun 2015 15:09:04 +0000 (15:09 +0000)]
am 467b7dfc: am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit '467b7dfcbfb1bf9d4f6dee51e2f8feb87598e3fc':
  docs: Removed sentence from permissions doc

9 years agoam a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev
Abodunrinwa Toki [Fri, 26 Jun 2015 05:32:50 +0000 (05:32 +0000)]
am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev

* commit 'a2e0dc4d20be14ea106b44067cc782774d90df3b':
  Enforce FloatingToolbar themes.

9 years agoam e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev
Svetoslav [Fri, 26 Jun 2015 05:32:45 +0000 (05:32 +0000)]
am e171899a: Merge "Add JavaDoc for permission protection level" into mnc-dev

* commit 'e171899ac8007160eee199eaa6c840fae40dfba7':
  Add JavaDoc for permission protection level

9 years agoMerge "Enforce FloatingToolbar themes." into mnc-dev
Abodunrinwa Toki [Fri, 26 Jun 2015 05:26:38 +0000 (05:26 +0000)]
Merge "Enforce FloatingToolbar themes." into mnc-dev

9 years agoMerge "Add JavaDoc for permission protection level" into mnc-dev
Svetoslav [Fri, 26 Jun 2015 05:24:41 +0000 (05:24 +0000)]
Merge "Add JavaDoc for permission protection level" into mnc-dev

9 years agoam c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView....
Keisuke Kuroyanagi [Fri, 26 Jun 2015 05:20:38 +0000 (05:20 +0000)]
am c1bd7da9: Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

* commit 'c1bd7da9906bc95c791dec6d52508fc9ee916a99':
  Fix: Ellipsis is wrongly applied or not applied in TextView.

9 years agoam 084b7a15: Merge "Do not show selection action mode when the TextView is not shown...
Seigo Nonaka [Fri, 26 Jun 2015 05:20:33 +0000 (05:20 +0000)]
am 084b7a15: Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

* commit '084b7a15c9a1bdbbb64d9921eaeb12235bc5fc17':
  Do not show selection action mode when the TextView is not shown.

9 years agoMerge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev
Keisuke Kuroyanagi [Fri, 26 Jun 2015 05:11:22 +0000 (05:11 +0000)]
Merge "Fix: Ellipsis is wrongly applied or not applied in TextView." into mnc-dev

9 years agoMerge "Do not show selection action mode when the TextView is not shown." into mnc-dev
Seigo Nonaka [Fri, 26 Jun 2015 05:10:33 +0000 (05:10 +0000)]
Merge "Do not show selection action mode when the TextView is not shown." into mnc-dev

9 years agoam f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions...
Robert Schaub [Fri, 26 Jun 2015 02:34:26 +0000 (02:34 +0000)]
am f207285d: am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit 'f207285d8d813730683b0c099edff84ac0b13244':
  docs: Removed sentence from permissions doc

9 years agoam ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into...
Robert Schaub [Fri, 26 Jun 2015 02:23:09 +0000 (02:23 +0000)]
am ba12e226: am 0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs

* commit 'ba12e226981216116de772739165ace65fe59d5b':
  docs: Removed sentence from permissions doc

9 years agoAdd JavaDoc for permission protection level
Svetoslav [Fri, 26 Jun 2015 01:19:14 +0000 (18:19 -0700)]
Add JavaDoc for permission protection level

1. Add the permission protection level in the java doc

2. Make some system permissions that are not mean to be
   used by third-parties system API.

bug:21402257

Change-Id: Ic0ae8d6ca44dbbbf12848a9164acc0e908c90402

9 years agoam c9ea3834: am 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end...
Doris Liu [Thu, 25 Jun 2015 23:08:32 +0000 (23:08 +0000)]
am c9ea3834: am 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev

* commit 'c9ea3834982d6a5ae6d6e0589d0cccc97337df88':
  Fix logic for whether beginning/end divider should be drawn

9 years agoam 8043ea5f: am ba654e6c: am 91617a79: Hide assist when launching an activity over...
Jorim Jaggi [Thu, 25 Jun 2015 23:08:26 +0000 (23:08 +0000)]
am 8043ea5f: am ba654e6c: am 91617a79: Hide assist when launching an activity over an action

* commit '8043ea5f8c76e1f0ab34d25f3482d122a1cf833a':
  Hide assist when launching an activity over an action

9 years agoam 6457e8a2: am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke...
Jorim Jaggi [Thu, 25 Jun 2015 23:08:20 +0000 (23:08 +0000)]
am 6457e8a2: am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist

* commit '6457e8a223e50eadca9e999503c3358c9eddf911':
  Use long press of KeyButtonView to invoke assist

9 years agoam 7435a1a3: am 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeExcepti...
Christopher Tate [Thu, 25 Jun 2015 23:08:13 +0000 (23:08 +0000)]
am 7435a1a3: am 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small payloads" into mnc-dev

* commit '7435a1a384790ef687678881a048e733785869c8':
  Don't throw TransactionTooLargeException for small payloads

9 years agoam 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end divider should...
Doris Liu [Thu, 25 Jun 2015 22:55:28 +0000 (22:55 +0000)]
am 8fc84d73: am 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev

* commit '8fc84d733c992e361f542eddf3f0770be2ba27a1':
  Fix logic for whether beginning/end divider should be drawn

9 years agoam ba654e6c: am 91617a79: Hide assist when launching an activity over an action
Jorim Jaggi [Thu, 25 Jun 2015 22:55:22 +0000 (22:55 +0000)]
am ba654e6c: am 91617a79: Hide assist when launching an activity over an action

* commit 'ba654e6c0408951d24d65019626fd6da0e696bac':
  Hide assist when launching an activity over an action

9 years agoam 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist
Jorim Jaggi [Thu, 25 Jun 2015 22:55:16 +0000 (22:55 +0000)]
am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist

* commit '37a2b9929a1fd9298b64e740a832c29c63b1a414':
  Use long press of KeyButtonView to invoke assist

9 years agoam 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small...
Christopher Tate [Thu, 25 Jun 2015 22:55:11 +0000 (22:55 +0000)]
am 0884cd11: am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small payloads" into mnc-dev

* commit '0884cd113d07f87d4223c1ab3bbe79481cf86492':
  Don't throw TransactionTooLargeException for small payloads

9 years agoam 1ffeb7bf: am 77f9e5dc: am d5b18387: Merge "Ensure partially-detached AbsListView...
Alan Viverette [Thu, 25 Jun 2015 22:54:51 +0000 (22:54 +0000)]
am 1ffeb7bf: am 77f9e5dc: am d5b18387: Merge "Ensure partially-detached AbsListView children are removed" into mnc-dev

* commit '1ffeb7bf9e4f9ba61fd603851a867a13c6a519d5':
  Ensure partially-detached AbsListView children are removed

9 years agoam 2f73c3c2: am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances...
Ronghua Wu [Thu, 25 Jun 2015 22:54:44 +0000 (22:54 +0000)]
am 2f73c3c2: am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit '2f73c3c2d9da5f229a987e46399846d4e7d488be':
  media: parse max-concurrent-instances.

9 years agoam 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn"...
Doris Liu [Thu, 25 Jun 2015 22:50:19 +0000 (22:50 +0000)]
am 9206d6a0: Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev

* commit '9206d6a0e69ef0f60e20464796d4a2da6f7c42f4':
  Fix logic for whether beginning/end divider should be drawn

9 years agoam 91617a79: Hide assist when launching an activity over an action
Jorim Jaggi [Thu, 25 Jun 2015 22:50:14 +0000 (22:50 +0000)]
am 91617a79: Hide assist when launching an activity over an action

* commit '91617a793ed6a80f3abfd3653b0f74b9321fe0f6':
  Hide assist when launching an activity over an action

9 years agoam 7e6571f1: Use long press of KeyButtonView to invoke assist
Jorim Jaggi [Thu, 25 Jun 2015 22:50:10 +0000 (22:50 +0000)]
am 7e6571f1: Use long press of KeyButtonView to invoke assist

* commit '7e6571f13da776dca4966dee0159e7741102fca9':
  Use long press of KeyButtonView to invoke assist

9 years agoEnforce FloatingToolbar themes.
Abodunrinwa Toki [Wed, 24 Jun 2015 03:36:52 +0000 (20:36 -0700)]
Enforce FloatingToolbar themes.

This ensures that theme attribute values that affect the look and
feel of the FloatingToolbar views are the ones specified in the
framework.
The aim is to avoid apps modifying the toolbar's look and feel in
unexpected ways by overriding Theme attributes.

Bug: 21957785

Change-Id: Idd472b4e8511f0a039cd07f98b1fd3ce93ae97fa

9 years agoMerge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev
Doris Liu [Thu, 25 Jun 2015 22:43:12 +0000 (22:43 +0000)]
Merge "Fix logic for whether beginning/end divider should be drawn" into mnc-dev

9 years agoam 77f9e5dc: am d5b18387: Merge "Ensure partially-detached AbsListView children are...
Alan Viverette [Thu, 25 Jun 2015 22:42:07 +0000 (22:42 +0000)]
am 77f9e5dc: am d5b18387: Merge "Ensure partially-detached AbsListView children are removed" into mnc-dev

* commit '77f9e5dcbbb02957a39d62971aa0a44acea2d7c0':
  Ensure partially-detached AbsListView children are removed

9 years agoam af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev
Ronghua Wu [Thu, 25 Jun 2015 22:42:00 +0000 (22:42 +0000)]
am af13d3b0: am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit 'af13d3b009c5c39f6d4fa8d54fab724fdea73910':
  media: parse max-concurrent-instances.

9 years agoam 8be96748: am 4d6b7356: am f97497db: Merge "Fix Formatter.formatBytes() crash on...
Makoto Onuki [Thu, 25 Jun 2015 22:41:58 +0000 (22:41 +0000)]
am 8be96748: am 4d6b7356: am f97497db: Merge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev

* commit '8be96748ea65207090d8dc1ffb4897a0669e7b94':
  Fix Formatter.formatBytes() crash on non-EN locales

9 years agoam 9a600725: Merge "Don\'t throw TransactionTooLargeException for small payloads...
Christopher Tate [Thu, 25 Jun 2015 22:41:45 +0000 (22:41 +0000)]
am 9a600725: Merge "Don\'t throw TransactionTooLargeException for small payloads" into mnc-dev

* commit '9a600725532c3fcf71f3be2610a34f02c88bb16b':
  Don't throw TransactionTooLargeException for small payloads

9 years agoHide assist when launching an activity over an action
Jorim Jaggi [Thu, 25 Jun 2015 22:01:29 +0000 (15:01 -0700)]
Hide assist when launching an activity over an action

Also make sure to resume app switches in this case.

Bug: 22071080
Change-Id: Ib30e064f4a5d0768b608e23183a34e326ada32e6

9 years agoUse long press of KeyButtonView to invoke assist
Jorim Jaggi [Thu, 25 Jun 2015 18:52:48 +0000 (11:52 -0700)]
Use long press of KeyButtonView to invoke assist

This makes sure that accessibility is handled properly.

Bug: 18778078
Change-Id: I967b387aabff973b5a9fea649a805540ee08eea8

9 years agoFix logic for whether beginning/end divider should be drawn
Doris Liu [Thu, 25 Jun 2015 22:16:54 +0000 (15:16 -0700)]
Fix logic for whether beginning/end divider should be drawn

Bug: 18945384
Change-Id: Ib8e785cb97d288e39a39b968bcb9c05410acbe34

9 years agoMerge "Don't throw TransactionTooLargeException for small payloads" into mnc-dev
Christopher Tate [Thu, 25 Jun 2015 22:28:01 +0000 (22:28 +0000)]
Merge "Don't throw TransactionTooLargeException for small payloads" into mnc-dev

9 years agoam d5b18387: Merge "Ensure partially-detached AbsListView children are removed" into...
Alan Viverette [Thu, 25 Jun 2015 22:27:37 +0000 (22:27 +0000)]
am d5b18387: Merge "Ensure partially-detached AbsListView children are removed" into mnc-dev

* commit 'd5b18387abed3d8487617982c20e8b4ffcab659c':
  Ensure partially-detached AbsListView children are removed

9 years agoam 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev
Ronghua Wu [Thu, 25 Jun 2015 22:27:32 +0000 (22:27 +0000)]
am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

* commit '826bf9b63f69f4e19011f7f72b022b50b89fca49':
  media: parse max-concurrent-instances.

9 years agoam 4d6b7356: am f97497db: Merge "Fix Formatter.formatBytes() crash on non-EN locales...
Makoto Onuki [Thu, 25 Jun 2015 22:26:56 +0000 (22:26 +0000)]
am 4d6b7356: am f97497db: Merge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev

* commit '4d6b7356d89d8f49c550ad17cfd82f8742ab9808':
  Fix Formatter.formatBytes() crash on non-EN locales

9 years agoMerge "Ensure partially-detached AbsListView children are removed" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 22:22:31 +0000 (22:22 +0000)]
Merge "Ensure partially-detached AbsListView children are removed" into mnc-dev

9 years agoam f14bbffd: am bad424f3: am 94f6f061: Speedup PIN/Pattern dismissal
Jorim Jaggi [Thu, 25 Jun 2015 22:20:39 +0000 (22:20 +0000)]
am f14bbffd: am bad424f3: am 94f6f061: Speedup PIN/Pattern dismissal

* commit 'f14bbffd8d9c11eecca78b6a333d6bd73c0ceb3e':
  Speedup PIN/Pattern dismissal

9 years agoam a1b1effc: am 4b05c5a9: am 5daee1dc: Merge "Limit dotProduct value to 1.0f, so...
Tenghui Zhu [Thu, 25 Jun 2015 22:20:32 +0000 (22:20 +0000)]
am a1b1effc: am 4b05c5a9: am 5daee1dc: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev

* commit 'a1b1effc1e19d534b25578f5ed4986d3c65c8baa':
  Limit dotProduct value to 1.0f, so acosf would not return NaN.

9 years agoMerge "media: parse max-concurrent-instances." into mnc-dev
Ronghua Wu [Thu, 25 Jun 2015 22:14:57 +0000 (22:14 +0000)]
Merge "media: parse max-concurrent-instances." into mnc-dev

9 years agoam f97497db: Merge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev
Makoto Onuki [Thu, 25 Jun 2015 22:15:00 +0000 (22:15 +0000)]
am f97497db: Merge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev

* commit 'f97497db5a7cfb8514836af39efef56488edf3ac':
  Fix Formatter.formatBytes() crash on non-EN locales

9 years agoam bad424f3: am 94f6f061: Speedup PIN/Pattern dismissal
Jorim Jaggi [Thu, 25 Jun 2015 22:10:20 +0000 (22:10 +0000)]
am bad424f3: am 94f6f061: Speedup PIN/Pattern dismissal

* commit 'bad424f30ccf237760a8028509755b1b8e6952f9':
  Speedup PIN/Pattern dismissal

9 years agoam 4b05c5a9: am 5daee1dc: Merge "Limit dotProduct value to 1.0f, so acosf would not...
Tenghui Zhu [Thu, 25 Jun 2015 22:10:15 +0000 (22:10 +0000)]
am 4b05c5a9: am 5daee1dc: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev

* commit '4b05c5a9c22fc0e59310020a119d6fb42c1e103e':
  Limit dotProduct value to 1.0f, so acosf would not return NaN.

9 years agoMerge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev
Makoto Onuki [Thu, 25 Jun 2015 22:02:55 +0000 (22:02 +0000)]
Merge "Fix Formatter.formatBytes() crash on non-EN locales" into mnc-dev

9 years agoam 884c45a2: am 3f57de80: am fd709421: Merge "Preventing leak" into mnc-dev
Jerome Poichet [Thu, 25 Jun 2015 21:55:53 +0000 (21:55 +0000)]
am 884c45a2: am 3f57de80: am fd709421: Merge "Preventing leak" into mnc-dev

* commit '884c45a27f45808ef9474098bfb4597cf18a4b6c':
  Preventing leak

9 years agoam 0006d10e: am 85d1d6e9: (-s ours) am 78db19c2: Merge "Limit dotProduct value to...
Tenghui Zhu [Thu, 25 Jun 2015 21:55:47 +0000 (21:55 +0000)]
am 0006d10e: am 85d1d6e9: (-s ours) am 78db19c2: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN."

* commit '0006d10e8bee8d5ee99db176e0f8e21eb0979d20':
  Limit dotProduct value to 1.0f, so acosf would not return NaN.

9 years agoam 94f6f061: Speedup PIN/Pattern dismissal
Jorim Jaggi [Thu, 25 Jun 2015 21:55:34 +0000 (21:55 +0000)]
am 94f6f061: Speedup PIN/Pattern dismissal

* commit '94f6f0610147de16aae7c39f97f21ee31591dd6f':
  Speedup PIN/Pattern dismissal

9 years agoam 5daee1dc: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN...
Tenghui Zhu [Thu, 25 Jun 2015 21:55:30 +0000 (21:55 +0000)]
am 5daee1dc: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev

* commit '5daee1dc27d7b0eadfddefcaf73da229579fd436':
  Limit dotProduct value to 1.0f, so acosf would not return NaN.

9 years agoEnsure partially-detached AbsListView children are removed
Alan Viverette [Thu, 25 Jun 2015 21:49:29 +0000 (14:49 -0700)]
Ensure partially-detached AbsListView children are removed

Bug: 22052083
Change-Id: If8c30c622206257587441bbd4f02c83eb3a62b60

9 years agoSpeedup PIN/Pattern dismissal
Jorim Jaggi [Thu, 25 Jun 2015 21:47:24 +0000 (14:47 -0700)]
Speedup PIN/Pattern dismissal

Bug: 22096344
Change-Id: I50d5ecaa03aae94cecf9da173f0d6318faaf6a1a

9 years agoam 3f57de80: am fd709421: Merge "Preventing leak" into mnc-dev
Jerome Poichet [Thu, 25 Jun 2015 21:47:12 +0000 (21:47 +0000)]
am 3f57de80: am fd709421: Merge "Preventing leak" into mnc-dev

* commit '3f57de8053f57a590eee32455b217472e16a2d96':
  Preventing leak

9 years agoFix Formatter.formatBytes() crash on non-EN locales
Makoto Onuki [Thu, 25 Jun 2015 18:56:44 +0000 (11:56 -0700)]
Fix Formatter.formatBytes() crash on non-EN locales

Bug 22012651

Change-Id: I21b1834a35647527002e01d76a7eb3a6a0354512

9 years agoam 85d1d6e9: (-s ours) am 78db19c2: Merge "Limit dotProduct value to 1.0f, so acosf...
Tenghui Zhu [Thu, 25 Jun 2015 21:46:00 +0000 (21:46 +0000)]
am 85d1d6e9: (-s ours) am 78db19c2: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN."

* commit '85d1d6e9ed953bb8d3f75ed64532c7fb77536c87':
  Limit dotProduct value to 1.0f, so acosf would not return NaN.

9 years agoMerge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev
Tenghui Zhu [Thu, 25 Jun 2015 21:45:31 +0000 (21:45 +0000)]
Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN." into mnc-dev

9 years agoam fd709421: Merge "Preventing leak" into mnc-dev
Jerome Poichet [Thu, 25 Jun 2015 21:35:44 +0000 (21:35 +0000)]
am fd709421: Merge "Preventing leak" into mnc-dev

* commit 'fd70942147edec7eb512c72c3fd0f89a3d7fa646':
  Preventing leak

9 years agoam f057c37a: am 4483164a: am d9f3aa58: Merge "Fix removeTarget to remove by ID instea...
George Mount [Thu, 25 Jun 2015 21:35:20 +0000 (21:35 +0000)]
am f057c37a: am 4483164a: am d9f3aa58: Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev

* commit 'f057c37a8c0bf16b1f494f50114bf2e759b8a5cf':
  Fix removeTarget to remove by ID instead of index.

9 years agoLimit dotProduct value to 1.0f, so acosf would not return NaN.
Lazar Trsic [Tue, 23 Jun 2015 09:46:49 +0000 (11:46 +0200)]
Limit dotProduct value to 1.0f, so acosf would not return NaN.

Cherry pick of b561f39d01c211425bfefaaa7b31ebe097e7ba79 from AOSP master.

Due to precision loss of float math, we sometimes get 1.000001f for
dotProduct. This causes NaN result from acosf() and floor() funcs.

At the moment, this does not cause any problems on ARM, as casting
NaN to int results in 0. On mips however (possibly on x86), such cast
gives INT_MAX, so crash occurs when trying to use the resulting value.

Change-Id: I8e0285a0306a65b8469d9f4885c19665066fc4c8

9 years agoMerge "Preventing leak" into mnc-dev
Jerome Poichet [Thu, 25 Jun 2015 21:21:00 +0000 (21:21 +0000)]
Merge "Preventing leak" into mnc-dev

9 years agoam 4483164a: am d9f3aa58: Merge "Fix removeTarget to remove by ID instead of index...
George Mount [Thu, 25 Jun 2015 21:19:33 +0000 (21:19 +0000)]
am 4483164a: am d9f3aa58: Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev

* commit '4483164a7c5e1b058eef99bb35f1688b508da0ed':
  Fix removeTarget to remove by ID instead of index.

9 years agoam 78db19c2: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN."
Tenghui Zhu [Thu, 25 Jun 2015 21:19:09 +0000 (21:19 +0000)]
am 78db19c2: Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN."

* commit '78db19c25a3a18d9ccf19b91be17e791e4fd782c':
  Limit dotProduct value to 1.0f, so acosf would not return NaN.

9 years agomedia: parse max-concurrent-instances.
Ronghua Wu [Thu, 25 Jun 2015 21:13:40 +0000 (14:13 -0700)]
media: parse max-concurrent-instances.

Bug: 22089269
Change-Id: I2b0af7c5c6a309c8396b595ea54b899451239b18

9 years agoMerge "Limit dotProduct value to 1.0f, so acosf would not return NaN."
Tenghui Zhu [Thu, 25 Jun 2015 21:07:12 +0000 (21:07 +0000)]
Merge "Limit dotProduct value to 1.0f, so acosf would not return NaN."

9 years agoam d9f3aa58: Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev
George Mount [Thu, 25 Jun 2015 21:06:38 +0000 (21:06 +0000)]
am d9f3aa58: Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev

* commit 'd9f3aa58d7e651dfbe9b395086040887d32d5a98':
  Fix removeTarget to remove by ID instead of index.

9 years agoMerge "Fix removeTarget to remove by ID instead of index." into mnc-dev
George Mount [Thu, 25 Jun 2015 20:55:33 +0000 (20:55 +0000)]
Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev

9 years agoam a8127722: am 0049338b: am e71c6e38: Merge "Constrain ListPopupWindow hint width...
Alan Viverette [Thu, 25 Jun 2015 20:39:08 +0000 (20:39 +0000)]
am a8127722: am 0049338b: am e71c6e38: Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev

* commit 'a812772235a4e72be2baf973defd1328668561a4':
  Constrain ListPopupWindow hint width spec to >= 0

9 years agoam 113173d5: am 386dbb89: am fdf102e6: Merge "Constrain child width and height to...
Alan Viverette [Thu, 25 Jun 2015 20:39:02 +0000 (20:39 +0000)]
am 113173d5: am 386dbb89: am fdf102e6: Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev

* commit '113173d5a4ad5c34fa778d881f0e30e4557b2e60':
  Constrain child width and height to >= 0 in FrameLayout.onMeasure()

9 years agoam 0049338b: am e71c6e38: Merge "Constrain ListPopupWindow hint width spec to >=...
Alan Viverette [Thu, 25 Jun 2015 20:21:38 +0000 (20:21 +0000)]
am 0049338b: am e71c6e38: Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev

* commit '0049338bf632ae1f602c6a2f888ec21af1895999':
  Constrain ListPopupWindow hint width spec to >= 0

9 years agoam 386dbb89: am fdf102e6: Merge "Constrain child width and height to >= 0 in FrameLay...
Alan Viverette [Thu, 25 Jun 2015 20:21:32 +0000 (20:21 +0000)]
am 386dbb89: am fdf102e6: Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev

* commit '386dbb894577783235788786cf296f14e78f69ec':
  Constrain child width and height to >= 0 in FrameLayout.onMeasure()

9 years agoam 6a402ca6: am d408d293: am ab142f7f: Merge "Handle back key to cancel text action...
Yohei Yukawa [Thu, 25 Jun 2015 20:16:27 +0000 (20:16 +0000)]
am 6a402ca6: am d408d293: am ab142f7f: Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev

* commit '6a402ca629185576cf774587da8079977833d25e':
  Handle back key to cancel text action mode in full-screen IME.

9 years agoam 02dd0a36: am cf831c87: am f9c6dbb6: Merge "Add missing conditional in settings...
Svetoslav [Thu, 25 Jun 2015 20:16:20 +0000 (20:16 +0000)]
am 02dd0a36: am cf831c87: am f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev

* commit '02dd0a36add4ccaf444849b5c5ccc74c4a740072':
  Add missing conditional in settings provider

9 years agoam 81c53e5f: am 6a75422b: am 0ebd001f: Merge "Fixed a HUN crash with notification...
Selim Cinek [Thu, 25 Jun 2015 20:16:13 +0000 (20:16 +0000)]
am 81c53e5f: am 6a75422b: am 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev

* commit '81c53e5f551161bb05c858b0b8eba7f2996b56e7':
  Fixed a HUN crash with notification children

9 years agoam ff3a453f: am 7c96d187: am c26939b4: Merge "add banned packages to notification...
Chris Wren [Thu, 25 Jun 2015 20:16:05 +0000 (20:16 +0000)]
am ff3a453f: am 7c96d187: am c26939b4: Merge "add banned packages to notification dumpsys" into mnc-dev

* commit 'ff3a453fb9ad5fa781fbe2b06241dbe27a319f8f':
  add banned packages to notification dumpsys

9 years agoam be17a55c: am 6a01c7ff: am 263b6e69: Merge "Prevent certain actions of app has...
Svetoslav [Thu, 25 Jun 2015 20:15:59 +0000 (20:15 +0000)]
am be17a55c: am 6a01c7ff: am 263b6e69: Merge "Prevent certain actions of app has revoked permissions" into mnc-dev

* commit 'be17a55c923f057f3f14656e7f56b2744607db45':
  Prevent certain actions of app has revoked permissions

9 years agoam 08b643dd: am cc45eeff: am 46f087c4: Merge "Apply thumbTint and trackTint styles...
Jun Mukai [Thu, 25 Jun 2015 20:15:52 +0000 (20:15 +0000)]
am 08b643dd: am cc45eeff: am 46f087c4: Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev

* commit '08b643ddcc9a2c2bdc4fb35e1e211b1beec68e1b':
  Apply thumbTint and trackTint styles to Switch from xml.

9 years agoam d408d293: am ab142f7f: Merge "Handle back key to cancel text action mode in full...
Yohei Yukawa [Thu, 25 Jun 2015 20:07:50 +0000 (20:07 +0000)]
am d408d293: am ab142f7f: Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev

* commit 'd408d293a516a3022c0f80d54a93a2f83288af46':
  Handle back key to cancel text action mode in full-screen IME.

9 years agoam e71c6e38: Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 20:07:47 +0000 (20:07 +0000)]
am e71c6e38: Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev

* commit 'e71c6e3832a963ed3cfa8c124374799f774eccb3':
  Constrain ListPopupWindow hint width spec to >= 0

9 years agoam fdf102e6: Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure...
Alan Viverette [Thu, 25 Jun 2015 20:07:43 +0000 (20:07 +0000)]
am fdf102e6: Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev

* commit 'fdf102e62ddf04ed1a3157b00d4da5b56d298df3':
  Constrain child width and height to >= 0 in FrameLayout.onMeasure()

9 years agoam cf831c87: am f9c6dbb6: Merge "Add missing conditional in settings provider" into...
Svetoslav [Thu, 25 Jun 2015 20:01:06 +0000 (20:01 +0000)]
am cf831c87: am f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev

* commit 'cf831c878600ec4c386fd4f356756f27fec9718f':
  Add missing conditional in settings provider

9 years agoam 6a75422b: am 0ebd001f: Merge "Fixed a HUN crash with notification children" into...
Selim Cinek [Thu, 25 Jun 2015 20:00:59 +0000 (20:00 +0000)]
am 6a75422b: am 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev

* commit '6a75422b6224a51bb7ed8cb72bbee98cd4ca43e7':
  Fixed a HUN crash with notification children

9 years agoMerge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 20:00:54 +0000 (20:00 +0000)]
Merge "Constrain ListPopupWindow hint width spec to >= 0" into mnc-dev

9 years agoam 7c96d187: am c26939b4: Merge "add banned packages to notification dumpsys" into...
Chris Wren [Thu, 25 Jun 2015 20:00:33 +0000 (20:00 +0000)]
am 7c96d187: am c26939b4: Merge "add banned packages to notification dumpsys" into mnc-dev

* commit '7c96d18756c9415b3173928a9d6da55c781b80bf':
  add banned packages to notification dumpsys

9 years agoam 6a01c7ff: am 263b6e69: Merge "Prevent certain actions of app has revoked permissio...
Svetoslav [Thu, 25 Jun 2015 20:00:27 +0000 (20:00 +0000)]
am 6a01c7ff: am 263b6e69: Merge "Prevent certain actions of app has revoked permissions" into mnc-dev

* commit '6a01c7ff9c452fb40f43b2328345fec562e7c8ab':
  Prevent certain actions of app has revoked permissions

9 years agoam cc45eeff: am 46f087c4: Merge "Apply thumbTint and trackTint styles to Switch from...
Jun Mukai [Thu, 25 Jun 2015 20:00:21 +0000 (20:00 +0000)]
am cc45eeff: am 46f087c4: Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev

* commit 'cc45eeff204235e769272f443194a5606bc13343':
  Apply thumbTint and trackTint styles to Switch from xml.

9 years agoConstrain ListPopupWindow hint width spec to >= 0
Alan Viverette [Thu, 25 Jun 2015 20:00:03 +0000 (13:00 -0700)]
Constrain ListPopupWindow hint width spec to >= 0

Bug: 22092169
Change-Id: Ia05302cf8d167aae26eccbf53dd3fd21d09b326d

9 years agoMerge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into...
Alan Viverette [Thu, 25 Jun 2015 19:57:01 +0000 (19:57 +0000)]
Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev

9 years agoam ab142f7f: Merge "Handle back key to cancel text action mode in full-screen IME...
Yohei Yukawa [Thu, 25 Jun 2015 19:48:16 +0000 (19:48 +0000)]
am ab142f7f: Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev

* commit 'ab142f7f57c8fd805e6cf65fccf2c8d3eba285b5':
  Handle back key to cancel text action mode in full-screen IME.

9 years agoMerge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev
Yohei Yukawa [Thu, 25 Jun 2015 19:39:31 +0000 (19:39 +0000)]
Merge "Handle back key to cancel text action mode in full-screen IME." into mnc-dev

9 years agoConstrain child width and height to >= 0 in FrameLayout.onMeasure()
Alan Viverette [Thu, 25 Jun 2015 19:24:27 +0000 (12:24 -0700)]
Constrain child width and height to >= 0 in FrameLayout.onMeasure()

Bug: 22093669
Change-Id: I55e8a0289f871b73ed07f3d73e8297786f9acac1

9 years agoPreventing leak
Jerome Poichet [Thu, 25 Jun 2015 19:03:02 +0000 (12:03 -0700)]
Preventing leak

When transitioning from ON to OFF with LE Advertisers, advertiser do not
get a chance to unregister themselves as the stopAdvertising checks the
state of the stack and throws before unregistering the object.

It will then never remove the callback objects causing a leak.

b/22092678 | Remote service crash after switching to restricted profile

Change-Id: I04817026a524d10d60abdd8b533554a71a0112e2