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

(root) / android-x86 / frameworks-base.git / log

Zhentao Sun [Wed, 9 Sep 2015 00:59:39 +0000 (00:59 +0000)]

am aded82ce: am 6d8bdb50: am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev

* commit 'aded82ce3134b7f8a2db7e4e7462e16e0428ef96':
Changed the vibration duration from 1s to 750ms.

commit | commitdiff | tree

Zhentao Sun [Wed, 9 Sep 2015 00:48:18 +0000 (00:48 +0000)]

am 6d8bdb50: am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev

* commit '6d8bdb50b0cd26629a18ae3124fb29673069493b':
Changed the vibration duration from 1s to 750ms.

commit | commitdiff | tree

Lorenzo Colitti [Wed, 9 Sep 2015 00:45:42 +0000 (00:45 +0000)]

am 22262f31: am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev

* commit '22262f31b964d595b56eb1277e4d88550a03e54c':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.

commit | commitdiff | tree

Zhentao Sun [Wed, 9 Sep 2015 00:38:48 +0000 (00:38 +0000)]

am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev

* commit '5536d4477572e437c95111630d5c2723350d99a5':
Changed the vibration duration from 1s to 750ms.

commit | commitdiff | tree

Lorenzo Colitti [Wed, 9 Sep 2015 00:38:42 +0000 (00:38 +0000)]

am 0bc35668: am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev

* commit '0bc356687e022fa1ae611c4ebeb0e0622810d7e4':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.

commit | commitdiff | tree

Zhentao Sun [Wed, 9 Sep 2015 00:29:03 +0000 (00:29 +0000)]

Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 9 Sep 2015 00:28:48 +0000 (00:28 +0000)]

am 2a198de7: am 975ceef6: am 52429b4a: Cancel animation when hiding Keyguard

* commit '2a198de79d0d5b93168a3fccd45977f5731b3451':
Cancel animation when hiding Keyguard

commit | commitdiff | tree

Lorenzo Colitti [Wed, 9 Sep 2015 00:26:53 +0000 (00:26 +0000)]

am 017223ac: Merge changes from topic \'packet-keepalive-fixes\' into mnc-dr-dev

* commit '017223acda5bfe16cb87d0a33d72dd28d2fccd3b':
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.

commit | commitdiff | tree

Jorim Jaggi [Wed, 9 Sep 2015 00:19:24 +0000 (00:19 +0000)]

am 975ceef6: am 52429b4a: Cancel animation when hiding Keyguard

* commit '975ceef616aac6de561c4a4e1d82a636f5cf37e3':
Cancel animation when hiding Keyguard

commit | commitdiff | tree

Lorenzo Colitti [Wed, 9 Sep 2015 00:18:39 +0000 (00:18 +0000)]

Merge changes from topic 'packet-keepalive-fixes' into mnc-dr-dev

* changes:
  Require the new PACKET_KEEPALIVE_OFFLOAD permission.
  Add an error code for generic hardware error.
  Fix bugs and crashes in PacketKeepalive API.
  Add tests for the PacketKeepalive API.
  Add a PACKET_KEEPALIVE_OFFLOAD permission.
  Use a CountDownLatch instead of sleep() in NetworkFactory tests.
  Get rid of shortSleep() in ConnectivityServiceTest.
  Make ConnectivityServiceTest a bit more readable.

commit | commitdiff | tree

Selim Cinek [Wed, 9 Sep 2015 00:16:04 +0000 (00:16 +0000)]

am 89d80472: am ad69e53e: am edf47486: Removed the secure camera launcher

* commit '89d804727473009fe8e53a0040f0ac70b3bd221a':
Removed the secure camera launcher

commit | commitdiff | tree

Jorim Jaggi [Wed, 9 Sep 2015 00:12:31 +0000 (00:12 +0000)]

am 52429b4a: Cancel animation when hiding Keyguard

* commit '52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f':
Cancel animation when hiding Keyguard

commit | commitdiff | tree

Selim Cinek [Wed, 9 Sep 2015 00:08:11 +0000 (00:08 +0000)]

am ad69e53e: am edf47486: Removed the secure camera launcher

* commit 'ad69e53e7ee3fdaaff676ae5d0e99f6b267675f9':
Removed the secure camera launcher

commit | commitdiff | tree

