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

OSDN Git Service

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 14 Oct 2014 00:14:36 +0000 (00:14 +0000)]

Merge "Fix bug #17900580 Top bar drop shadow no longer transparent" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Tue, 14 Oct 2014 00:13:30 +0000 (00:13 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Wei Wang [Mon, 13 Oct 2014 23:05:37 +0000 (23:05 +0000)]

am 34020eb6: Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev

* commit '34020eb6ebc619c90b9107003331a91e4d5a350e':
Add support of advertising through standard instance.(1/4)

commit | commitdiff | tree

Wei Wang [Mon, 13 Oct 2014 23:02:29 +0000 (23:02 +0000)]

Merge "Add support of advertising through standard instance.(1/4)" into lmp-sprout-dev

commit | commitdiff | tree

Evan Charlton [Mon, 13 Oct 2014 22:32:55 +0000 (22:32 +0000)]

am 1354a1ff: am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev

* commit '1354a1fffec1ece56011f4259fbcecafbf758c74':
Update the SDK AIDL list

commit | commitdiff | tree

Evan Charlton [Mon, 13 Oct 2014 22:28:29 +0000 (22:28 +0000)]

am f715da3d: Merge "Update the SDK AIDL list" into lmp-dev

* commit 'f715da3d6b2c2d5037de69262eba513e863a98d8':
Update the SDK AIDL list

commit | commitdiff | tree

Aravind Akella [Tue, 16 Sep 2014 22:21:44 +0000 (15:21 -0700)]

Sensor documentation fixes.

Change-Id: I664e5e2d5103b87ed02f082551e46513f64b95a1

commit | commitdiff | tree

Evan Charlton [Mon, 13 Oct 2014 22:19:39 +0000 (22:19 +0000)]

Merge "Update the SDK AIDL list" into lmp-dev

commit | commitdiff | tree

Evan Charlton [Sun, 12 Oct 2014 16:54:30 +0000 (09:54 -0700)]

Update the SDK AIDL list

Populate the framework.aidl list with .aidl files which are:
  - In the android.* namespace
  - Not marked @hide
  - Do not have their corresponding .java files marked @hide

Bug: 17952409
Change-Id: I1f4abf7abbc298a51605571cd168362dcc5603b2

commit | commitdiff | tree

Sarah Maddox [Mon, 13 Oct 2014 22:08:47 +0000 (22:08 +0000)]

am 64aec659: am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev

* commit '64aec659b7b222c8663e36852f75f685c0ab8de4':
Fixed a typo in Perf Tips.

commit | commitdiff | tree

Alan Viverette [Mon, 13 Oct 2014 22:08:43 +0000 (22:08 +0000)]

am 21ad8732: am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev

* commit '21ad8732314872cc62ba2d311343c23b1e9078b8':
Increase contrast for money permission

commit | commitdiff | tree

Elliott Hughes [Mon, 13 Oct 2014 22:08:39 +0000 (22:08 +0000)]

am c02ddd6a: am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev

* commit 'c02ddd6a0a4643ce49150231a104d77d90c13f27':
Ensure that the SIM language doesn't override the user language on the encryption UI.

commit | commitdiff | tree

Jeff Sharkey [Mon, 13 Oct 2014 22:08:35 +0000 (22:08 +0000)]

am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev

* commit 'c4d774d5d87439180eed0be45eb2242f8bf7cfaa':
DocumentsUI: Add content description for nav.

commit | commitdiff | tree

Jesse Hall [Mon, 13 Oct 2014 22:08:31 +0000 (22:08 +0000)]

am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev

* commit 'd4b38fe5c06f622b984e7f84f299269efce92e42':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails

commit | commitdiff | tree

Amit Mahajan [Mon, 13 Oct 2014 22:08:28 +0000 (22:08 +0000)]

am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev

* commit '097c8d60115a9207ba4140ef99766741a2256361':
Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.

commit | commitdiff | tree

Sarah Maddox [Mon, 13 Oct 2014 22:04:22 +0000 (22:04 +0000)]

am 8601b1b1: Merge "Fixed a typo in Perf Tips." into lmp-dev

* commit '8601b1b1ca75512177aa3539d33292250b5c9a2d':
Fixed a typo in Perf Tips.

commit | commitdiff | tree

Alan Viverette [Mon, 13 Oct 2014 22:04:15 +0000 (22:04 +0000)]

am b927dfc7: Merge "Increase contrast for money permission" into lmp-dev

* commit 'b927dfc774bd9d2c52cf6fbf50fe2eca16994c27':
Increase contrast for money permission

commit | commitdiff | tree

Elliott Hughes [Mon, 13 Oct 2014 22:04:11 +0000 (22:04 +0000)]

am c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev

* commit 'c130b428c5d7eb25dc7651c5cea82182f2241ddf':
Ensure that the SIM language doesn't override the user language on the encryption UI.

commit | commitdiff | tree

Jeff Sharkey [Mon, 13 Oct 2014 22:04:06 +0000 (22:04 +0000)]

am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev

* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
DocumentsUI: Add content description for nav.

commit | commitdiff | tree

Jesse Hall [Mon, 13 Oct 2014 22:03:59 +0000 (22:03 +0000)]

am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev

* commit '647e0df0c711cd53763367c86b15f10470eaeb6f':
Surface: Leave object in unlocked state when unlockCanvasAndPost fails

commit | commitdiff | tree

Amit Mahajan [Mon, 13 Oct 2014 22:03:52 +0000 (22:03 +0000)]

am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev

* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.

commit | commitdiff | tree

Sarah Maddox [Mon, 13 Oct 2014 21:50:28 +0000 (21:50 +0000)]

Merge "Fixed a typo in Perf Tips." into lmp-dev

commit | commitdiff | tree

Alan Viverette [Mon, 13 Oct 2014 21:31:39 +0000 (21:31 +0000)]

Merge "Increase contrast for money permission" into lmp-dev

commit | commitdiff | tree

Alan Viverette [Mon, 13 Oct 2014 20:58:47 +0000 (20:58 +0000)]

Merge "Always project ripples" into lmp-mr1-dev

commit | commitdiff | tree

Elliott Hughes [Mon, 13 Oct 2014 20:55:29 +0000 (20:55 +0000)]

Merge "Ensure that the SIM language doesn't override the user language on the encryption UI." into lmp-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 13 Oct 2014 20:31:02 +0000 (20:31 +0000)]

