OSDN Git Service
David Friedman [Tue, 6 Jan 2015 22:28:43 +0000 (22:28 +0000)]
am
aed8152d: am
2d179c89: am
919ecb22: am
58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
* commit '
aed8152d864b90363569c3a2de09de35048cfeb2':
Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
Joe Fernandez [Tue, 6 Jan 2015 22:28:38 +0000 (22:28 +0000)]
am
750c0385: am
214e6867: am
c27d5fd6: am
7cec35ef: Merge "docs: b/
18122848 [DAC] Android TV - Recommendation card" into lmp-docs
* commit '
750c0385601964ae0bf16b75fe94eb1da22ffa29':
docs: b/
18122848 [DAC] Android TV - Recommendation card
Joe Fernandez [Tue, 6 Jan 2015 22:28:33 +0000 (22:28 +0000)]
am
c4429f1f: am
001f6f54: am
66fefd0c: am
a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '
c4429f1fac0a7be38adaed24eec87e3d3d1e077c':
docs: plugin link name update
Scott Rowe [Tue, 6 Jan 2015 22:28:25 +0000 (22:28 +0000)]
am
aa7c1f68: am
13d31b0a: am
d7d1411a: am
e2b44f86: docs: Making TV Apps Searchable - new training
* commit '
aa7c1f6845dcac1ade80196280ead40958bd1acd':
docs: Making TV Apps Searchable - new training
David Friedman [Tue, 6 Jan 2015 22:21:54 +0000 (22:21 +0000)]
am
2d179c89: am
919ecb22: am
58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
* commit '
2d179c899a59a2001a665ca6c3725832aced648c':
Android TV initial (time-sensitive) localization release for Japanese partners. Bug:
18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
Joe Fernandez [Tue, 6 Jan 2015 22:21:47 +0000 (22:21 +0000)]
am
214e6867: am
c27d5fd6: am
7cec35ef: Merge "docs: b/
18122848 [DAC] Android TV - Recommendation card" into lmp-docs
* commit '
214e6867c5339468a960e8b8a20c535c99eb9e57':
docs: b/
18122848 [DAC] Android TV - Recommendation card
Joe Fernandez [Tue, 6 Jan 2015 22:21:43 +0000 (22:21 +0000)]
am
001f6f54: am
66fefd0c: am
a9a36ab2: Merge "docs: plugin link name update" into lmp-docs
* commit '
001f6f5451a71da328c3e05b4da1ad3bf24ad613':
docs: plugin link name update
Scott Rowe [Tue, 6 Jan 2015 22:21:38 +0000 (22:21 +0000)]
am
13d31b0a: am
d7d1411a: am
e2b44f86: docs: Making TV Apps Searchable - new training
* commit '
13d31b0a40dd58d61e8a6ad82c1de165792b95e4':
docs: Making TV Apps Searchable - new training
Christopher Tate [Tue, 6 Jan 2015 18:16:43 +0000 (18:16 +0000)]
am
1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev
* commit '
1c6014e77dfad1a7af229d642df7b7300beee721':
Remove the "backup_data_changed" event log
Christopher Tate [Tue, 6 Jan 2015 18:09:40 +0000 (18:09 +0000)]
Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev
Dianne Hackborn [Tue, 6 Jan 2015 18:07:26 +0000 (18:07 +0000)]
am
5fe8197f: Merge "Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev
* commit '
5fe8197fde93f659acbbbdd5dda9c7eac69c468f':
Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit
Dianne Hackborn [Tue, 6 Jan 2015 17:59:58 +0000 (17:59 +0000)]
Merge "Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev
Paul Jensen [Tue, 6 Jan 2015 14:49:09 +0000 (14:49 +0000)]
am
9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests.
* commit '
9ffb53cb1131eeac5c246e7378455bb4b64293f5':
Clear process DNS NetID binding when expiring or releaseing legacy requests.
Paul Jensen [Wed, 17 Dec 2014 15:39:34 +0000 (10:39 -0500)]
Clear process DNS NetID binding when expiring or releaseing legacy requests.
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.
bug:
18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
Jinsuk Kim [Tue, 6 Jan 2015 04:06:35 +0000 (04:06 +0000)]
am
b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev
* commit '
b0b4921bcbb0619587509b882d33da52ebb98106':
CEC: Make deviceSelect work for MHL device
Jinsuk Kim [Tue, 6 Jan 2015 04:03:19 +0000 (04:03 +0000)]
Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev
Jinsuk Kim [Tue, 6 Jan 2015 02:30:56 +0000 (11:30 +0900)]
CEC: Make deviceSelect work for MHL device
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.
Bug:
18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
Andrew Solovay [Tue, 6 Jan 2015 02:12:48 +0000 (02:12 +0000)]
am
ff62a5ee: am
4c7390d3: am
b663f2fc: am
713cd74e: docs: New "app compatibility with managed profiles" doc
* commit '
ff62a5eea743581dd0747026f09f3d73cdd4c1ea':
docs: New "app compatibility with managed profiles" doc
Joe Fernandez [Tue, 6 Jan 2015 02:12:43 +0000 (02:12 +0000)]
am
27195338: am
546a0e8c: am
60925265: am
afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
* commit '
27195338192b63b62f274f11bcae57dc2788514f':
docs: studio build output dir name update
Joe Fernandez [Tue, 6 Jan 2015 02:12:38 +0000 (02:12 +0000)]
am
851931f0: am
21b92f34: am
43f4e8fa: am
27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
* commit '
851931f0626c0f450add010f2f8e836769a3afc9':
docs: gradle version update in plugin file
Joe Fernandez [Tue, 6 Jan 2015 02:12:32 +0000 (02:12 +0000)]
am
3dcc1289: am
447ea509: am
f110d357: am
8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
* commit '
3dcc12892fba022f8c45e9575b23f20bbe55f6b4':
docs: gradle wrapper security note
Joe Fernandez [Tue, 6 Jan 2015 02:12:27 +0000 (02:12 +0000)]
am
765ae116: am
eed87a57: am
09b41c02: am
e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
* commit '
765ae116e2ebab02668c9ef5a7ae11f8a4ffa102':
docs: project file and toc updates
Joe Fernandez [Tue, 6 Jan 2015 02:12:21 +0000 (02:12 +0000)]
am
596868b6: am
c811b88a: am
d3d09d87: am
66e851fa: Merge "docs: studio workflow links" into lmp-docs
* commit '
596868b6489e77f9165e0d03a8d451fccd7f3959':
docs: studio workflow links
Joe Fernandez [Tue, 6 Jan 2015 02:12:16 +0000 (02:12 +0000)]
am
a78664e0: am
411c779b: am
c919f7cf: am
1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
* commit '
a78664e03078d7c671077192357c5e25c0556755':
docs: studio tips and ticks grammmar typo
Ricardo Cervera [Tue, 6 Jan 2015 02:12:12 +0000 (02:12 +0000)]
am
ac4444a2: am
c5fae959: am
48a066db: am
60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
* commit '
ac4444a26f19bda442da367ba9bda194f09a68c5':
docs: Update wearable lists docs
Joe Fernandez [Tue, 6 Jan 2015 02:12:06 +0000 (02:12 +0000)]
am
b1062ad6: am
c3fb32ab: am
4603c122: am
18a75595: Merge "docs: studio device emulator updates" into lmp-docs
* commit '
b1062ad68efd04cdf236f8fec184e849da7548cf':
docs: studio device emulator updates
Sarah Maddox [Tue, 6 Jan 2015 02:12:01 +0000 (02:12 +0000)]
am
15e94fdf: am
4811f9b8: am
ecf0ac29: am
ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
* commit '
15e94fdf343e688113a47342048ebd2baf646338':
docs: Updates the request-location-updates lesson in the location APIs training course.
Ricardo Cervera [Tue, 6 Jan 2015 02:11:56 +0000 (02:11 +0000)]
am
fcba6472: am
9719336b: am
4ef7873d: am
8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
* commit '
fcba64722bb10fae8c17a994d343080aa439fc8c':
docs: Adding vector drawables video
Joe Fernandez [Tue, 6 Jan 2015 02:11:50 +0000 (02:11 +0000)]
am
f3d9f030: am
adaef486: am
e78489b4: am
e22b42b3: Merge "docs: plugin reference update" into lmp-docs
* commit '
f3d9f03053390d81e266027c9dcb69b5c3cc3e83':
docs: plugin reference update
Andrew Solovay [Tue, 6 Jan 2015 02:02:02 +0000 (02:02 +0000)]
am
4c7390d3: am
b663f2fc: am
713cd74e: docs: New "app compatibility with managed profiles" doc
* commit '
4c7390d392dfe4a5df626ce28d415e01cab7d132':
docs: New "app compatibility with managed profiles" doc
Joe Fernandez [Tue, 6 Jan 2015 02:01:14 +0000 (02:01 +0000)]
am
546a0e8c: am
60925265: am
afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs
* commit '
546a0e8c695808c987be3fbac1b3e632b6c6aa8d':
docs: studio build output dir name update
Joe Fernandez [Tue, 6 Jan 2015 02:01:09 +0000 (02:01 +0000)]
am
21b92f34: am
43f4e8fa: am
27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs
* commit '
21b92f34525e12ede8f842f6c426d33093df3b24':
docs: gradle version update in plugin file
Joe Fernandez [Tue, 6 Jan 2015 02:01:05 +0000 (02:01 +0000)]
am
447ea509: am
f110d357: am
8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs
* commit '
447ea5097ba99ca25ddd613e72e10b57f3405291':
docs: gradle wrapper security note
Joe Fernandez [Tue, 6 Jan 2015 02:01:01 +0000 (02:01 +0000)]
am
eed87a57: am
09b41c02: am
e6395cd3: Merge "docs: project file and toc updates" into lmp-docs
* commit '
eed87a573a2e67c85f5a8e79ad538cce278932d2':
docs: project file and toc updates
Joe Fernandez [Tue, 6 Jan 2015 02:00:57 +0000 (02:00 +0000)]
am
c811b88a: am
d3d09d87: am
66e851fa: Merge "docs: studio workflow links" into lmp-docs
* commit '
c811b88ab1bc891fffdef461ead0f6dc7331d04e':
docs: studio workflow links
Joe Fernandez [Tue, 6 Jan 2015 02:00:53 +0000 (02:00 +0000)]
am
411c779b: am
c919f7cf: am
1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs
* commit '
411c779bb746d81278b7646ffd96fa6e4f8336b9':
docs: studio tips and ticks grammmar typo
Ricardo Cervera [Tue, 6 Jan 2015 02:00:48 +0000 (02:00 +0000)]
am
c5fae959: am
48a066db: am
60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs
* commit '
c5fae9593553a89db2ad49306b46b8f9a3631489':
docs: Update wearable lists docs
Joe Fernandez [Tue, 6 Jan 2015 02:00:42 +0000 (02:00 +0000)]
am
c3fb32ab: am
4603c122: am
18a75595: Merge "docs: studio device emulator updates" into lmp-docs
* commit '
c3fb32ab3989806f49cdd21ca58a044daf74f060':
docs: studio device emulator updates
Sarah Maddox [Tue, 6 Jan 2015 02:00:32 +0000 (02:00 +0000)]
am
4811f9b8: am
ecf0ac29: am
ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs
* commit '
4811f9b84766adc17efb730160e15785d74875a3':
docs: Updates the request-location-updates lesson in the location APIs training course.
Ricardo Cervera [Tue, 6 Jan 2015 02:00:24 +0000 (02:00 +0000)]
am
9719336b: am
4ef7873d: am
8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs
* commit '
9719336b3a9a059c31200137a93f74445d3c7185':
docs: Adding vector drawables video
Joe Fernandez [Tue, 6 Jan 2015 02:00:14 +0000 (02:00 +0000)]
am
adaef486: am
e78489b4: am
e22b42b3: Merge "docs: plugin reference update" into lmp-docs
* commit '
adaef486464af836cd3408657634c972419e4c80':
docs: plugin reference update
Christopher Tate [Tue, 6 Jan 2015 01:07:57 +0000 (17:07 -0800)]
Remove the "backup_data_changed" event log
Nowadays it's just spammy and uninformative, so away it goes.
Bug
18833115
Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e
Alan Viverette [Tue, 6 Jan 2015 00:54:54 +0000 (00:54 +0000)]
am
ccfd34f6: Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev
* commit '
ccfd34f6b59cfd79746bb1698abafc458a83d6cb':
Scroll handle was half as opaque as it was supposed to be
Alan Viverette [Tue, 6 Jan 2015 00:49:07 +0000 (00:49 +0000)]
Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev
Shishir Agrawal [Tue, 6 Jan 2015 00:43:09 +0000 (00:43 +0000)]
am
8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
* commit '
8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda':
Data quick settings - Usage shown should take into account merged IDs.
Shishir Agrawal [Tue, 6 Jan 2015 00:37:05 +0000 (00:37 +0000)]
Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev
Sungsoo Lim [Tue, 6 Jan 2015 00:18:35 +0000 (00:18 +0000)]
am
2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev
* commit '
2bdf89b167d709e170150e5ae5bf888e6535c1fd':
DO NOT MERGE Fix typo
Sungsoo Lim [Tue, 6 Jan 2015 00:13:12 +0000 (00:13 +0000)]
Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev
Alan Viverette [Tue, 6 Jan 2015 00:06:26 +0000 (16:06 -0800)]
Scroll handle was half as opaque as it was supposed to be
BUG:
18903443
Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a
Dianne Hackborn [Tue, 6 Jan 2015 00:05:05 +0000 (16:05 -0800)]
Fix issue #
18907544: Activity manager miscomputed high RAM for 64 bit
No longer modify the base constants when computing oom adj values.
Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
Deepanshu Gupta [Mon, 5 Jan 2015 23:30:18 +0000 (23:30 +0000)]
am
4a5baeae: Merge "resolved conflicts for
a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
* commit '
4a5baeaec9294dbb43fe3b36a44b3176101756b6':
resolved conflicts for
a0bc2e7e to lmp-mr1-dev
Deepanshu Gupta [Mon, 5 Jan 2015 23:26:02 +0000 (23:26 +0000)]
Merge "resolved conflicts for
a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
Dianne Hackborn [Mon, 5 Jan 2015 23:09:07 +0000 (23:09 +0000)]
am
29807195: Merge "Fix issue #
18901214: APR: Frequent crash in android" into lmp-mr1-dev
* commit '
298071951210ae23c8023c4dc8f82da5d1760211':
Fix issue #
18901214: APR: Frequent crash in android
Dianne Hackborn [Mon, 5 Jan 2015 23:03:46 +0000 (23:03 +0000)]
Merge "Fix issue #
18901214: APR: Frequent crash in android" into lmp-mr1-dev
Filip Gruszczynski [Mon, 5 Jan 2015 22:50:29 +0000 (22:50 +0000)]
am
8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
* commit '
8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2':
Add system api for disabling touch events in wallpaper behind the window.
Filip Gruszczynski [Mon, 5 Jan 2015 22:46:12 +0000 (22:46 +0000)]
Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev
Dianne Hackborn [Mon, 5 Jan 2015 22:40:24 +0000 (14:40 -0800)]
Fix issue #
18901214: APR: Frequent crash in android
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path. This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.
However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.
To fix this, move ShutdownActivity to the framework jar.
Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
Alan Viverette [Mon, 5 Jan 2015 22:32:10 +0000 (22:32 +0000)]
am
1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev
* commit '
1f3f47b3680547dbb764db173e02d833e12d65a2':
Avoid double-translating View background
Alan Viverette [Mon, 5 Jan 2015 22:26:52 +0000 (22:26 +0000)]
Merge "Avoid double-translating View background" into lmp-mr1-dev
Alan Viverette [Mon, 5 Jan 2015 22:20:42 +0000 (14:20 -0800)]
Avoid double-translating View background
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.
BUG:
18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
Hui Shu [Mon, 5 Jan 2015 22:14:40 +0000 (22:14 +0000)]
am
bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev
* commit '
bb8451521196ce493e8827fd50ab84f3c776931d':
pm path needs to return 0 when it succeeds.
Hui Shu [Mon, 5 Jan 2015 22:07:14 +0000 (22:07 +0000)]
Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev
Wale Ogunwale [Mon, 5 Jan 2015 22:06:43 +0000 (22:06 +0000)]
am
1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev
* commit '
1d893785bdd8af210eab861653e3e7664c728897':
Don't restore persistent task to a stack until needed.
Wale Ogunwale [Mon, 5 Jan 2015 22:03:19 +0000 (22:03 +0000)]
Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev
Alan Viverette [Mon, 5 Jan 2015 21:43:27 +0000 (21:43 +0000)]
am
74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
* commit '
748902420d26b2868296303be7df89d0c25b7f2b':
Don't override dialog icon drawable unless valid resource ID was set
Alan Viverette [Mon, 5 Jan 2015 21:39:12 +0000 (21:39 +0000)]
Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
Jason Monk [Mon, 5 Jan 2015 21:15:51 +0000 (21:15 +0000)]
am
ee2e13e7: Merge "Don\'t unregister MobileSignalControllers still used" into lmp-mr1-dev
* commit '
ee2e13e75356fbef806dfb69ccf995d7f616f027':
Don't unregister MobileSignalControllers still used
Jason Monk [Mon, 5 Jan 2015 21:15:46 +0000 (21:15 +0000)]
am
b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev
* commit '
b142b7552a6245606d93c43ce56ce81c700b3c09':
QS WiFi panel trigger settings on correct user
Jason Monk [Mon, 5 Jan 2015 21:09:21 +0000 (21:09 +0000)]
Merge "Don't unregister MobileSignalControllers still used" into lmp-mr1-dev
Jason Monk [Mon, 5 Jan 2015 21:09:03 +0000 (21:09 +0000)]
Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev
Filip Gruszczynski [Mon, 5 Jan 2015 18:41:29 +0000 (10:41 -0800)]
Add system api for disabling touch events in wallpaper behind the window.
Bug:
18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
Alan Viverette [Mon, 5 Jan 2015 20:56:45 +0000 (12:56 -0800)]
Don't override dialog icon drawable unless valid resource ID was set
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.
BUG:
18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
Jason Monk [Fri, 12 Dec 2014 16:49:55 +0000 (11:49 -0500)]
Don't unregister MobileSignalControllers still used
Also add some more testing for this section of code that manages
when MobileSignalControllers are added/removed to make sure we
are all good.
Bug:
18728593
Change-Id: I9902854c54d2e1deb58b38b7bd97dac1617831c0
Alan Viverette [Mon, 5 Jan 2015 20:28:06 +0000 (20:28 +0000)]
am
22a3163f: Merge "Fix selector bug" into lmp-mr1-dev
* commit '
22a3163f1da8387e42c68c459f5667ac10744a3c':
Fix selector bug
Alan Viverette [Mon, 5 Jan 2015 20:23:45 +0000 (20:23 +0000)]
Merge "Fix selector bug" into lmp-mr1-dev
Alan Viverette [Mon, 5 Jan 2015 20:06:32 +0000 (20:06 +0000)]
am
dd508581: Use min when comparing AM and PM text lengths
* commit '
dd508581216ef3ef47bd474316232f269db43f03':
Use min when comparing AM and PM text lengths
Alan Viverette [Mon, 5 Jan 2015 19:28:12 +0000 (11:28 -0800)]
Use min when comparing AM and PM text lengths
Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.
BUG:
18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
Jason Monk [Mon, 5 Jan 2015 17:05:24 +0000 (12:05 -0500)]
QS WiFi panel trigger settings on correct user
Bug:
18900000
Change-Id: I67e234eb6300dd05f950f174107b6a28867af7a2
Jason Monk [Mon, 5 Jan 2015 16:29:20 +0000 (16:29 +0000)]
am
4ae97d36: Post broadcasts to bg and cache bt state info
* commit '
4ae97d3632edf4fd00fe23b9a2304e4e0f2348b7':
Post broadcasts to bg and cache bt state info
Jason Monk [Wed, 17 Dec 2014 15:14:33 +0000 (10:14 -0500)]
Post broadcasts to bg and cache bt state info
Add a background thread to post bt broadcasts to for processing.
Try to cache all bluetooth connection state info possible and pull
from broadcasts because requesting it too often may be locking up
devices.
Bug:
18771211
Change-Id: I2cf4852c935b2f471e735d953370e5d9e996c6f7
Jinsuk Kim [Mon, 5 Jan 2015 07:16:24 +0000 (07:16 +0000)]
am
6cfb4495: Merge "CEC: Let MHL device be of type \'source\'" into lmp-mr1-dev
* commit '
6cfb44952a76303fe1c7cc75b545cb8aad72eecf':
CEC: Let MHL device be of type 'source'
Jinsuk Kim [Mon, 5 Jan 2015 07:10:05 +0000 (07:10 +0000)]
Merge "CEC: Let MHL device be of type 'source'" into lmp-mr1-dev
Jinsuk Kim [Mon, 5 Jan 2015 07:07:28 +0000 (16:07 +0900)]
CEC: Let MHL device be of type 'source'
MHL devices should be of type source that can stream AV contents
to the connected TV. This should be supported by the API
HdmiDeviceInfo.isSourceType().
Bug:
18897172
Change-Id: I7dcbd7773127bf26797c204504a12c3e2ebbd83b
Sungsoo Lim [Mon, 5 Jan 2015 00:08:34 +0000 (09:08 +0900)]
DO NOT MERGE Fix typo
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
(cherry picked from commit
9dcba434e27ec4de87eac1448ded4126b3f97773)
Sungsoo Lim [Mon, 5 Jan 2015 04:29:23 +0000 (04:29 +0000)]
am
b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev
* commit '
b65ad80de116f42fb3f2821363d52ce71e553517':
DO NOT MERGE Make mute/unmute work
Sungsoo Lim [Mon, 5 Jan 2015 04:25:09 +0000 (04:25 +0000)]
Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev
Sungsoo Lim [Wed, 24 Dec 2014 08:30:00 +0000 (17:30 +0900)]
DO NOT MERGE Make mute/unmute work
Bug:
18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
(cherry picked from commit
d1851e6e4e49b6a45d9e013de2e1384711975328)
Dongwon Kang [Mon, 5 Jan 2015 02:26:15 +0000 (02:26 +0000)]
am
017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
* commit '
017bb8523dd7c3dbfd00c055fde241de4dca9da2':
DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
Dongwon Kang [Fri, 26 Dec 2014 05:53:14 +0000 (14:53 +0900)]
DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
Bug:
18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit
b61077357eb6d8b95b303ef107b15db243a9621b)
Jinsuk Kim [Sat, 3 Jan 2015 21:20:30 +0000 (21:20 +0000)]
am
ad1e3d7d: CEC: Buffer <Set System Audio Mode>
* commit '
ad1e3d7df42376cd2a257b6c3b2fed540658a6e3':
CEC: Buffer <Set System Audio Mode>
Jinsuk Kim [Fri, 2 Jan 2015 04:27:15 +0000 (13:27 +0900)]
CEC: Buffer <Set System Audio Mode>
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.
Bug:
18809965
Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
Deepanshu Gupta [Tue, 18 Nov 2014 21:53:47 +0000 (21:53 +0000)]
resolved conflicts for
a0bc2e7e to lmp-mr1-dev
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.
This change also fixes the typo in the original change which was fixed
in a subsequent change.
Original commit:
12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a
fix for typo:
cb09bc45c58740af953874f9915306d351fc3d9d
Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
Michael Wright [Tue, 30 Dec 2014 19:45:47 +0000 (19:45 +0000)]
am
a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
* commit '
a33424a540ea725d4b513ee713931c66e62721a2':
Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
Michael Wright [Tue, 30 Dec 2014 19:40:50 +0000 (19:40 +0000)]
Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev
Marvin Paul [Tue, 30 Dec 2014 00:53:52 +0000 (00:53 +0000)]
Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev
automerge:
a30fdf7
* commit '
a30fdf790d66e241252c51d7dbdc401e021e51ad':
Don't backup ringtone on non-telephony devices.
Marvin Paul [Mon, 29 Dec 2014 23:18:15 +0000 (23:18 +0000)]
Merge "Don't backup ringtone on non-telephony devices." into lmp-mr1-dev
Andre Eisenbach [Mon, 29 Dec 2014 18:36:27 +0000 (18:36 +0000)]
am
d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev
* commit '
d7d9cdaebb30df5564b5787ee02d4624673c8523':
Exclude unnecessary intents in SystemUI
Andre Eisenbach [Mon, 29 Dec 2014 18:32:20 +0000 (18:32 +0000)]
Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev
Svetoslav [Mon, 29 Dec 2014 18:23:54 +0000 (18:23 +0000)]
am
e5ea48a7: Fix a race in accessibility manager.
* commit '
e5ea48a7fe295a2815bab57f2e870901ce48b312':
Fix a race in accessibility manager.
Svetoslav [Mon, 29 Dec 2014 17:40:42 +0000 (09:40 -0800)]
Fix a race in accessibility manager.
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.
bug:
18840784
Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
OSDN Git Service
