OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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 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

9 years agoam f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 19:03:42 +0000 (19:03 +0000)]
am f9c6dbb6: Merge "Add missing conditional in settings provider" into mnc-dev

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

9 years agoam 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev
Selim Cinek [Thu, 25 Jun 2015 19:03:37 +0000 (19:03 +0000)]
am 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev

* commit '0ebd001f3068116b93e8a447f35f01a5b96ec161':
  Fixed a HUN crash with notification children

9 years agoMerge "Add missing conditional in settings provider" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 18:53:57 +0000 (18:53 +0000)]
Merge "Add missing conditional in settings provider" into mnc-dev

9 years agoAdd missing conditional in settings provider
Svetoslav [Thu, 25 Jun 2015 18:53:02 +0000 (11:53 -0700)]
Add missing conditional in settings provider

Change-Id: I717e8b87eccbedf1a1abead77e7856a2aa2405fa

9 years agoMerge "Fixed a HUN crash with notification children" into mnc-dev
Selim Cinek [Thu, 25 Jun 2015 18:37:54 +0000 (18:37 +0000)]
Merge "Fixed a HUN crash with notification children" into mnc-dev

9 years agoam fed11552: am 1d13f9be: am cb247780: Merge "Remove Webviewtests in frameworks"...
Selim Gurun [Thu, 25 Jun 2015 18:30:04 +0000 (18:30 +0000)]
am fed11552: am 1d13f9be: am cb247780: Merge "Remove Webviewtests in frameworks" into mnc-dev

* commit 'fed115528701ea38e508d9d3f02adf6b9ae06996':
  Remove Webviewtests in frameworks

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

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

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

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

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

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

9 years agoMerge "add banned packages to notification dumpsys" into mnc-dev
Chris Wren [Thu, 25 Jun 2015 18:21:01 +0000 (18:21 +0000)]
Merge "add banned packages to notification dumpsys" into mnc-dev

9 years agoMerge "Prevent certain actions of app has revoked permissions" into mnc-dev
Svetoslav [Thu, 25 Jun 2015 18:20:14 +0000 (18:20 +0000)]
Merge "Prevent certain actions of app has revoked permissions" into mnc-dev

9 years agoam 1d13f9be: am cb247780: Merge "Remove Webviewtests in frameworks" into mnc-dev
Selim Gurun [Thu, 25 Jun 2015 18:17:09 +0000 (18:17 +0000)]
am 1d13f9be: am cb247780: Merge "Remove Webviewtests in frameworks" into mnc-dev

* commit '1d13f9be6c2f5356b31ed553c69ccf669fe9a0fb':
  Remove Webviewtests in frameworks

9 years agoMerge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev
Jun Mukai [Thu, 25 Jun 2015 18:16:55 +0000 (18:16 +0000)]
Merge "Apply thumbTint and trackTint styles to Switch from xml." into mnc-dev

9 years agoam d85c37ab: am 6e7acdd5: am 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWO...
Chris Manton [Thu, 25 Jun 2015 18:14:32 +0000 (18:14 +0000)]
am d85c37ab: am 6e7acdd5: am 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev

* commit 'd85c37ab0f8db4e58c34eabba7961d2fc61e9002':
  Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL

9 years agoam 4095f643: am 482bcbe5: am 0f61c7dc: Merge "Let findSupportedAbi and hasRenderscrip...
Yusuke Sato [Thu, 25 Jun 2015 18:14:25 +0000 (18:14 +0000)]
am 4095f643: am 482bcbe5: am 0f61c7dc: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev

* commit '4095f6432b68a014c9f60943a02f396cc362cf16':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

9 years agoam 16f9a750: am 655a4763: am 1979dd63: Merge "Add comments for visual voicemail short...
Nancy Chen [Thu, 25 Jun 2015 18:14:19 +0000 (18:14 +0000)]
am 16f9a750: am 655a4763: am 1979dd63: Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev

* commit '16f9a75022e23241feb112bd6d5b0760138fa797':
  Add comments for visual voicemail short codes in whitelist.

9 years agoam 73d86f9d: am 04ececc6: am b49dbeef: Merge "Refactoring recents search bar widget...
Winson Chung [Thu, 25 Jun 2015 18:14:12 +0000 (18:14 +0000)]
am 73d86f9d: am 04ececc6: am b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev

* commit '73d86f9d3935e34b1721909a2cc3739dd0ed88c4':
  Refactoring recents search bar widget logic.