Merge "DocumentsUI: Add content description for nav." into lmp-dev

commit | commitdiff | tree

Jesse Hall [Mon, 13 Oct 2014 20:23:14 +0000 (20:23 +0000)]

Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev

commit | commitdiff | tree

Alan Viverette [Mon, 13 Oct 2014 20:12:49 +0000 (13:12 -0700)]

Increase contrast for money permission

BUG: 17923303
Change-Id: Ic35a9d37690ec5c4375285ca9b162cbff62db656

commit | commitdiff | tree

Jeff Sharkey [Mon, 13 Oct 2014 19:53:13 +0000 (12:53 -0700)]

DocumentsUI: Add content description for nav.

Bug: 17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124

commit | commitdiff | tree

Elliott Hughes [Mon, 13 Oct 2014 19:39:56 +0000 (12:39 -0700)]

Ensure that the SIM language doesn't override the user language on the encryption UI.

Bug: 17945169
Change-Id: I51e4f47c7cd925f3701f292b9022e467ccf95a17

commit | commitdiff | tree

Amit Mahajan [Mon, 13 Oct 2014 19:32:36 +0000 (19:32 +0000)]

Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev

commit | commitdiff | tree

Yohei Yukawa [Mon, 13 Oct 2014 18:57:58 +0000 (18:57 +0000)]

am 540861c9: am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev

* commit '540861c925df9b3743251e5d219cd5fe790f9048':
Update config when "Show input method" is changed