Jorim Jaggi [Fri, 4 Sep 2015 02:58:19 +0000 (19:58 -0700)]

Cancel animation when hiding Keyguard

So we don't end up in a wrong state.

Bug: 23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2

commit | commitdiff | tree

Selim Cinek [Tue, 8 Sep 2015 23:58:58 +0000 (23:58 +0000)]

am edf47486: Removed the secure camera launcher

* commit 'edf47486507f5edad1d1d8e6091b9a82f9e56930':
Removed the secure camera launcher

commit | commitdiff | tree

Selim Cinek [Wed, 2 Sep 2015 01:05:08 +0000 (18:05 -0700)]

Removed the secure camera launcher

With Android M, the system correctly handles camera arbitration
and therefore the secure camera launcher was only adding delay.

Bug: 23713450
Change-Id: Icd5e7883f3560bfd0c9b5f7bd93675847949469b

commit | commitdiff | tree

Zhentao Sun [Tue, 8 Sep 2015 22:41:25 +0000 (15:41 -0700)]

Changed the vibration duration from 1s to 750ms.

Fixed b/23727634.

Change-Id: Ie03b26f7b8faee8d61d772041351729995f7088c

commit | commitdiff | tree

Android Git Automerger [Tue, 8 Sep 2015 22:19:50 +0000 (22:19 +0000)]

am 07b3195f: am c698ece7: am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

* commit '07b3195f7b156d9123797fac9160bc27cb17263c':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Cheryl Potter [Tue, 8 Sep 2015 22:19:44 +0000 (22:19 +0000)]

am 27a85cca: am fb53f115: am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

* commit '27a85cca7c001ec47749feb60461081f14b2dfe3':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Android Git Automerger [Tue, 8 Sep 2015 22:13:28 +0000 (22:13 +0000)]

am c698ece7: am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

* commit 'c698ece7cf5d2651741439921f7a241a4f51354b':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Cheryl Potter [Tue, 8 Sep 2015 22:13:22 +0000 (22:13 +0000)]

am fb53f115: am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

* commit 'fb53f11515554f618d5888c8137119bcc4f316cb':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Android Git Automerger [Tue, 8 Sep 2015 22:04:36 +0000 (22:04 +0000)]

am 3bed3bf4: am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

* commit '3bed3bf498eadcaa760608a415c66e017d2eb690':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Cheryl Potter [Tue, 8 Sep 2015 22:04:32 +0000 (22:04 +0000)]

am d35c7940: am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

* commit 'd35c7940112fa7edae03a1b43670157787a69d3d':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Android Git Automerger [Tue, 8 Sep 2015 21:55:50 +0000 (21:55 +0000)]

am 92aeac34: am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

* commit '92aeac3499e91985a266590aff88b06a9633b667':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Cheryl Potter [Tue, 8 Sep 2015 21:55:46 +0000 (21:55 +0000)]

am 2c31a0d7: am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

* commit '2c31a0d774cebb9603d3dd7f904af20dce4f3bd4':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Android Git Automerger [Tue, 8 Sep 2015 21:46:08 +0000 (21:46 +0000)]

am 1c88f605: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

* commit '1c88f605629a5f1647a8af1fdcfe0fb6e3eea847':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Cheryl Potter [Tue, 8 Sep 2015 21:46:02 +0000 (21:46 +0000)]

am 9e28efe4: docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

* commit '9e28efe4e79402e1ae9c92579d4ea2bc5b4bb664':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

Android Git Automerger [Tue, 8 Sep 2015 21:37:33 +0000 (21:37 +0000)]

Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev

commit | commitdiff | tree

Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]

docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20

commit | commitdiff | tree

Cheryl Potter [Tue, 8 Sep 2015 21:36:35 +0000 (21:36 +0000)]

am 4b32b3f4: Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs

* commit '4b32b3f43fe8e27ffdb19d51364ebd99a3503e79':
docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

commit | commitdiff | tree

xin He [Tue, 8 Sep 2015 21:31:35 +0000 (21:31 +0000)]

am fb4e0323: am 2248874b: am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev

* commit 'fb4e0323a248c720170e010ea97299bf3f7415d1':
Introduce config_wifi_revert_country_code_on_cellular_loss

commit | commitdiff | tree

