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

22753 Commits

Author SHA1 Message Date
Jinsuk Kim
62bb43dbec am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 
* commit '122e704a017b51ffd3da0721059d04f00c726ce8':
  CEC: Avoid setting op in disabled mode
 2014-12-08 19:37:44 +00:00
Jeff Davidson
0efd29fc57 am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit '386effc7a160e330420f7746f41d46c12f64579d':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-08 19:36:39 +00:00
Jeremy Joslin
d4753450f3 am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
  Don't send the same PendingIntent more than once.
 2014-12-08 19:36:27 +00:00
Paul Jensen
446a59bc26 am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit 'a4afe13af38c03ae6abb76d2cf36ae0672328fd8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-08 19:36:08 +00:00
RoboErik
b22eea724b am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7':
  Route mute key events through MediaSessionService
 2014-12-08 19:34:32 +00:00
Wale Ogunwale
30b74ccf69 am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev 
* commit '80d119121f62bf995ff856f6865a977eb8c03239':
  Don't destroy surfaces of activities launched behind early.
 2014-12-08 19:34:01 +00:00
Filip Gruszczynski
73f0e9a3fe am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 
* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
  Fix calculation of overscan insets in WindowState.
 2014-12-08 19:33:55 +00:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-08 19:33:49 +00:00
Christopher Tate
a2a5d4d043 am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 
* commit '41b0cbb3a6e6e51ae75a971c3c6b6e36950a2bf5':
  Correctly parse previous PMBA state during backup
 2014-12-08 19:17:00 +00:00
Christopher Tate
bd2d8202e3 am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 
* commit 'a42d95f1bc89dbbb4d34c62dac20ba3d9541603a':
  Tune delivery and batching of alarms
 2014-12-08 19:16:54 +00:00
Pavel Zhamaitsiak
913c989546 am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit 'd89f0d3d54dec1662b1cfed6c8e574ffcc8032d9':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-08 19:16:43 +00:00
Fyodor Kupolov
d483a85e69 am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev 
* commit 'fed2812dc9fd717a7e3b1ebf9c602eda2bdfca08':
  Added isRemovingAdmin method
 2014-12-08 19:16:12 +00:00
Amith Yamasani
81b27f4c9f am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev 
* commit 'b2905092d6779349834635c6343556017c0c998e':
  Potential fix for accidental deactivation of profile owner
 2014-12-08 19:15:50 +00:00
Benjamin Franz
f4a76651b0 am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.
 2014-12-08 19:14:56 +00:00
Dongwon Kang
6077acaf14 am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev 
* commit 'bfc9739b1c1d57f388a8be62e99f3592f08ad9b3':
  TIF: handle a race condition when a session is crashed
 2014-12-08 19:14:20 +00:00
Filip Gruszczynski
5ae61a811a am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev 
* commit 'f5d1cf0b194147fae0aca2c2352b4843627ffc1e':
  Private Window flag to disable touch events in WallpaperService.
 2014-12-08 19:13:39 +00:00
Dianne Hackborn
34e7003a78 am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev 
* commit '3cb6496b6c8bb48d458c46e7a062228f0488307d':
  Fix issue #18593636: Turn on "kill important processes that...
 2014-12-08 19:12:47 +00:00
Svetoslav
f477aeb367 am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched. 
* commit 'ed068f7c3047b3775647a6023c6960a4fc535144':
  Ensure all events from a showing window are dispatched.
 2014-12-08 19:12:22 +00:00
Jinsuk Kim
3f771d879c am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev 
* commit 'd1133ba8855199b34c22b369f34c987a14c68b85':
  CEC: Introduce the retry for commands on the new device discovery.
 2014-12-08 19:11:58 +00:00
Jinsuk Kim
122e704a01 am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 
* commit '4da553880930355cfbec1978657c9037f21a6edf':
  CEC: Avoid setting op in disabled mode
 2014-12-06 10:27:00 +00:00
Jinsuk Kim
4da5538809 Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 2014-12-06 10:19:57 +00:00
Jeff Davidson
386effc7a1 am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit 'f779e6b8ac827d923e3e7905045ad5c35512c535':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-06 02:10:49 +00:00
Jeremy Joslin
c4b2ec1a3a am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit '1edc73aa5dc24db39ec685f1950c5110699e301e':
  Don't send the same PendingIntent more than once.
 2014-12-06 02:10:33 +00:00
Jeff Davidson
f779e6b8ac Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 2014-12-06 02:06:50 +00:00
Jeremy Joslin
1edc73aa5d Merge "Don't send the same PendingIntent more than once." into lmp-mr1-dev 2014-12-06 02:05:22 +00:00
Paul Jensen
a4afe13af3 am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit '891dd5743af17e3376b0b0438b149c565cf871c8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-06 01:31:32 +00:00
Paul Jensen
891dd5743a Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 2014-12-06 01:23:56 +00:00
Jeff Davidson
f9fff92d70 Fix flipped captive portal bit in network conditions bcast. 
Bug: 18651036
Change-Id: I191fcafab1fc5ba65be06359da1edc7ca5aabc6a
 2014-12-05 16:56:08 -08:00