commit | commitdiff | tree

Mike Lockwood [Mon, 13 Oct 2014 18:57:54 +0000 (18:57 +0000)]

am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev

* commit '8ca4886e439685fdcb1eff4c3552a62522ebeeb0':
Change RECEIVE_BLUETOOTH_MAP permission to signature or system

commit | commitdiff | tree

Michael Wright [Mon, 13 Oct 2014 18:57:50 +0000 (18:57 +0000)]

am 43a7dcc1: am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev

* commit '43a7dcc12b212ac4f00af294b13d931dca3c3f8d':
Clean-up ColorFade's shaders and buffers.

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 18:57:47 +0000 (18:57 +0000)]

am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'ad12f288b1199b636c3961bb86fd11ed2749065e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 18:49:14 +0000 (18:49 +0000)]

am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '1b77f365d63828e5111a1bec6495a06c07154771':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Yohei Yukawa [Mon, 13 Oct 2014 18:48:16 +0000 (18:48 +0000)]

am 2dfd8d57: Merge "Update config when "Show input method" is changed" into lmp-dev

* commit '2dfd8d578a0c5b90ee10ce1f3ddb4aeb0e948f60':
Update config when "Show input method" is changed

commit | commitdiff | tree

Mike Lockwood [Mon, 13 Oct 2014 18:48:11 +0000 (18:48 +0000)]

am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev

* commit '317f9ce85a492a213b8f1dac477b1aefad55f621':
Change RECEIVE_BLUETOOTH_MAP permission to signature or system

commit | commitdiff | tree

Michael Wright [Mon, 13 Oct 2014 18:48:07 +0000 (18:48 +0000)]

am 265d3e9d: Merge "Clean-up ColorFade\'s shaders and buffers." into lmp-dev

* commit '265d3e9d3eb6915d9ca9da5fcd1ddb29b5f8bc3b':
Clean-up ColorFade's shaders and buffers.

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 18:48:03 +0000 (18:48 +0000)]

am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '02c4a225ffa32e67255517a0275d7a4c1a738619':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Yohei Yukawa [Mon, 13 Oct 2014 18:42:48 +0000 (18:42 +0000)]

Merge "Update config when "Show input method" is changed" into lmp-dev

commit | commitdiff | tree

Mike Lockwood [Mon, 13 Oct 2014 18:38:22 +0000 (18:38 +0000)]

Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev

commit | commitdiff | tree

Amit Mahajan [Mon, 13 Oct 2014 18:21:46 +0000 (11:21 -0700)]

Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to
signatureOrSystem.

Bug: 17952946
Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a

commit | commitdiff | tree

Jesse Hall [Mon, 13 Oct 2014 18:01:15 +0000 (11:01 -0700)]

Surface: Leave object in unlocked state when unlockCanvasAndPost fails

If nativeUnlockCanvasAndPost() throws, Surface was maintaining a
reference to the native Surface, and assuming it was still locked.
That would cause future lockCanvas() calls to throw without even
trying to lock the native Surface, even though in some cases the
native lock was actually released before the exception was thrown.

Now Surface treats the native object as unlocked even if
nativeUnlockCanvasAndPost() throws, so it will attempt the native lock
on lockCanvas() rather than assuming it would fail.

This change also changes an IllegalStateException to
IllegalArgumentException in unlockCanvasAndPost(). That exception was
added in KitKat, and was never documented or added to the throws
declaration. This was essentially a silent public API change. Quite a
bit of code in the framework (and likely in applications) catches
IAE from this method, but didn't attempt to handle ISE. Although ISE
is more correct here, it's not worth breaking code (and it did -- in
this bug it changed a problem that should have been silently and
perfectly recovered from into a fatal exception in system_server.)