Cheryl Potter [Tue, 8 Sep 2015 21:28:06 +0000 (21:28 +0000)]

Merge "docs: change intro and title for contacts and sign-in lesson, and remove empty bullet" into mnc-preview-docs

commit | commitdiff | tree

xin He [Tue, 8 Sep 2015 21:20:02 +0000 (21:20 +0000)]

am 2248874b: am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev

* commit '2248874b8b7503b484556a1b46fdb23379fbc107':
Introduce config_wifi_revert_country_code_on_cellular_loss

commit | commitdiff | tree

xin He [Tue, 8 Sep 2015 21:09:13 +0000 (21:09 +0000)]

am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev

* commit 'ee1babecd204def48feb1fcf648dbed5cd760697':
Introduce config_wifi_revert_country_code_on_cellular_loss

commit | commitdiff | tree

Jorim Jaggi [Tue, 8 Sep 2015 21:08:40 +0000 (21:08 +0000)]

am dee90112: am 10352f7a: am 5e8e1c63: Do not expand notifications with expand gesture when disallowed

* commit 'dee90112ce6d47a5740fd60449f948c37a8956e4':
Do not expand notifications with expand gesture when disallowed

commit | commitdiff | tree

xin He [Tue, 8 Sep 2015 21:01:49 +0000 (21:01 +0000)]

Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 8 Sep 2015 20:58:56 +0000 (20:58 +0000)]

am 10352f7a: am 5e8e1c63: Do not expand notifications with expand gesture when disallowed

* commit '10352f7a48433b5b76cd5d35a5eec6c3df203a1f':
Do not expand notifications with expand gesture when disallowed

commit | commitdiff | tree

Jorim Jaggi [Tue, 8 Sep 2015 20:50:53 +0000 (20:50 +0000)]

am 5e8e1c63: Do not expand notifications with expand gesture when disallowed

* commit '5e8e1c63774da8c013fad18a63eac691cdc9646f':
Do not expand notifications with expand gesture when disallowed

commit | commitdiff | tree

Jorim Jaggi [Fri, 4 Sep 2015 18:51:26 +0000 (11:51 -0700)]

Do not expand notifications with expand gesture when disallowed

Bug: 23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a

commit | commitdiff | tree

Cheryl Potter [Tue, 11 Aug 2015 18:43:59 +0000 (11:43 -0700)]

docs: change intro and title for contacts and sign-in lesson, and remove empty bullet

b/22822607

Change-Id: Ib8b26e2ebe651fc3d9a1b9c89183ab62128d5e20

commit | commitdiff | tree

Lorenzo Colitti [Tue, 8 Sep 2015 13:02:37 +0000 (22:02 +0900)]

Require the new PACKET_KEEPALIVE_OFFLOAD permission.

Bug: 23884210
Change-Id: I50a1a647a69deaba92e73021ee7d6cc0f3eb1eee

commit | commitdiff | tree

Lorenzo Colitti [Tue, 8 Sep 2015 07:46:36 +0000 (16:46 +0900)]

Add an error code for generic hardware error.

This is necessary because currently the wifi code just returns
whatever hardware-specific integer it gets back from the HAL,
which is bad because that will be interpreted by the caller as
one of the error codes defined in this class.

In parallel we'll also modify the wifi code to return this new
error code if the hardware returns an error.

Bug: 21405946
Change-Id: Ic9fa1193ced69a4e7ff543e397221c89b10a5a13

commit | commitdiff | tree

Lorenzo Colitti [Tue, 8 Sep 2015 04:44:23 +0000 (13:44 +0900)]

Fix bugs and crashes in PacketKeepalive API.

Bug: 22606153
Bug: 23820819
Bug: 23884210
Change-Id: I1bf82094ec664baed345e9fb137fada0cbf4b7a0

commit | commitdiff | tree

Lorenzo Colitti [Tue, 8 Sep 2015 04:21:48 +0000 (13:21 +0900)]

Add tests for the PacketKeepalive API.

This currently fails in many different ways, but it tells us what
to fix.

Bug: 22606153
Bug: 23884210
Change-Id: If2e5ee0a8d7b26cad67d3d566ed5b1383e0db096

commit | commitdiff | tree

Lorenzo Colitti [Tue, 8 Sep 2015 04:23:00 +0000 (13:23 +0900)]

