Chris Craik
c0da873ee2
am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev
...
* commit 'a9473881eb066b41ea2fb3389b5c0031c2ab4f38':
Use the same interrupt/resume logic for all functor calls
2012-11-29 14:26:33 -08:00
Adam Cohen
20b9edd805
am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
2012-11-29 14:26:29 -08:00
Robert Greenwalt
81cf3abdd5
am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev
...
* commit '10659cb1be0059353f9e2ae64c7cfcc9ec312ba3':
Secure a handful of framework broadcasts
2012-11-29 14:26:20 -08:00
Irfan Sheriff
61b00239dd
am 0cec3de3: am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev
...
* commit '0cec3de3374a861497ff7eeada94865e85896971':
WFD: Fallback to PIN mode if PBC is not supported
2012-11-29 14:26:04 -08:00
Fabrice Di Meglio
52c3833e20
am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev
...
* commit '075817450c61902ecaaf4af2d96e8542123a86bd':
Fix bug #7621927 Radio button/TextView drawable regression in 4.2
2012-11-29 14:25:43 -08:00
Dianne Hackborn
221d59f723
am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev
...
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
Quiet down a lot of logging.
2012-11-29 14:25:40 -08:00
Robert Ly
8569af3011
am 5915f61e: am 830b23b7: docs: gms javadocs
...
* commit '5915f61e8b10e2a89d302f3c9bf2104c4abe1c07':
docs: gms javadocs
2012-11-29 14:23:35 -08:00
Robert Ly
5915f61e8b
am 830b23b7: docs: gms javadocs
...
* commit '830b23b76676542cbcb5ef3c60c869460d4c5466':
docs: gms javadocs
2012-11-29 14:22:13 -08:00
Robert Ly
a93d0e0930
am 64208d23: am aae17137: docs: update gms toc and landing pages
...
* commit '64208d23c95c16d1fb41b4dffdce554c198c5ee1':
docs: update gms toc and landing pages
2012-11-29 14:19:51 -08:00
Robert Ly
64208d23c9
am aae17137: docs: update gms toc and landing pages
...
* commit 'aae171371b044d4efe4b58589f3b04f000016cec':
docs: update gms toc and landing pages
2012-11-29 14:17:31 -08:00
Robert Ly
830b23b766
docs: gms javadocs
...
Change-Id: Ibcae03cab861c90a589f39a860889a3f4e6a55ad
2012-11-29 14:11:28 -08:00
Colin Cross
b36ed85c40
trigger kernel blocked stack trace on system server watchdog
...
Bug b/7638530 may be caused by a kernel deadlock when killing
processes under low memory conditions. Write to /proc/sysrq-trigger
to get a kernel log of blocked tasks before killing the system server.
Bug: 7638530
Change-Id: I60df324ad4affdadbf13650099dc4dfb38722420
2012-11-29 14:00:55 -08:00
Romain Guy
b8dca777ca
Merge "Use LruCache instead of GenerationCache in libhwui"
2012-11-29 13:58:57 -08:00
Michael Jurka
fff5614cae
Disable adding keyguard widgets until setup is done
...
Bug: 7504154
Change-Id: I865f0139bb328e6b9b19493e0d8f9f086e2ebc38
2012-11-29 13:15:39 -08:00
Romain Guy
a4caee0115
Merge "Cleanup: remove unused property"
2012-11-29 13:15:22 -08:00
Robert Ly
aae171371b
docs: update gms toc and landing pages
...
Change-Id: I2d55026d492356b70de2071c96786b6dadb5938a
2012-11-29 13:14:02 -08:00
Robert Ly
206979c9ac
am 8f1371af: am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev
...
* commit '8f1371aff392debf345027874f5fad4354137eed':
docs: fix bug 7628699
2012-11-29 13:07:02 -08:00
Romain Guy
215dcb1caa
Merge "Fire view removed event *after* a View is removed"
2012-11-29 13:05:21 -08:00
Romain Guy
1741d73441
Cleanup: remove unused property
...
Change-Id: I09b418ef8888c42a876cb9014b22231ec31ca7eb
2012-11-29 13:05:16 -08:00
Robert Ly
8f1371aff3
am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev
...
* commit '64e4ed8d67376e519c2d0d5e70a1375f8a8760eb':
docs: fix bug 7628699
2012-11-29 13:04:23 -08:00
Romain Guy
8e0d7bcef1
Merge "Improve profiling by using Choreographer"
2012-11-29 13:04:18 -08:00
Robert Ly
64e4ed8d67
Merge "docs: fix bug 7628699" into jb-mr1-dev
2012-11-29 13:02:09 -08:00
Colin Cross
418af9323f
am 05db19bc: Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev
...
* commit '05db19bc55962374812775bf7d980d83ca4f6c3e':
trigger kernel blocked stack trace on system server watchdog
2012-11-29 12:49:46 -08:00
Scott Main
3882ce0c3b
am 18eeb457: am d294d429: am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
...
* commit '18eeb4574e5a445405e476a4f89a44af02e24cc5':
docs: revisions to gps landing pages
2012-11-29 12:48:49 -08:00
Dirk Dougherty
68ce16af25
am bea4bb71: am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
...
* commit 'bea4bb716e71a63d78bf757fe88c46e2d2da7a56':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
2012-11-29 12:48:45 -08:00
Brian Colonna
d219cebfcb
am eceef837: am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev
...
* commit 'eceef837e34e6860ad532d15402435606550f3fa':
Ignoring FUL unlock signal if user changed fixes b/7572354
2012-11-29 12:48:41 -08:00
Zhihai Xu
55b82a8688
am aaa453db: am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
...
* commit 'aaa453dbbdd9307ddc8fbd32e7f3c1e673e02b83':
Settings shows it is connected to A2DP, though the device is not actually connected
2012-11-29 12:48:36 -08:00
Colin Cross
05db19bc55
Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev
2012-11-29 12:47:54 -08:00
Scott Main
18eeb4574e
am d294d429: am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev
...
* commit 'd294d429f90ea7d442fa9cd0f0c71e9292a36016':
docs: revisions to gps landing pages
2012-11-29 12:45:30 -08:00
Dirk Dougherty
bea4bb716e
am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev
...
* commit 'a539807a7c50948eec99b27e2d4d05da208ae3f1':
Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
2012-11-29 12:45:26 -08:00
Brian Colonna
eceef837e3
am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev
...
* commit 'ceb87a664fdcfa08f98238bfe41fc3a03603cbf8':
Ignoring FUL unlock signal if user changed fixes b/7572354
2012-11-29 12:45:18 -08:00
Zhihai Xu
aaa453dbbd
am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev
...
* commit '2c7dac19dd2cab68587cd129b45ad593f7bfdc44':
Settings shows it is connected to A2DP, though the device is not actually connected
2012-11-29 12:45:09 -08:00
Colin Cross
5df1d871fe
trigger kernel blocked stack trace on system server watchdog
...
Bug b/7638530 may be caused by a kernel deadlock when killing
processes under low memory conditions. Write to /proc/sysrq-trigger
to get a kernel log of blocked tasks before killing the system server.
Bug: 7638530
Change-Id: I60df324ad4affdadbf13650099dc4dfb38722420
2012-11-29 12:44:09 -08:00
Dianne Hackborn
ed8c323a6c
am 38e84700: Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
...
* commit '38e847004978031c2b914714e92bc5407ba3ce65':
Fix issue #7585876 : When changing the font settings, the movie...
2012-11-29 12:08:41 -08:00
Dianne Hackborn
38e8470049
Merge "Fix issue #7585876 : When changing the font settings, the movie..." into jb-mr1.1-dev
2012-11-29 12:05:33 -08:00
Dianne Hackborn
7ac8bbddfc
Fix issue #7585876 : When changing the font settings, the movie...
...
...just keeps attempting to load and doesn't play on the TV
Change-Id: Ifcdc969a037a113224632f907d55f60a168dd05a
2012-11-29 11:59:58 -08:00
John Spurlock
43658bae9c
am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev
...
* commit '143d73dab5bf3fe6b8835660543d3d03e781618f':
Fix multiuser bug in StatusBarManagerService.
2012-11-29 11:48:48 -08:00
John Spurlock
143d73dab5
Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev
2012-11-29 11:45:57 -08:00
Romain Guy
059e12ccd2
Use LruCache instead of GenerationCache in libhwui
...
Change-Id: Ic26ddc7151eb5462bcd243b21daf7187ed6d3bec
2012-11-29 11:44:02 -08:00
Craig Mautner
8f0bdb5bb6
Merge "Extract AppTransition from WindowManager"
2012-11-29 11:43:49 -08:00
John Spurlock
1428384c62
am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev
...
* commit '958343c19f8a87dfb8967431684da3239ac20272':
Fix for navbar back/home appearing in keyguard (multiuser).
2012-11-29 11:41:55 -08:00
John Spurlock
958343c19f
Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev
2012-11-29 11:40:30 -08:00
Romain Guy
d075031944
Improve profiling by using Choreographer
...
This will avoid jank and lead to better measurements.
Change-Id: Id18587a0a0b7d45adb3a65dfc427800565cc5d0b
2012-11-29 11:34:43 -08:00
Scott Main
3aabc56425
am bf0e87a4: am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev
...
* commit 'bf0e87a41bff9905fd8d623bc5c2b106f372bdc0':
docs: update landing page for Google Services
2012-11-29 11:32:56 -08:00
Scott Main
bf0e87a41b
am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev
...
* commit '77ea05d0063cd0b417c3681e6c58bbebdaeb2d88':
docs: update landing page for Google Services
2012-11-29 11:31:02 -08:00
Scott Main
77ea05d006
Merge "docs: update landing page for Google Services" into jb-mr1-dev
2012-11-29 11:28:06 -08:00
Daniel Sandler
a8a63dd7d9
am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev
...
* commit '154e2d7d2c6c5a316b5471d56c86174dd9ca5e86':
Flush the clock format when the locale changes.
2012-11-29 11:23:10 -08:00
Scott Main
61885a659a
docs: update landing page for Google Services
...
Change-Id: I7d7543282158474b8e722a9833ddf15a1e4e03f8
2012-11-29 11:22:42 -08:00
Daniel Sandler
154e2d7d2c
Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev
2012-11-29 11:20:25 -08:00
John Spurlock
8f3e6d5c83
Fix multiuser bug in StatusBarManagerService.
...
First, do no harm.
Bug:7638210
Change-Id: I113b574a021d601b0c79d65a3b4b72eeb4c667ad
2012-11-29 14:18:35 -05:00