Adam Cohen
d086ee036e
am 580ee8b0: Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
...
* commit '580ee8b0c6e1aea1e2e1d60499b603b9168b44f0':
Fixing AppWidgetService / AppWidgetHost to work in system process
2012-09-27 11:19:28 -07:00
Adam Cohen
580ee8b0c6
Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
2012-09-27 11:17:20 -07:00
Adam Cohen
672144f86d
am 62d2d621: Merge "Fixing Keyguard widget click handling (issue 7179972)" into jb-mr1-dev
...
* commit '62d2d62158e5be280e69e7620b8fb8a43a3cc26e':
Fixing Keyguard widget click handling (issue 7179972)
2012-09-27 11:14:47 -07:00
Adam Cohen
62d2d62158
Merge "Fixing Keyguard widget click handling (issue 7179972)" into jb-mr1-dev
2012-09-27 11:11:33 -07:00
Justin Koh
b88948f760
Merge "Send Trackball clicks instead of Enter Key for taps" into jb-mr1-aah-dev
2012-09-27 11:08:24 -07:00
Ben Pietrzak
2c9141206c
Send Trackball clicks instead of Enter Key for taps
...
Change-Id: Ib1e77a1bdad81db18f84bb33402e9144517a0f4c
2012-09-27 10:27:37 -07:00
Steven Ross
73c2508074
am 9a4a0376: Merge "Stop FaceUnlock when detached from window fixes b/7222226" into jb-mr1-dev
...
* commit '9a4a0376a78f9b3bcfe6374660fbe7c28797b36a':
Stop FaceUnlock when detached from window fixes b/7222226
2012-09-27 10:21:42 -07:00
Steven Ross
9a4a0376a7
Merge "Stop FaceUnlock when detached from window fixes b/7222226" into jb-mr1-dev
2012-09-27 10:17:18 -07:00
Baligh Uddin
c422356bdd
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-27 10:12:32 -07:00
Baligh Uddin
69d9159db5
am 6c805cb5: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '6c805cb53d2c03056722b7ae672bb94c9f71ce71':
Import translations. DO NOT MERGE
2012-09-27 10:06:14 -07:00
Baligh Uddin
6c805cb53d
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-27 10:04:08 -07:00
Chris Craik
c388f93cf5
am b0d135d9: Merge "Add stroke support to polygonal shape rendering" into jb-mr1-dev
...
* commit 'b0d135d91f3a41af09fd0281211f18e8452e7fc6':
Add stroke support to polygonal shape rendering
2012-09-27 09:50:27 -07:00
Chris Craik
b0d135d91f
Merge "Add stroke support to polygonal shape rendering" into jb-mr1-dev
2012-09-27 09:47:52 -07:00
Baligh Uddin
9d240dd705
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-09-27 08:39:14 -07:00
Baligh Uddin
ab1c97df73
am d9730390: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd9730390c6bbac09107866462b9bf45d0b5706cf':
Import translations. DO NOT MERGE
2012-09-27 08:38:52 -07:00
Baligh Uddin
d9730390c6
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-27 08:36:33 -07:00
Daniel Sandler
f30d48290f
am 4735a1e1: Merge "New notification/settings panel handle assets." into jb-mr1-dev
...
* commit '4735a1e12cf240e12141b2a81475a52ffb0f7513':
New notification/settings panel handle assets.
2012-09-27 08:25:42 -07:00
Daniel Sandler
4735a1e12c
Merge "New notification/settings panel handle assets." into jb-mr1-dev
2012-09-27 08:23:28 -07:00
Daniel Sandler
4e32ba7ce7
New notification/settings panel handle assets.
...
Bug: 7171620
Change-Id: Ie6bc31345eafe91c03ca2bd09399419e54831f33
2012-09-27 10:34:41 -04:00
Steven Ross
fbb9c6197f
Stop FaceUnlock when detached from window fixes b/7222226
...
The FaceUnlock service gets onConfigurationChanged at about the same time as onDetachedFromWindow is received by the KeyguardFaceUnlockView, so we could do something beyond hiding the window there, but this approach should operate on the same thread as onPause and onResume, and thus be safe against threading issues.
Before this change, I was seeing startUi calls in FaceUnlock.java crashing the service because the ProcessingThread had already been set to null. After this change, onDetachedFromWindow gets called, followed by onPause, after a rotation. The onDetachedFromWindow call now clears the messages and shuts down the connection, which prevents the startUi call. We should also probably make sure startUi in the service exits if mThread is null for good measure.
Change-Id: I083066c9cb210e398d911e70c0f3bb5d2736cd8d
2012-09-27 08:25:47 -04:00
Satoshi Kataoka
159ca57009
am 2da2ec19: Merge "Fix imf flag" into jb-mr1-dev
...
* commit '2da2ec19e0e5d5b50575eb7ebe4e2e7f170647dc':
Fix imf flag
2012-09-27 04:09:15 -07:00
Satoshi Kataoka
2da2ec19e0
Merge "Fix imf flag" into jb-mr1-dev
2012-09-27 04:06:14 -07:00
Satoshi Kataoka
accd22aa63
Fix imf flag
...
Change-Id: I28a3155f329a3bd8b8a8f5d06b5ab21eba7d4558
2012-09-27 20:04:38 +09:00
Dianne Hackborn
8cd027f52b
am 66442c7e: Merge "Work on issue #7232641 : ISE crash when rotating phone in label list mode" into jb-mr1-dev
...
* commit '66442c7e7b86d0fb45e02b32b8750ed06b93ef06':
Work on issue #7232641 : ISE crash when rotating phone in label list mode
2012-09-27 00:56:59 -07:00
Dianne Hackborn
db9daf7597
am 2480bc12: Merge "Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev
...
* commit '2480bc12a525a55ebff453dbf6ca95258b9f23cf':
Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user
2012-09-27 00:55:07 -07:00
Dianne Hackborn
66442c7e7b
Merge "Work on issue #7232641 : ISE crash when rotating phone in label list mode" into jb-mr1-dev
2012-09-27 00:54:55 -07:00
Dianne Hackborn
2480bc12a5
Merge "Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev
2012-09-27 00:53:08 -07:00
Dianne Hackborn
f43a33c5ea
Work on issue #7232641 : ISE crash when rotating phone in label list mode
...
This doesn't fix the problem; I think it is an app problem. It does
improve a bunch of the debugging to help better identify what is going
on, and introduces some checks when adding a fragment to fail
immediately if we are getting into a state when a fragment is going to
be in the added list multiple times (which is pretty much guaranteed
to lead to a failure at some point in the future).
Change-Id: If3a8700763facd61c4505c6ff872ae66875afc8d
2012-09-27 00:51:56 -07:00
Dianne Hackborn
c7ba771a45
Fix issue #7232952 : Settings crash on tapping on Downloaded apps on a secondary user
...
Also tweak bind flags for new location services so they
aren't put so aggressively up in the oom adj list.
Change-Id: I9da25a3fea7681013b4d95b7db7e9a808f2d733b
2012-09-26 23:22:59 -07:00
Jeff Brown
4ff4f4a39b
am 7bb89cf1: Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev
...
* commit '7bb89cf1632da6dc236e6603c4245301500eeb39':
Cure narcolepsy.
Allow applications to connect to known wifi displays.
2012-09-26 20:23:13 -07:00
Jeff Sharkey
03d28b5974
am f21b94a8: Merge "Remove unused Secure settings." into jb-mr1-dev
...
* commit 'f21b94a8774f238daf90105a42bc6c140dd7dae2':
Remove unused Secure settings.
2012-09-26 20:21:22 -07:00
Jeff Sharkey
031c410adc
am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev
...
* commit '68b7a6d14b68b38324ffd275c7227805c7d99b2d':
First step towards cleaning up Global settings.
2012-09-26 20:19:32 -07:00
Jeff Brown
7bb89cf163
Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev
...
* changes:
Cure narcolepsy.
Allow applications to connect to known wifi displays.
2012-09-26 20:19:09 -07:00
Jeff Sharkey
f21b94a877
Merge "Remove unused Secure settings." into jb-mr1-dev
2012-09-26 20:17:44 -07:00
Jeff Sharkey
68b7a6d14b
Merge "First step towards cleaning up Global settings." into jb-mr1-dev
2012-09-26 20:15:45 -07:00
Stephen Hines
177bb01c7d
am 0b171158: Merge "RS char bug repro case" into jb-mr1-dev
...
* commit '0b1711582ff07d6d1e8e4de6c057eaf6a3473ac3':
RS char bug repro case
2012-09-26 19:07:07 -07:00
Stephen Hines
0391cc23ff
am c49c71a5: Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev
...
* commit 'c49c71a5c600485c395d95fd02fabde082e30177':
Restore RSTest functionality (char bug is fixed).
2012-09-26 19:05:30 -07:00
Stephen Hines
0b1711582f
Merge "RS char bug repro case" into jb-mr1-dev
2012-09-26 19:04:48 -07:00
Stephen Hines
c49c71a5c6
Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev
2012-09-26 19:03:21 -07:00
Jeff Brown
f9d40f4236
Cure narcolepsy.
...
Bug: 7204211
Change-Id: I2c09abaad5d321cec6f62f7ca0ce00c3b61ee211
2012-09-26 18:57:48 -07:00
Jeff Sharkey
f32fad0fe7
am dd78d462: Fix JNI method signature.
...
* commit 'dd78d462f6dceac71f9d1cbb723bb38a3b5bdc2e':
Fix JNI method signature.
2012-09-26 18:52:07 -07:00
Jeff Sharkey
dd78d462f6
Fix JNI method signature.
...
Change-Id: I156624e0ac55330f43d9c4d7f15d59f6c529aa0a
2012-09-26 18:46:08 -07:00
Jeff Brown
bc33545746
Allow applications to connect to known wifi displays.
...
Bug: 7177920
Change-Id: I9d8406e1016988e2cd267dfa52d78a829f1b385e
2012-09-26 18:34:47 -07:00
Adam Cohen
3ff2d867d4
Fixing AppWidgetService / AppWidgetHost to work in system process
...
-> Fixes issue 7208464
-> Fixed issue with partial update as well, should address
issue 7214731
Change-Id: Ib8d9d5bee68b4fa7d6b4fbbc2f6609c287689958
2012-09-26 18:00:12 -07:00
Jeff Sharkey
4de9936e85
Remove unused Secure settings.
...
Carefully leave default values intact in Watchdog for now.
Bug: 7232007, 7232230
Change-Id: Id944181109305aed41e0766fdd39625b43cb1d19
2012-09-26 17:58:19 -07:00
Amith Yamasani
d490f68664
am 38796fe1: Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
...
* commit '38796fe16266e22c56d2eee3eb63fac0cb926aaa':
Fix sync problems when setting up a new user and account
2012-09-26 17:48:35 -07:00
Amith Yamasani
38796fe162
Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
2012-09-26 17:46:37 -07:00
Adam Cohen
a6a4cbc18f
Fixing Keyguard widget click handling (issue 7179972)
...
Change-Id: I2b268d08f5aff403a04db53c357fa45a6cb8d490
2012-09-26 17:43:08 -07:00
Philip Milne
ac4b97caed
am eed8f06f: Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
...
* commit 'eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2':
Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()
2012-09-26 17:34:10 -07:00
Philip Milne
eed8f06f7f
Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
2012-09-26 17:30:20 -07:00