Add a PACKET_KEEPALIVE_OFFLOAD permission.

Bug: 23884210
Change-Id: I0f9207ac9b9c07c676f64f2748905e523e891501

commit | commitdiff | tree

Lorenzo Colitti [Fri, 7 Aug 2015 16:55:44 +0000 (01:55 +0900)]

Use a CountDownLatch instead of sleep() in NetworkFactory tests.

This makes testNetworkFactoryRequests 2-3 times faster.

Bug: 22606153
Change-Id: I9657b6929e77f23ec811d0ab57b2ba974f0b6a69

commit | commitdiff | tree

Lorenzo Colitti [Fri, 7 Aug 2015 11:17:27 +0000 (20:17 +0900)]

Get rid of shortSleep() in ConnectivityServiceTest.

Instead, use IdleHandler to wait for things to become idle.

Bug: 22606153
Change-Id: Ic6ab93ad4d336b40962f9be1096629a44b63ee2f

commit | commitdiff | tree

Nick Armstrong-Crews [Tue, 8 Sep 2015 05:28:51 +0000 (05:28 +0000)]

am 740cf71c: am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.

* commit '740cf71c9978e5dcb0a68b6558531a52dc26d44f':
Handle KEYCODE_SOFT_SLEEP from Ungaze.

commit | commitdiff | tree

Nick Armstrong-Crews [Tue, 8 Sep 2015 05:23:49 +0000 (05:23 +0000)]

am 56ecfcce: Handle KEYCODE_SOFT_SLEEP from Ungaze.

* commit '56ecfcce6c88fc80cf509effcebb124bbe0c79f8':
Handle KEYCODE_SOFT_SLEEP from Ungaze.

commit | commitdiff | tree

Nick Armstrong-Crews [Tue, 8 Sep 2015 04:46:50 +0000 (21:46 -0700)]

Handle KEYCODE_SOFT_SLEEP from Ungaze.

Needed for Ungaze to trigger "soft sleep" (respecting wake locks); operates by
sending new KEYCODE_SOFT_SLEEP to PhoneWindowManager, which calls
PowerManagerService's new method setUserInactiveOverride (thereby
causing immediate sleep, modulo wakelocks, upon next iteration of
PowerManagerService's main loop).

BUG: b/23589870
Change-Id: Iddafdde923605d119075e890eeda5d3fd3fd2bc7

commit | commitdiff | tree

Nick Armstrong-Crews [Tue, 8 Sep 2015 04:43:38 +0000 (04:43 +0000)]

am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev

* commit '36afc2b76743b2b2803da20dc6a8b2142d1f9b17':
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."

commit | commitdiff | tree

Nick Armstrong-Crews [Tue, 8 Sep 2015 04:35:36 +0000 (04:35 +0000)]

am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev

* commit '9b8f82a3a073891965a962251f9e613ba8cc90bb':
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."

commit | commitdiff | tree

Nick Armstrong-Crews [Tue, 8 Sep 2015 04:28:07 +0000 (04:28 +0000)]

Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev

commit | commitdiff | tree

Nick Armstrong-Crews [Tue, 8 Sep 2015 04:25:01 +0000 (04:25 +0000)]

Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."

This reverts commit 677adf1e66ba83b8fb2c849c181303b35bd489bc.

Hiding new keycode to prevent change to public API before resubmitting.

Change-Id: Ic43273dd0c7ade1d51a36b77f363543f1df466e8

commit | commitdiff | tree

Geoff Mendal [Mon, 7 Sep 2015 15:51:05 +0000 (15:51 +0000)]

am 953c6a4a: (-s ours) am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE

* commit '953c6a4a53715bd7e88dad78814110709bf7bf7f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 7 Sep 2015 15:42:40 +0000 (15:42 +0000)]

am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE

* commit '024fb4d4b803c35b3aad784f6a2d877a7118c3b2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 7 Sep 2015 15:38:18 +0000 (15:38 +0000)]

am 9f3e169c: (-s ours) Import translations. DO NOT MERGE

