Irfan Sheriff
f0afe4144d
Cleanup logging
...
Change-Id: Ieea19853c069266b55cad80cce3743b5ba91218a
2012-11-30 15:58:46 -08:00
Craig Mautner
f4f35f8e8d
am 1ee927f4: am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev
...
* commit '1ee927f42bea9817fc16d5ee6532ce46e099f4b4':
Ignore invalid combination of PowerManager flags.
2012-11-26 11:45:25 -08:00
Craig Mautner
1ee927f42b
am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev
...
* commit '8de91ce1e037408064f453b26f1fe725cd6377e3':
Ignore invalid combination of PowerManager flags.
2012-11-26 11:43:28 -08:00
Craig Mautner
8de91ce1e0
am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev
...
* commit '7f2a98967532138f3f962216ccf2d1a8307d42de':
Ignore invalid combination of PowerManager flags.
2012-11-26 11:41:17 -08:00
Craig Mautner
625ac3086a
Merge "Retain dimming while animating and obscured."
2012-11-26 11:35:31 -08:00
Craig Mautner
7f2a989675
Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev
2012-11-26 11:34:40 -08:00
Svetoslav Ganov
6ce77cdd6a
Adding dump support for the accessibility manager service.
...
Change-Id: Ibc8d9eac3be065f1a753e1401568b8f93263b051
2012-11-21 16:38:50 -08:00
Craig Mautner
6edb6db512
Ignore invalid combination of PowerManager flags.
...
ACQUIRE_CAUSES_WAKEUP is supposed to be ignored if combined with
PARTIAL_WAKE_LOCK. Instead it was being carried out for any values
of the WakeLock level.
This change reverts behavior to closely match
previous releases of the framework by only honoring
ACQUIRE_CAUSES_WAKEUP for screen wake lock levels. The only
difference being that in previous releases ACQUIRE_ could have been
combined with PROXIMITY_SCREEN_OFF_WAKE_LOCK (it never was) and
now such a combination will ignore the ACQUIRE_ flag.
Bug 7532258 fixed.
Change-Id: I46e848d8fd1b57e54c63141bf3d4f353986b5bdf
2012-11-21 13:19:39 -08:00
John Spurlock
e02b31f77b
am 4e3520a8: am ce393d33: am 3f64edec: Merge "Fix IME down caret in keyguard nav bar bug." into jb-mr1.1-dev
...
* commit '4e3520a8d441dd2c1cb446f6f9a28b43d07238c9':
Fix IME down caret in keyguard nav bar bug.
2012-11-21 06:52:40 -08:00
John Spurlock
4e3520a8d4
am ce393d33: am 3f64edec: Merge "Fix IME down caret in keyguard nav bar bug." into jb-mr1.1-dev
...
* commit 'ce393d3356c86309d6e0fa1d624f1163af6eaecb':
Fix IME down caret in keyguard nav bar bug.
2012-11-21 06:49:37 -08:00
John Spurlock
ce393d3356
am 3f64edec: Merge "Fix IME down caret in keyguard nav bar bug." into jb-mr1.1-dev
...
* commit '3f64edec6c6b2e53b42cfd8c6a6765ecee084fc2':
Fix IME down caret in keyguard nav bar bug.
2012-11-21 06:46:54 -08:00
John Spurlock
3f64edec6c
Merge "Fix IME down caret in keyguard nav bar bug." into jb-mr1.1-dev
2012-11-21 06:44:00 -08:00
Daniel Sandler
f46eb3f813
am 69d13491: am 8fef4a82: am 15db00eb: Merge "DEFAULT_VIBRATE must always use the default vibe pattern" into jb-mr1.1-dev
...
* commit '69d13491eaf0d90b2a1740373306a12bc6238bd4':
DEFAULT_VIBRATE must always use the default vibe pattern
2012-11-20 15:55:16 -08:00
Daniel Sandler
69d13491ea
am 8fef4a82: am 15db00eb: Merge "DEFAULT_VIBRATE must always use the default vibe pattern" into jb-mr1.1-dev
...
* commit '8fef4a820ee217f25fbf29234e90d68dff448222':
DEFAULT_VIBRATE must always use the default vibe pattern
2012-11-20 15:53:09 -08:00
Daniel Sandler
8fef4a820e
am 15db00eb: Merge "DEFAULT_VIBRATE must always use the default vibe pattern" into jb-mr1.1-dev
...
* commit '15db00eb94f0a6a1969152f83addd079c4e9b3f2':
DEFAULT_VIBRATE must always use the default vibe pattern
2012-11-20 15:50:22 -08:00
Amith Yamasani
c0a9edb6b7
Merge "Make NTP constants configurable."
2012-11-20 12:30:13 -08:00
Craig Mautner
8dfc82918e
Merge "Do not clear AppWindowToken.allDrawn while animating."
2012-11-20 12:18:02 -08:00
John Spurlock
bc7b6fc2a4
Fix IME down caret in keyguard nav bar bug.
...
The input method manager service now keeps track of whether or not
the ime was shown on the keyguard. This prevents activities behind
the keyguard from incorrectly showing the down-caret in the keyguard.
Bug:7498792
Change-Id: I0de01ec29cb544e902305b0f9d9fb94a73835e7b
2012-11-20 14:06:56 -05:00
Jaewan Kim
c3560b81db
Make NTP constants configurable.
...
Bug: 6943067
Change-Id: I0b0f9076fba99e9c457ef7180b9936c0d2a7d589
2012-11-21 03:49:37 +09:00
Daniel Sandler
4a7a9b963b
DEFAULT_VIBRATE must always use the default vibe pattern
...
The logic here was backwards, causing the (softer) fallback vibe
pattern to be applied if the notification specified a sound
(or DEFAULT_SOUND) and also DEFAULT_VIBRATE. The fallback
vibe should only play if you have *no* vibration set.
Bug: 7588655
Change-Id: Iecdd362729bccedf779b51cc9b90a12014328aff
2012-11-20 12:59:41 -05:00
Satoshi Kataoka
1ee199a4c6
am 9371747e: am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
...
* commit '9371747e752236727be58149a8d04248860c134f':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
2012-11-17 22:01:57 -08:00
Satoshi Kataoka
9371747e75
am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
...
* commit '0e1c092ab0ee0f2f499dba2bc51223e106f51964':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
2012-11-17 21:59:18 -08:00
Satoshi Kataoka
0e1c092ab0
am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
...
* commit '2656abe09895088eca25caafc3e92869217d1447':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
2012-11-17 21:56:09 -08:00
Satoshi Kataoka
2656abe098
Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
2012-11-17 21:53:10 -08:00
Michael Jurka
3a22636222
am 3366a5d5: am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
...
* commit '3366a5d54eccbbe861bcc765653664d80eae5398':
Delete appWidgetId when removing lockscreen widgets
2012-11-16 15:37:08 -08:00
Michael Jurka
3366a5d54e
am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
...
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
Delete appWidgetId when removing lockscreen widgets
2012-11-16 15:34:20 -08:00
Michael Jurka
cf474b1a10
am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
...
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
Delete appWidgetId when removing lockscreen widgets
2012-11-16 15:31:07 -08:00
Michael Jurka
7b0c877959
Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
2012-11-16 15:29:17 -08:00
Craig Mautner
7636dfbc33
Do not clear AppWindowToken.allDrawn while animating.
...
Creating new surfaces for applications clears the allDrawn flag in the
AppWindowToken. If the app windows were animating when this happened
the animation would complete immediately resulting in jank. This fix
defers clearing allDrawn until the animation completes.
Bug 7326635 fixed.
Change-Id: I5abe3b9ecfbefb476de6a6c8acc394373cc11751
2012-11-16 15:24:11 -08:00
Michael Jurka
75b5cfb4a4
Delete appWidgetId when removing lockscreen widgets
...
Bug: 7550012
Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
2012-11-16 15:22:06 -08:00
Robert Greenwalt
60bfacd8ef
Merge "Support for dns domain."
2012-11-16 12:56:56 -08:00
Amith Yamasani
f9f1ca9e96
am 8f97174a: am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev
...
* commit '8f97174a9c9ea637301ffc19bb64369b74e1ab54':
Make sure that the owner user is marked initialized.
2012-11-16 11:37:34 -08:00
Robert Greenwalt
8058f62189
Support for dns domain.
...
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
2012-11-16 11:25:32 -08:00
Amith Yamasani
8f97174a9c
am 4ad8a4bd: am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev
...
* commit '4ad8a4bd89c0a93705864e9beda39065b34545d6':
Make sure that the owner user is marked initialized.
2012-11-16 10:50:29 -08:00
Amith Yamasani
4ad8a4bd89
am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev
...
* commit 'acddb72c58dbab029d1acbaea61755e79ef8b2a4':
Make sure that the owner user is marked initialized.
2012-11-16 10:47:11 -08:00
Amith Yamasani
acddb72c58
Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev
2012-11-16 10:43:48 -08:00
Adam Cohen
de9e974e7c
am a2d25079: am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit 'a2d250791d73396ee1f7c6bc90757defccee4669':
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
2012-11-16 10:42:40 -08:00
Adam Cohen
f5983a9511
am af958dce: am b82ee0c7: am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev
...
* commit 'af958dce341b0046808d544a040445bd2941f6a1':
Pushing state persistence to a background thread
2012-11-16 10:38:19 -08:00
Jeff Sharkey
8e2ffc76a9
am 9634e970: am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
...
* commit '9634e970679c687572e2da84250adc8baf91a8c3':
Useful annotations for code documentation.
2012-11-16 10:37:59 -08:00
Jeff Sharkey
f99ddad6e3
am 91b57293: am 64f369a5: am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev
...
* commit '91b57293233e005ce97c655578c775aaaf95a745':
Avoid runtime restart after vold reconnects.
2012-11-16 10:37:50 -08:00
Jeff Sharkey
0ace4de5c2
am f838eb40: am fa0fb7c5: am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev
...
* commit 'f838eb40e8f53263c10d251ec4ec72f167f82541':
Reduce verbosity of service event logging.
2012-11-16 10:37:42 -08:00
Daniel Sandler
3639beff7a
am 8ff32d81: am 00679b5b: am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev
...
* commit '8ff32d81134cc6a73b9c58e720e8d2ad79a9c119':
Do not vibe when the default notification sound is Silent.
2012-11-16 10:36:23 -08:00
Daniel Sandler
c89da9e28a
am 1812b345: am 2bb5dc6a: am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev
...
* commit '1812b3450389b37bc069061cc69cb20754816f62':
Notification vibration improvements:
2012-11-16 10:36:19 -08:00
Satoshi Kataoka
15451bd7af
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
...
Bug: 7540140
Change-Id: Iaac951ff457c35751b442e84ac07f1f86be93494
2012-11-16 13:30:56 +09:00
Craig Mautner
923584df77
Merge "Fix math errors causing black screen."
2012-11-15 16:30:47 -08:00
Adam Cohen
a2d250791d
am 5a0f5ba2: am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '5a0f5ba269c12889246acbbe546ef75285231430':
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
2012-11-15 15:02:16 -08:00
Adam Cohen
5a0f5ba269
am 6189888a: Merge "Making sure launcher doesn\'t show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
...
* commit '6189888a2565b6362b0dd022850b748f628500d0':
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
2012-11-15 14:59:33 -08:00
Adam Cohen
6189888a25
Merge "Making sure launcher doesn't show keyguard-only widgets (issue 7550090)" into jb-mr1.1-dev
2012-11-15 14:56:19 -08:00
Adam Cohen
3fcc6b26c3
Making sure launcher doesn't show keyguard-only widgets (issue 7550090)
...
Change-Id: I5d0675f0c03677e06371a6730209c3466c6b0f15
2012-11-15 14:53:31 -08:00
Amith Yamasani
bc9625059b
Make sure that the owner user is marked initialized.
...
This is required for upgrades from previous versions of JB.
Bug: 7547639
Change-Id: I21de14a70d6ba2ab21437b5f0721321df45226d2
2012-11-15 14:43:13 -08:00