drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,529 Commits 1 Branch 0 Tags
Commit Graph

9412 Commits

Author SHA1 Message Date
Zhihai Xu
a643347568 am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit '5c0f3e5075c8ac8b22bbaeb32bddfada9657577a':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:26:08 -08:00
Zhihai Xu
5c0f3e5075 Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 2012-11-28 11:22:21 -08:00
Craig Mautner
067a7ac494 am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 
* commit '9e98927e2dd3e9498753e6878709b2625e96feea':
  Retain configuration change info and sync access.
 2012-11-27 16:20:34 -08:00
Craig Mautner
9e98927e2d Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 2012-11-27 16:17:45 -08:00
Amith Yamasani
1c2c48cba6 am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev 
* commit 'f426ace9dab65c88b36a047bf921070edcf8cf61':
  Only wipe device if primary user (for failed password attempts)
 2012-11-27 15:40:36 -08:00
Amith Yamasani
f426ace9da Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev 2012-11-27 15:37:40 -08:00
Craig Mautner
e855214249 Retain configuration change info and sync access. 
- If a window was hidden while the configuration changed and then
changed back WindowManagerService would not know that the change
had ever happened and wouldn't notify the window of this. Most
windows wouldn't care but because Keyguard inflates layouts while
it is hidden...

Bug 7094175 fixed?
Bug 7501099 fixed!

Change-Id: If27f5f1d333602dac7719dd39dbdf3fe7954aa06
 2012-11-27 12:47:27 -08:00
Dianne Hackborn
78551bc7d5 am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit 'ba4ac51823c59152e2167365b81ac56857b6b4d0':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 11:31:53 -08:00
Satoshi Kataoka
1c37b80009 am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 
* commit '1af084113713743c70df04702083fff5a5325482':
  Hide current soft input when a background user gains window focus.
 2012-11-27 11:31:26 -08:00
Amith Yamasani
eb933360ee am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 
* commit '7be52cbc33157e4700b7d04e69d1149cd80e9096':
  Logging to help find the cause of widget crash in clock widget.
 2012-11-27 11:31:14 -08:00
Winson Chung
9f6e8ddf5d am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit '2b847c39336024a958742195de4f406e7aa79540':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 11:31:03 -08:00
Dianne Hackborn
ba4ac51823 Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 2012-11-27 11:06:35 -08:00
Dianne Hackborn
8103890a59 Improve debugging for issue #7586414: AlarmManager wakelocks held 
In alarm manager, print a summary of the top 10 alarms by time
being executed.  Keep track of execution time (and wake count) of
each type of alarm for each application so this can be printed in
the summary (and used to compute the top 10 alarms).  Rework how
the alarm summary stats are tracked so that we don't need to hold
on to the full Intent for each stat and can get the Intent information
at the time the alarm is sent rather than waiting for whatever Intent
comes back in the result.

Also in the battery stats: sort the kernel wake locks by time, add
a new section showing all partial wake locks across all applications
sorted by time.

Finally a new LocalLog class that is used by AlarmManager to log
important warning messages, so these can also be later found in
its dumpsys output.

Change-Id: Icc07810053e60fb623a49937e696819cb8352b06
 2012-11-27 11:05:42 -08:00
Satoshi Kataoka
1af0841137 Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 2012-11-26 19:39:20 -08:00
Amith Yamasani
7be52cbc33 Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 2012-11-26 16:22:41 -08:00
Amith Yamasani
791f877473 Logging to help find the cause of widget crash in clock widget. 
This will continue to crash as before, but will show some useful
information in the exception.

Bug: 7450247

Change-Id: Ib3160a5f64154517791d165973c12294ecd09901
 2012-11-26 15:22:31 -08:00
Winson Chung
f7614fc744 Removing unecessary additional lock metadata from QuickSettings user tile. 
Change-Id: I89ec94385eb3cdd46ad6942bf8989fb04d5c0370
 2012-11-26 14:44:03 -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
7f2a989675 Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev 2012-11-26 11:34:40 -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
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
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
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
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
8d03305b57 Hide current soft input when a background user gains window focus. 
Bug: 7507226
Change-Id: If58f68469e21eaaba8536c4b54b3aa8cf8c08eb5
 2012-11-20 11:12:07 +09: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
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
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Amith Yamasani
32f0742e52 Only wipe device if primary user (for failed password attempts) 
When a DeviceAdmin requests a device wipe due to a number of incorrect
password attempts, only primary user can wipe the device. Secondary users
can only remove themselves from the device.

Bug: 7554445
Change-Id: I24331cb4eff37571fcd792abb2efc794f7b3f2d2
 2012-11-16 15:09:13 -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
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
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
Adam Cohen
b82ee0c7bb am b02eb4bb: Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 
* commit 'b02eb4bb7d09a19aedb9dbc08b0f731af05a8579':
  Pushing state persistence to a background thread
 2012-11-15 13:55:45 -08:00
Adam Cohen
b02eb4bb7d Merge "Pushing state persistence to a background thread" into jb-mr1.1-dev 2012-11-15 13:53:53 -08:00
Adam Cohen
a1a2f967e2 Pushing state persistence to a background thread 
Change-Id: If776bc22c48525ba91dc7e4dd0e27de92612f2f5
 2012-11-15 13:44:34 -08:00
Jeff Sharkey
bfea4f04f2 am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev 
* commit 'f5377a7242d71e221807150f0778a0521e1270b6':
  Useful annotations for code documentation.
 2012-11-15 11:53:19 -08:00
Jeff Sharkey
64f369a542 am a319d655: Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 
* commit 'a319d655e336ffb0fcbee65b77926a32660c7f3f':
  Avoid runtime restart after vold reconnects.
 2012-11-15 11:51:33 -08:00
Jeff Sharkey
f5377a7242 Merge "Useful annotations for code documentation." into jb-mr1.1-dev 2012-11-15 11:48:38 -08:00
Jeff Sharkey
fa0fb7c508 am f6ba84b4: Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 
* commit 'f6ba84b4242419f4765e0efcb5df82e37ad03faa':
  Reduce verbosity of service event logging.
 2012-11-15 11:47:40 -08:00
Jeff Sharkey
a319d655e3 Merge "Avoid runtime restart after vold reconnects." into jb-mr1.1-dev 2012-11-15 11:46:19 -08:00
Jeff Sharkey
f6ba84b424 Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev 2012-11-15 11:44:13 -08:00
Daniel Sandler
00679b5b46 am 020d6529: Merge "Do not vibe when the default notification sound is Silent." into jb-mr1.1-dev 
* commit '020d65290a6fe7dc5465d36c259ec62dcfd71c1f':
  Do not vibe when the default notification sound is Silent.
 2012-11-15 06:13:50 -08:00
Daniel Sandler
2bb5dc6a36 am 83b25961: Merge "Notification vibration improvements:" into jb-mr1.1-dev 
* commit '83b2596155ec1845194c08bd27a6e8dfbeb530b9':
  Notification vibration improvements:
 2012-11-15 06:13:46 -08:00