* commit '9f3e169c3a6277187fe00abc2eaa08d5872160ef':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 7 Sep 2015 15:31:05 +0000 (08:31 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Lorenzo Colitti [Fri, 7 Aug 2015 03:49:01 +0000 (12:49 +0900)]

Make ConnectivityServiceTest a bit more readable.

1. Make TestNetworkCallback a bit smarter and rename it to
   SingleUseNetworkCallback. This allows us to get rid of all the
   calls to TestNetworkCallback#getConditionVariable.
2. Delete the commented out code that used to test a
   ConnectivityService model that has not been used since KK.
3. Remove unused imports, etc.

Bug: 22606153
Change-Id: I81a2d0b970d19e5f4515490d8c2f88d416445fa1

commit | commitdiff | tree

Cheryl Potter [Fri, 4 Sep 2015 23:08:53 +0000 (23:08 +0000)]

am 179594bb: am dd9c75f3: am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '179594bb471d401fca5fdf372617ca9bbcf97252':
docs: changed references to Google+ sign-in to Google sign-in

commit | commitdiff | tree

Renato Mangini [Fri, 4 Sep 2015 23:08:47 +0000 (23:08 +0000)]

am d9c1c83f: am 18b68b26: am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit 'd9c1c83f45eb1718a6e7ba3fb26790c256c7f344':
Minor fix on Auto Desktop Head Unit doc.

commit | commitdiff | tree

Cheryl Potter [Fri, 4 Sep 2015 23:00:43 +0000 (23:00 +0000)]

am dd9c75f3: am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit 'dd9c75f33181664f7dac7c3d5eb0cc6eae0d6f7b':
docs: changed references to Google+ sign-in to Google sign-in

commit | commitdiff | tree

Renato Mangini [Fri, 4 Sep 2015 23:00:35 +0000 (23:00 +0000)]

am 18b68b26: am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit '18b68b2650422dd926c11618d5cf1bec1756d9c2':
Minor fix on Auto Desktop Head Unit doc.

commit | commitdiff | tree

Cheryl Potter [Fri, 4 Sep 2015 22:50:51 +0000 (22:50 +0000)]

am 24a6be46: am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '24a6be463e5628416ad234a3e2e33f1f4cc5b287':
docs: changed references to Google+ sign-in to Google sign-in

commit | commitdiff | tree

Renato Mangini [Fri, 4 Sep 2015 22:50:47 +0000 (22:50 +0000)]

am 8f2a5b25: am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit '8f2a5b257603971405ce94a57d26dc26233b20db':
Minor fix on Auto Desktop Head Unit doc.

commit | commitdiff | tree

Cheryl Potter [Fri, 4 Sep 2015 22:45:57 +0000 (22:45 +0000)]

am 36866dc7: am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '36866dc7347ba37ced74af6f8a6298c62282dacb':
docs: changed references to Google+ sign-in to Google sign-in

commit | commitdiff | tree

Renato Mangini [Fri, 4 Sep 2015 22:45:53 +0000 (22:45 +0000)]

am 1edd4ebc: am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit '1edd4ebce50a653f3d1454114f5cd73edcace903':
Minor fix on Auto Desktop Head Unit doc.

commit | commitdiff | tree

Cheryl Potter [Fri, 4 Sep 2015 22:35:43 +0000 (22:35 +0000)]

am 4afcda74: am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '4afcda743d0ba14ee0d3449e7f15518f3cc538dc':
docs: changed references to Google+ sign-in to Google sign-in

commit | commitdiff | tree

Renato Mangini [Fri, 4 Sep 2015 22:35:36 +0000 (22:35 +0000)]

am a8b9a2b7: am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit 'a8b9a2b7aeab97f71ff876319d807d9f151c6065':
Minor fix on Auto Desktop Head Unit doc.

commit | commitdiff | tree

Robert Greenwalt [Fri, 4 Sep 2015 22:27:45 +0000 (22:27 +0000)]

am 597c55b5: am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev

* commit '597c55b5790f2bbc86cd2333a71a934bf351fa3c':
Cut down some logs.

commit | commitdiff | tree

Cheryl Potter [Fri, 4 Sep 2015 22:24:55 +0000 (22:24 +0000)]

am 79ad6310: Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

* commit '79ad6310ea3ca5931013cf746babf55cf391cc8f':
docs: changed references to Google+ sign-in to Google sign-in

commit | commitdiff | tree

Renato Mangini [Fri, 4 Sep 2015 22:24:48 +0000 (22:24 +0000)]

am 81e0dff0: Minor fix on Auto Desktop Head Unit doc.

* commit '81e0dff0da637f3580ac81e86950b23e9a55bbdc':
Minor fix on Auto Desktop Head Unit doc.

commit | commitdiff | tree

Robert Greenwalt [Fri, 4 Sep 2015 22:17:35 +0000 (22:17 +0000)]

am e686d9b3: am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev

* commit 'e686d9b3aa547b89b85b3330d452d06b52196f8c':
Cut down some logs.

commit | commitdiff | tree

Cheryl Potter [Fri, 4 Sep 2015 22:14:25 +0000 (22:14 +0000)]

Merge "docs: changed references to Google+ sign-in to Google sign-in" into mnc-preview-docs

commit | commitdiff | tree

Vinit Deshpande [Fri, 4 Sep 2015 22:01:23 +0000 (15:01 -0700)]

Introduce config_wifi_revert_country_code_on_cellular_loss

This setting allows wifi country code to automatically reset
to default (i.e. ro.boot.wificountrycode property value) when
cellular modem loses MCC

bug: 21795172

Change-Id: I20bd3a260b639dba331305c6baa39ffb52e2fd6f

commit | commitdiff | tree

Robert Greenwalt [Fri, 4 Sep 2015 22:06:00 +0000 (22:06 +0000)]

am 8e285f2f: Merge "Cut down some logs." into mnc-dr-dev

* commit '8e285f2f74460b1b4bc9ba0faa3c94540f5ab92c':
Cut down some logs.

commit | commitdiff | tree

Dan Willemsen [Fri, 4 Sep 2015 22:00:26 +0000 (22:00 +0000)]

am 03c26b27: am 596fd38a: Merge "Whitelist windows module"

* commit '03c26b274aed35c0a580b309567264d00cb643f2':
Whitelist windows module

commit | commitdiff | tree

Robert Greenwalt [Fri, 4 Sep 2015 21:51:50 +0000 (21:51 +0000)]

Merge "Cut down some logs." into mnc-dr-dev

commit | commitdiff | tree

Dan Willemsen [Fri, 4 Sep 2015 21:48:35 +0000 (21:48 +0000)]

am 596fd38a: Merge "Whitelist windows module"

* commit '596fd38af207727d508a63fca39506c90ba29c44':
Whitelist windows module

commit | commitdiff | tree

Dan Willemsen [Fri, 4 Sep 2015 21:36:50 +0000 (21:36 +0000)]

Merge "Whitelist windows module"

commit | commitdiff | tree

Joe LaPenna [Fri, 4 Sep 2015 21:31:44 +0000 (21:31 +0000)]

am 551de25f: am ebff4c1d: Merge "Do not wtf when the systemui is not present." into cw-e-dev

* commit '551de25fd289c69f2c1ac9f486c88cb9b93861ef':
Do not wtf when the systemui is not present.

commit | commitdiff | tree

Dan Willemsen [Fri, 4 Sep 2015 21:21:26 +0000 (14:21 -0700)]

Whitelist windows module

Bug: 23566667
Change-Id: I030733ffd2b43a0ea74b0fd5f34a0d13ef8dcf7c

commit | commitdiff | tree

Joe LaPenna [Fri, 4 Sep 2015 21:11:37 +0000 (21:11 +0000)]

am ebff4c1d: Merge "Do not wtf when the systemui is not present." into cw-e-dev

* commit 'ebff4c1d90d8f1465a3376130fe65a9c045b683d':
Do not wtf when the systemui is not present.

commit | commitdiff | tree

Joe LaPenna [Fri, 4 Sep 2015 21:01:12 +0000 (21:01 +0000)]

Merge "Do not wtf when the systemui is not present." into cw-e-dev

commit | commitdiff | tree

Joe LaPenna [Fri, 4 Sep 2015 19:52:42 +0000 (12:52 -0700)]

Do not wtf when the systemui is not present.

Not all devices, like wearables actually have a system ui.

BUG: 23822226

Change-Id: Ibc2d6c3b8db1de668b9cbced3efcec5a7a39f20b

commit | commitdiff | tree

Nick Armstrong-Crews [Fri, 4 Sep 2015 18:22:54 +0000 (18:22 +0000)]

am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev

* commit '43c4459d995ce7a723d92945a7e4ccb81d48e224':
Handle KEYCODE_SOFT_SLEEP from Ungaze.

commit | commitdiff | tree

Nick Armstrong-Crews [Fri, 4 Sep 2015 18:11:44 +0000 (18:11 +0000)]

am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev

* commit '6f0ba402242cb8fd374f5b188e53669ec0cf34c7':
Handle KEYCODE_SOFT_SLEEP from Ungaze.

commit | commitdiff | tree

Nick Armstrong-Crews [Fri, 4 Sep 2015 18:04:12 +0000 (18:04 +0000)]

Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev

commit | commitdiff | tree

Nick Armstrong-Crews [Thu, 27 Aug 2015 20:53:25 +0000 (13:53 -0700)]

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:41:22 +0000 (16:41 +0000)]