9 years agoadd banned packages to notification dumpsys
Chris Wren [Thu, 25 Jun 2015 18:04:33 +0000 (14:04 -0400)]
add banned packages to notification dumpsys

Bug: 20451514
Change-Id: I4ae3adfc8dcd7e7625ca41950e5642c30b8cb25e

9 years agoam 6e7acdd5: am 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL"...
Chris Manton [Thu, 25 Jun 2015 18:09:51 +0000 (18:09 +0000)]
am 6e7acdd5: am 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev

* commit '6e7acdd5c93fb7ef04bb0987beab4ee49e28d926':
  Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL

9 years agoam cb247780: Merge "Remove Webviewtests in frameworks" into mnc-dev
Selim Gurun [Thu, 25 Jun 2015 18:07:06 +0000 (18:07 +0000)]
am cb247780: Merge "Remove Webviewtests in frameworks" into mnc-dev

* commit 'cb247780d3a5ecaa66587443eaa090dcd04996c6':
  Remove Webviewtests in frameworks

9 years agoam 482bcbe5: am 0f61c7dc: Merge "Let findSupportedAbi and hasRenderscriptBitcode...
Yusuke Sato [Thu, 25 Jun 2015 18:04:36 +0000 (18:04 +0000)]
am 482bcbe5: am 0f61c7dc: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev

* commit '482bcbe58cbceca8749e50e174c60c5511af265b':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

9 years agoam 655a4763: am 1979dd63: Merge "Add comments for visual voicemail short codes in...
Nancy Chen [Thu, 25 Jun 2015 18:04:30 +0000 (18:04 +0000)]
am 655a4763: am 1979dd63: Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev

* commit '655a476337983e08631bbfdb719f6c6b1c7ce353':
  Add comments for visual voicemail short codes in whitelist.

9 years agoam 04ececc6: am b49dbeef: Merge "Refactoring recents search bar widget logic." into...
Winson Chung [Thu, 25 Jun 2015 18:04:23 +0000 (18:04 +0000)]
am 04ececc6: am b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev

* commit '04ececc6feb89e522e833ffa417e7c2fb07b6743':
  Refactoring recents search bar widget logic.

9 years agoam 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev
Chris Manton [Thu, 25 Jun 2015 18:01:23 +0000 (18:01 +0000)]
am 60061c26: Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev

* commit '60061c26a24f654f5a6ac599d85c3bea14ee9aff':
  Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL

9 years agoPrevent certain actions of app has revoked permissions
Svetoslav [Thu, 25 Jun 2015 01:47:07 +0000 (18:47 -0700)]
Prevent certain actions of app has revoked permissions

bug:21808294

Change-Id: I7214c1fe47c15fe185423a54a74b58caf8d82daa

9 years agoMerge "Remove Webviewtests in frameworks" into mnc-dev
Selim Gurun [Thu, 25 Jun 2015 17:53:49 +0000 (17:53 +0000)]
Merge "Remove Webviewtests in frameworks" into mnc-dev

9 years agoMerge "Make bottom-left pixel of navbar clickable with mouse"
James Cook [Thu, 25 Jun 2015 17:50:57 +0000 (17:50 +0000)]
Merge "Make bottom-left pixel of navbar clickable with mouse"

9 years agoRemove Webviewtests in frameworks
Selim Gurun [Thu, 25 Jun 2015 17:35:51 +0000 (10:35 -0700)]
Remove Webviewtests in frameworks

Bug: 22090564

These tests were not touched for at least 3 years, and with webview
moving to chromium, they are tested at the chromium side.

Change-Id: I4424871dd97c5dc23bb3dbdcee0915d5ab893c7e

9 years agoam 0f61c7dc: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevan...
Yusuke Sato [Thu, 25 Jun 2015 17:46:35 +0000 (17:46 +0000)]
am 0f61c7dc: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev

* commit '0f61c7dcc40276788f58300d5d8ca85be2ce0e59':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files

9 years agoMerge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev
Chris Manton [Thu, 25 Jun 2015 17:42:16 +0000 (17:42 +0000)]
Merge "Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL" into mnc-dev

9 years agoam 81979f8c: am df6ca3cd: am efb49bd8: Merge "Constrain width and height to >= 0...
Alan Viverette [Thu, 25 Jun 2015 17:41:06 +0000 (17:41 +0000)]
am 81979f8c: am df6ca3cd: am efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev

* commit '81979f8ceead658b2b99936e796813c7020b54ff':
  Constrain width and height to >= 0 in FastScroller layout

9 years agoam 1979dd63: Merge "Add comments for visual voicemail short codes in whitelist."...
Nancy Chen [Thu, 25 Jun 2015 17:35:34 +0000 (17:35 +0000)]
am 1979dd63: Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev

* commit '1979dd631d2da88c5d920013b5162700622bd0d3':
  Add comments for visual voicemail short codes in whitelist.

9 years agoam b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev
Winson Chung [Thu, 25 Jun 2015 17:35:06 +0000 (17:35 +0000)]
am b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev

* commit 'b49dbeef5253c346a172b7516c4526fa79dadd77':
  Refactoring recents search bar widget logic.

9 years agoMerge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"...
Yusuke Sato [Thu, 25 Jun 2015 17:33:59 +0000 (17:33 +0000)]
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" into mnc-dev

9 years agoMerge "Add comments for visual voicemail short codes in whitelist." into mnc-dev
Nancy Chen [Thu, 25 Jun 2015 17:32:22 +0000 (17:32 +0000)]
Merge "Add comments for visual voicemail short codes in whitelist." into mnc-dev

9 years agoam df6ca3cd: am efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller...
Alan Viverette [Thu, 25 Jun 2015 17:28:32 +0000 (17:28 +0000)]
am df6ca3cd: am efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev

* commit 'df6ca3cdae40ff8a0ea93c570406a969a9602aca':
  Constrain width and height to >= 0 in FastScroller layout

9 years agoMerge "Refactoring recents search bar widget logic." into mnc-dev
Winson Chung [Thu, 25 Jun 2015 17:24:53 +0000 (17:24 +0000)]
Merge "Refactoring recents search bar widget logic." into mnc-dev

9 years agoam 4196e729: am fb822963: am 9440a6e6: Merge "Support RSA encrypt using private key...
Alex Klyubin [Thu, 25 Jun 2015 17:21:26 +0000 (17:21 +0000)]
am 4196e729: am fb822963: am 9440a6e6: Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev

* commit '4196e729ffed89940ac3c38a5a65581f20c4065d':
  Support RSA encrypt using private key and PKCS#1 paddding.

9 years agoam efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller layout" into...
Alan Viverette [Thu, 25 Jun 2015 17:16:10 +0000 (17:16 +0000)]
am efb49bd8: Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev

* commit 'efb49bd81101046ced1f75aeef81dcda27580514':
  Constrain width and height to >= 0 in FastScroller layout

9 years agoam fb822963: am 9440a6e6: Merge "Support RSA encrypt using private key and PKCS#1...
Alex Klyubin [Thu, 25 Jun 2015 17:09:40 +0000 (17:09 +0000)]
am fb822963: am 9440a6e6: Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev

* commit 'fb82296324ea42996b0ed646f1c0292c0bfcb151':
  Support RSA encrypt using private key and PKCS#1 paddding.

9 years agoCarrier Config API KEY_FORCE_HOME_NETWORK_BOOL
Chris Manton [Wed, 24 Jun 2015 23:47:49 +0000 (16:47 -0700)]
Carrier Config API KEY_FORCE_HOME_NETWORK_BOOL

Bug: 20828356

Change-Id: I30a286e7af884a11c51363916dd6a4dc965d399a

9 years agoMerge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 17:08:41 +0000 (17:08 +0000)]
Merge "Constrain width and height to >= 0 in FastScroller layout" into mnc-dev

9 years agoam 9440a6e6: Merge "Support RSA encrypt using private key and PKCS#1 paddding." into...
Alex Klyubin [Thu, 25 Jun 2015 17:00:08 +0000 (17:00 +0000)]
am 9440a6e6: Merge "Support RSA encrypt using private key and PKCS#1 paddding." into mnc-dev

* commit '9440a6e6bed93e2816647b6834d543fd57181a86':
  Support RSA encrypt using private key and PKCS#1 paddding.

9 years agoConstrain width and height to >= 0 in FastScroller layout
Alan Viverette [Thu, 25 Jun 2015 16:57:30 +0000 (09:57 -0700)]
Constrain width and height to >= 0 in FastScroller layout

Bug: 22071990
Change-Id: I9dcb2066ee069a3764b7d711cb341a4dfdc4445e