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

10127 Commits

Author SHA1 Message Date
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
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
Craig Mautner
8f0bdb5bb6 Merge "Extract AppTransition from WindowManager" 2012-11-29 11:43:49 -08:00
Zhihai Xu
2c7dac19dd am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit 'e3f7c45241a90d3e4b76d28911831f5dcbaaa038':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-28 12:21:11 -08:00
Zhihai Xu
e3f7c45241 Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 2012-11-28 12:19:42 -08:00
Zhihai Xu
3e1c6f8a10 am ccacaf94: am a6433475: am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit 'ccacaf9434bdd0d89aede6dfa1409a4ab6241063':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:30:06 -08:00
Zhihai Xu
ccacaf9434 am a6433475: am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit 'a64334756858b9fd3bad2c263feea00233699218':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:27:55 -08:00
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
8c6008e7e8 am ae336a08: am 067a7ac4: am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 
* commit 'ae336a08ddc402372e3ba16dfaf50cfb837cf74d':
  Retain configuration change info and sync access.
 2012-11-27 18:43:59 -08:00
Amith Yamasani
f383cdcf3f am 131ff5b8: am 1c2c48cb: am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev 
* commit '131ff5b82134955889277fa38066704298214c87':
  Only wipe device if primary user (for failed password attempts)
 2012-11-27 18:43:46 -08:00
Kenny Root
d5de620c15 am dfb828a1: am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks" 
* commit 'dfb828a19641630f99ee87bc856d96a8cad6ee2e':
  Move NTP updates outside locks
 2012-11-27 18:42:45 -08:00
Dianne Hackborn
816a5d9c27 am 360acd03: am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit '360acd03bfe0d597ee845d2392d715633a89e12b':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 17:34:11 -08:00
Satoshi Kataoka
48d3111ef1 am c86ae7cf: am 1c37b800: am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 
* commit 'c86ae7cf318f6c9d8cf581447e8897fbc1245ef3':
  Hide current soft input when a background user gains window focus.
 2012-11-27 17:34:02 -08:00
Amith Yamasani
7f9ac6461f am 83965c80: am eb933360: am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 
* commit '83965c80a2c7d574a6f2a056383278270ac42dd0':
  Logging to help find the cause of widget crash in clock widget.
 2012-11-27 17:33:54 -08:00
Winson Chung
fb8ca912e8 am d0079891: am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit 'd0079891e3a8034f560eaf88d5be692b61ca4b9a':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 17:33:46 -08:00
Craig Mautner
ae336a08dd am 067a7ac4: am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 
* commit '067a7ac494c8a248840b9a7a46f22a0efff9e52f':
  Retain configuration change info and sync access.
 2012-11-27 16:23:15 -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
131ff5b821 am 1c2c48cb: am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev 
* commit '1c2c48cba61e87f54f4b413b2192963dc71d76e3':
  Only wipe device if primary user (for failed password attempts)
 2012-11-27 15:43:39 -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
Kenny Root
dfb828a196 am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks" 
* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks
 2012-11-27 13:00:01 -08:00
Kenny Root
ae0edeb3e5 am c88047bf: Merge "Move NTP updates outside locks" 
* commit 'c88047bf86fd83e5b0204d26b35776cad97ed877':
  Move NTP updates outside locks
 2012-11-27 12:57:54 -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
360acd03bf am 78551bc7: am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit '78551bc7d5541c86503b32db0e3e2564218bf179':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 11:36:34 -08:00
Satoshi Kataoka
c86ae7cf31 am 1c37b800: am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 
* commit '1c37b8000999c98e8cb5fe76c1f52d204f901783':
  Hide current soft input when a background user gains window focus.
 2012-11-27 11:36:25 -08:00
Amith Yamasani
83965c80a2 am eb933360: am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 
* commit 'eb933360ee4249a453d2df4b77fbab0179abee2e':
  Logging to help find the cause of widget crash in clock widget.
 2012-11-27 11:36:17 -08:00
Winson Chung
d0079891e3 am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit '9f6e8ddf5d48a695b26f1d9759696b56952177bd':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 11:36:13 -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
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -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
164d4bb4c3 Extract AppTransition from WindowManager 
Refactor of WindowManagerService to move app transitions out.

Change-Id: Id3e377526a69f95a3ee4c0d97ca6fd84005beb6a
 2012-11-26 13:51:23 -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