Bug: 17684556
Change-Id: Ia8d3e5d33eaa690d16c7d0f557390c7bb4e1e32e

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 17:31:33 +0000 (17:31 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Michael Wright [Mon, 13 Oct 2014 17:30:31 +0000 (17:30 +0000)]

Merge "Clean-up ColorFade's shaders and buffers." into lmp-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 17:28:16 +0000 (17:28 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 17:22:35 +0000 (17:22 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 17:15:50 +0000 (10:15 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 17:08:58 +0000 (10:08 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 17:05:28 +0000 (10:05 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Mike Lockwood [Mon, 13 Oct 2014 17:00:08 +0000 (10:00 -0700)]

Change RECEIVE_BLUETOOTH_MAP permission to signature or system

Bug: 17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 14:20:20 +0000 (14:20 +0000)]

am 862ecfa3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '862ecfa38a5df179bcacf7e5f0c8c2cfef994193':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 14:17:22 +0000 (14:17 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 14:16:34 +0000 (07:16 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 14:07:49 +0000 (14:07 +0000)]

am 39217055: (-s ours) am d700e5a3: (-s ours) Import translations. DO NOT MERGE

* commit '39217055fad3ee87bf912ac9a2ad7b186cf73eb4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 14:03:56 +0000 (07:03 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 14:03:04 +0000 (14:03 +0000)]

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

* commit 'd700e5a37afec6c264609c5df4c3a6b783417330':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 13 Oct 2014 13:57:32 +0000 (06:57 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Marcin Kosiba [Mon, 13 Oct 2014 09:47:01 +0000 (09:47 +0000)]

am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

* commit '4f3ee426f62662f590c056ce44f005cd716f9870':
Remove the default WebView text encoding resource entirely.

commit | commitdiff | tree

Marcin Kosiba [Mon, 13 Oct 2014 09:42:58 +0000 (09:42 +0000)]

am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
Remove the default WebView text encoding resource entirely.

commit | commitdiff | tree

Marcin Kosiba [Mon, 13 Oct 2014 09:37:34 +0000 (09:37 +0000)]

Merge "Remove the default WebView text encoding resource entirely." into lmp-dev

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 05:44:25 +0000 (05:44 +0000)]

am e0b0d9a2: am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev

* commit 'e0b0d9a2dcfc53bb8794271081ca3b15e9792bee':
docs: Move the L-Developer Preview samples page to the Developer Samples area

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 05:44:21 +0000 (05:44 +0000)]

am 26ebde60: am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area

* commit '26ebde60d2cd1022e858061f74030ef2e8b4f134':
docs: Migrate TV Design docs to main DAC-Design area

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 05:40:35 +0000 (05:40 +0000)]

am 7e522af6: Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev

* commit '7e522af60ffc3de9d809a82808bf93eba9917d32':
docs: Move the L-Developer Preview samples page to the Developer Samples area

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 05:40:31 +0000 (05:40 +0000)]

am cd2445a9: docs: Migrate TV Design docs to main DAC-Design area

* commit 'cd2445a9aa1159dead4107a770b898c8305aed19':
docs: Migrate TV Design docs to main DAC-Design area

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 05:36:59 +0000 (05:36 +0000)]

Merge "docs: Move the L-Developer Preview samples page to the Developer Samples area" into lmp-dev

commit | commitdiff | tree

Joe Fernandez [Wed, 8 Oct 2014 05:55:44 +0000 (22:55 -0700)]

docs: Migrate TV Design docs to main DAC-Design area

Change-Id: Ie9ba7e519ccdf46b58010d5ff11b4042134b7a57

commit | commitdiff | tree

Jinsuk Kim [Mon, 13 Oct 2014 05:16:10 +0000 (05:16 +0000)]

Merge "CEC: Queue actions for starting later when not ready" into lmp-mr1-dev

commit | commitdiff | tree

Sarah Maddox [Mon, 13 Oct 2014 03:08:38 +0000 (14:08 +1100)]

Fixed a typo in Perf Tips.

Change-Id: I427bd60211d6fa3f2d1f262dc2b9b8e7729d4adc

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 04:49:36 +0000 (04:49 +0000)]

am d942d4e9: am 15edcda5: docs: migrate Android TV games page to TV training section

* commit 'd942d4e93b8e3f7fecab1bee2ae41b0fc69d940c':
docs: migrate Android TV games page to TV training section

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 04:45:34 +0000 (04:45 +0000)]