am 578151c6: am fb611846: am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev

* commit '578151c673bf59e4bccd2237032f720705b4dff2':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL

commit | commitdiff | tree

Sungmin Choi [Fri, 4 Sep 2015 16:30:25 +0000 (16:30 +0000)]

am 1dcccdf6: am 46b7e9e9: am 4c97f3a4: Do not show roaming icon for some operators of Chile

* commit '1dcccdf615dea92609891c8de42e08b8fa927617':
Do not show roaming icon for some operators of Chile

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:28:17 +0000 (16:28 +0000)]

am fb611846: am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev

* commit 'fb611846f6ca62ea248eac0b35a8d6d1fe5f5116':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL

commit | commitdiff | tree

Sungmin Choi [Fri, 4 Sep 2015 16:22:00 +0000 (16:22 +0000)]

am 46b7e9e9: am 4c97f3a4: Do not show roaming icon for some operators of Chile

* commit '46b7e9e95dc1510e3720361b396de4be50ad59a5':
Do not show roaming icon for some operators of Chile

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:20:11 +0000 (16:20 +0000)]

am 566886f7: Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev

* commit '566886f7973b86196174e925f16d26975c16a09b':
IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 4 Sep 2015 16:09:02 +0000 (16:09 +0000)]

Merge "IMS: Fix registrationFeatureCapabilityChanged declaration in AIDL" into mnc-dr-dev