RoboErik
2d7a1b09e9 am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit 'd386d0f391c41e3e6e87abab44600df24f45ac4a':
  Route mute key events through MediaSessionService
 2014-12-05 23:23:59 +00:00
RoboErik
d386d0f391 Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 2014-12-05 23:16:41 +00:00
Wale Ogunwale
80d119121f am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev 
* commit 'b503e3f2872636b450d950b5792fdb569d87819c':
  Don't destroy surfaces of activities launched behind early.
 2014-12-05 23:01:11 +00:00
Filip Gruszczynski
91a5dd9b43 am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 
* commit 'e6a2ff2b1f7a2241350347fd0f12ffccc1391649':
  Fix calculation of overscan insets in WindowState.
 2014-12-05 23:01:06 +00:00
Dianne Hackborn
e52a2ea03b am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit '0029f0ac36c28b60d59d3d70d148ba3136971b95':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-05 23:01:01 +00:00
Jeremy Joslin
7929484dbf Don't send the same PendingIntent more than once. 
Fixing a bug where a NetworkRequest's PendingIntent can be sent more
than once when networks are rematched before the intent completes.

Added a small delay before removing the request to give the receiving
client an opportunity to put in its own request. The delay value is
configurable via Settings.Secure.

Bug: 18614074
Change-Id: Iac7c5e5a04f42f2b6794e9e22349cc631bebeab7
 2014-12-05 14:58:04 -08:00
Wale Ogunwale
b503e3f287 Merge "Don't destroy surfaces of activities launched behind early." into lmp-mr1-dev 2014-12-05 22:56:13 +00:00
Filip Gruszczynski
e6a2ff2b1f Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 2014-12-05 22:56:00 +00:00
Dianne Hackborn
0029f0ac36 Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 2014-12-05 22:54:08 +00:00
Wale Ogunwale
ec533f6a55 Don't destroy surfaces of activities launched behind early. 
When the launch activity behind feature was introduced in
http://ag/502868, we destroy the surfaces of windows associated with
the activity early in the last app window animation step. The causes
issues with activities that might be using the surface and not
prepared to have the surface destroyed from underneath them. We now
let the surface destruction get handled like any other window so all
the components/processes interested in the surface can be in the
right state when the surface is destroyed.

Bug: 18325222
Change-Id: I45e834a07a199b8a9e364f7392db99c871a43280
 2014-12-05 14:52:04 -08:00
Dianne Hackborn
1e01d16982 Fix issue #17323751: Additional items in aggregated battery stats 
- Now aggregate number of times each process has crashed and ANRed.
- Now aggregate total number of connectivity changes.
- Now record connectivity changes in the history.

Crash and ANR counts are new entries at the end of "pr" in checkin.

Connectivity change counts is a new entry at the end of "m" in checkin.

Connectivity changes in the history checkin are Ecn and include the
type of connection and its state.

Change-Id: I0c01186446034cf6c3fb97d45f5e3b5c69a0438a
 2014-12-05 13:54:24 -08:00
Wale Ogunwale
af3361bb26 am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev 
* commit '9a3f6ac63c9c11008b6dbb99d5213b3d3f51fca0':
  Add support from restoring recent's backup.
 2014-12-05 21:41:03 +00:00
Craig Mautner
004540260c am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 
* commit '1d8b27bceddcd2ff26bc0f2b8d7a5f7a54604b06':
  [ActivityManager] Fix NPE when start activity
 2014-12-05 21:40:21 +00:00
Filip Gruszczynski
ff778fe450 Fix calculation of overscan insets in WindowState. 
Bug: 18630625
Change-Id: I19b0c8627c3b9d61923e68c59fce9bddb2751c3d
 2014-12-05 13:31:43 -08:00
RoboErik
7c82ced4fc Route mute key events through MediaSessionService 
This sends mute keys to the MediaSessionService and handles them
by toggling the appropriate stream. Muting remote playback is still
not supported.

bug:17501993
Change-Id: I18c5b037cde2175acbb64b118dd708514acfd8c9
 2014-12-05 12:41:34 -08:00
Svetoslav
323c02d4e0 am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev 
* commit '8d9a06feee0d5311e40adbccb0d2205a531def85':
  Notify accessibility for window changes after an app animation end.
 2014-12-05 20:19:24 +00:00
Paul Jensen
704c8c0c3b am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit '461e73677d208e4e97356cbc781ce490b90e2027':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2014-12-05 20:18:45 +00:00
Christopher Tate
41b0cbb3a6 am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 
* commit '2aa909f0ab017e17d8397f18b8c2c6dc0ec150a4':
  Correctly parse previous PMBA state during backup
 2014-12-05 20:11:31 +00:00
Christopher Tate
a42d95f1bc am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 
* commit '8ec2dc00e5225256976ee6f07a715932f65c8833':
  Tune delivery and batching of alarms
 2014-12-05 20:11:26 +00:00
Christopher Tate
2aa909f0ab Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev 2014-12-05 20:05:10 +00:00
Christopher Tate
8ec2dc00e5 Merge "Tune delivery and batching of alarms" into lmp-mr1-dev 2014-12-05 20:04:25 +00:00
Pavel Zhamaitsiak
d89f0d3d54 am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev 
* commit 'b81ce34af33ce940846e71878279f9482037cb39':
  Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
 2014-12-05 19:44:53 +00:00