am 15edcda5: docs: migrate Android TV games page to TV training section

* commit '15edcda56ba12ad04a286f4d07f2b6fe0b1c5e38':
docs: migrate Android TV games page to TV training section

commit | commitdiff | tree

Joe Fernandez [Mon, 6 Oct 2014 00:04:13 +0000 (17:04 -0700)]

docs: migrate Android TV games page to TV training section

Change-Id: Ic6be9deaac5ad2516dba288c0c3d059e3c7a6118

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 04:01:02 +0000 (04:01 +0000)]

am f0acbc15: am e6b9abb3: docs: migrate Android TV content discovery

* commit 'f0acbc154d1b31240ea8a4b21186667c7dcbf897':
docs: migrate Android TV content discovery

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 03:56:42 +0000 (03:56 +0000)]

am e6b9abb3: docs: migrate Android TV content discovery

* commit 'e6b9abb3ad06d32e76a07e733e0a6554479fbfa4':
docs: migrate Android TV content discovery

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 03:51:07 +0000 (03:51 +0000)]

am bb8e826c: am f666355b: docs: migrate TV Playback app content

* commit 'bb8e826c299e0ca3c83d8befeaa8f64becbf5acc':
docs: migrate TV Playback app content

commit | commitdiff | tree

Joe Fernandez [Sun, 5 Oct 2014 19:44:04 +0000 (12:44 -0700)]

docs: migrate Android TV content discovery

Change-Id: I35fe1e7f4f60409a0f7c5cd5bfc8ccfede4d6c20

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 03:29:40 +0000 (03:29 +0000)]

am f666355b: docs: migrate TV Playback app content

* commit 'f666355b2d9dbffffa640aff7731a8ba8309eaaa':
docs: migrate TV Playback app content

commit | commitdiff | tree

Jinsuk Kim [Mon, 13 Oct 2014 02:41:47 +0000 (02:41 +0000)]

Merge "CEC: Do not publish the service if native/HAL is not ready" into lmp-mr1-dev

commit | commitdiff | tree

Jinsuk Kim [Fri, 10 Oct 2014 05:40:29 +0000 (14:40 +0900)]

CEC: Queue actions for starting later when not ready

Requests coming in while the service is still being brought up
were discarded. Changed to queue them so that they can be started
after the initialization is completed.

Bug: 17933899
Change-Id: Ic9d9cd2094b830c80dec54dd5ef6a18159a74dc7

commit | commitdiff | tree

Joe Fernandez [Thu, 2 Oct 2014 17:13:16 +0000 (10:13 -0700)]

docs: migrate TV Playback app content

Change-Id: I851dac6423cba3b76c85e1ac5b6c03a98272d868

commit | commitdiff | tree

Jinsuk Kim [Mon, 13 Oct 2014 01:38:16 +0000 (10:38 +0900)]

CEC: Do not publish the service if native/HAL is not ready

This helps detect the issue sooner by checking the availability
of the service and avoid crashing at a later point.

Bug: 17897529
Change-Id: Iab0eeffb00221e5a7e6e36d446eeef7c92da1f82

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 00:41:59 +0000 (00:41 +0000)]

am fd74a901: am d86a2f5b: docs: Android TV App Dev Basic Training

* commit 'fd74a901f7ba78b618e1033fdc71af6f7f38bf0c':
docs: Android TV App Dev Basic Training

commit | commitdiff | tree

Joe Fernandez [Mon, 13 Oct 2014 00:35:17 +0000 (00:35 +0000)]

am d86a2f5b: docs: Android TV App Dev Basic Training

* commit 'd86a2f5b344a6c3520ab05c02df8a5b3fdfa5aea':
docs: Android TV App Dev Basic Training