commit | commitdiff | tree

Sungmin Choi [Fri, 4 Sep 2015 16:08:04 +0000 (16:08 +0000)]

am 4c97f3a4: Do not show roaming icon for some operators of Chile

* commit '4c97f3a45a3ba345d630e282c07c5126128514eb':
Do not show roaming icon for some operators of Chile

commit | commitdiff | tree

Alan Viverette [Fri, 4 Sep 2015 12:40:02 +0000 (12:40 +0000)]

am bc635a25: am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"

* commit 'bc635a2574430f345aaa042e003935f315788304':
Update mFillPaint color on GradientDrawable inflation

commit | commitdiff | tree

Alan Viverette [Fri, 4 Sep 2015 12:31:46 +0000 (12:31 +0000)]

am 3d632546: (-s ours) Merge "Update mFillPaint color on GradientDrawable inflation"

* commit '3d6325460ec19c89c40d2083e8ca89fe53d5575b':
Update mFillPaint color on GradientDrawable inflation

commit | commitdiff | tree

Alan Viverette [Fri, 4 Sep 2015 11:51:02 +0000 (11:51 +0000)]

Merge "Update mFillPaint color on GradientDrawable inflation"

commit | commitdiff | tree

Snild Dolkow [Fri, 4 Sep 2015 08:08:05 +0000 (10:08 +0200)]

Update mFillPaint color on GradientDrawable inflation

When a GradientDrawable is loaded from scratch, initializeWithState()
is called with mColors == null. This sets mFillPaint's color to
0x00000000 -- transparent. mColors is then properly set in inflate(),
but mFillPaint is not updated there. It will be updated eventually
through a mutate() or ensureValidRect() call, but that's sometimes too
late.

In our case, a wrapping StateListDrawable called getOpacity(), and
since it caches the result, it never got updated.

This doesn't cause any problems on preloaded GradientDrawables, since
the new GradientDrawable created when fetching a preload will call
initializeWithState() in its constructor, fixing the GradientState.

Change-Id: Ic8caa7c6a7c1d4dae5ff31ae943831bd2e014f79

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help