commit | commitdiff | tree

Joe Fernandez [Thu, 11 Sep 2014 16:52:07 +0000 (09:52 -0700)]

docs: Android TV App Dev Basic Training

Change-Id: Iede448652efba25c3d0b6c26d49ea6548008515e

commit | commitdiff | tree

Joe Fernandez [Fri, 10 Oct 2014 04:16:03 +0000 (21:16 -0700)]

docs: Move the L-Developer Preview samples page to the Developer Samples area

Change-Id: I307acca1dd3105768ed5c72995b1c7e67bea0612

commit | commitdiff | tree

Ihab Awad [Sun, 12 Oct 2014 04:33:12 +0000 (04:33 +0000)]

am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)"

* commit 'f5afb4d617d591225cc504b52ba9b6f1605a5c87':
Revert "Add color to PhoneAccount objects (1/3)"

commit | commitdiff | tree

Ihab Awad [Sun, 12 Oct 2014 00:14:46 +0000 (17:14 -0700)]

Revert "Add color to PhoneAccount objects (1/3)"

This reverts commit 0000cd81c84d73d3f878cd581fb89b7ea257a05a.

commit | commitdiff | tree

Dianne Hackborn [Sat, 11 Oct 2014 02:50:12 +0000 (02:50 +0000)]

am eddb2b38: am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev

* commit 'eddb2b3805d323ad1b6e1a09f2e64736b2eb2cf4':
Fix issue #17829949: Don't kill Bluetooth service...

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 02:50:08 +0000 (02:50 +0000)]

am 589a4896: am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

* commit '589a4896b0c45f03604db1eb0292ef1c936adaff':
Fix to show low LTE signal strength as -140 instead of 0.

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 02:50:03 +0000 (02:50 +0000)]

am 3bb0b296: am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev

* commit '3bb0b2964df28a17999a53a4b3c7667f81a58506':
Add Cutive Mono as serif monospace font for captioning

commit | commitdiff | tree

Ihab Awad [Sat, 11 Oct 2014 02:49:21 +0000 (02:49 +0000)]

am a516e445: Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-dev

* commit 'a516e445651724da3a833d08540c42fabe4f34b7':
Add color to PhoneAccount objects (1/3)

commit | commitdiff | tree

Dianne Hackborn [Sat, 11 Oct 2014 00:29:53 +0000 (00:29 +0000)]

am bbbeafa9: Merge "Fix issue #17829949: Don\'t kill Bluetooth service..." into lmp-dev

* commit 'bbbeafa9bf0c4598b32c615c72e2c87ef62c85e9':
Fix issue #17829949: Don't kill Bluetooth service...

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 00:24:13 +0000 (00:24 +0000)]

am c6c18618: Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

* commit 'c6c18618e999f24675e23b67e6c488d700199579':
Fix to show low LTE signal strength as -140 instead of 0.

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 00:24:03 +0000 (00:24 +0000)]

am 99cc35bb: Merge "Add Cutive Mono as serif monospace font for captioning" into lmp-dev

* commit '99cc35bbde7415fcdeada6fb4243097af85ae33f':
Add Cutive Mono as serif monospace font for captioning

commit | commitdiff | tree

Dianne Hackborn [Sat, 11 Oct 2014 00:17:45 +0000 (00:17 +0000)]

Merge "Fix issue #17829949: Don't kill Bluetooth service..." into lmp-dev

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 00:14:26 +0000 (00:14 +0000)]

Merge "Fix inset drawable's intrinsic size, replace ic_text_dot asset" into lmp-mr1-dev

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 00:07:18 +0000 (00:07 +0000)]

Merge "Fix to show low LTE signal strength as -140 instead of 0." into lmp-dev

commit | commitdiff | tree

Amit Mahajan [Fri, 10 Oct 2014 21:41:44 +0000 (14:41 -0700)]

Fix to show low LTE signal strength as -140 instead of 0.

Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a