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

21885 Commits

Author SHA1 Message Date
Mike Lockwood
f9de10252f am 946863b6: Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 
automerge: 61cf7e0

* commit '61cf7e0fe7e79df53ff00a25241041ec99096105':
  Fix USB audio disconnect logic
 2014-11-03 18:45:52 +00:00
Adrian Roos
70fd44fa02 am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 
automerge: 7736d37

* commit '7736d37568980fdcee9c261de8a207977a720bb9':
  Improve TrustManagerService user lifecycle
 2014-11-03 18:41:28 +00:00
Mike Lockwood
946863b63c Merge "Fix USB audio disconnect logic" into lmp-mr1-dev 2014-11-03 18:38:14 +00:00
Adrian Roos
698078a7e9 Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev 2014-11-03 18:33:54 +00:00
Casey Burkhardt
1031eb71cc am 5e2986ef: am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 
automerge: fb80a3b

* commit 'fb80a3b2fd3e8094d2b4f70d375c1a0603d0b047':
  Disable circular display mask with color inversion
 2014-11-03 17:28:59 +00:00
Casey Burkhardt
5e2986ef20 am 2997285f: Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 
* commit '2997285f362349097882d1b31eb23cb867227192':
  Disable circular display mask with color inversion
 2014-11-03 17:22:13 +00:00
Adrian Roos
cbe614ff7d Improve TrustManagerService user lifecycle 
- Only bind agents of running users
- Explicitly clean up state when users are removed
- Delay binding until third-party apps can actually run

Bug: 18102460
Change-Id: I5017adc1634b249068099fc5779ba95904312438
 2014-11-03 18:07:11 +01:00
Casey Burkhardt
2997285f36 Merge "Disable circular display mask with color inversion" into lmp-sprout-dev 2014-11-03 16:55:27 +00:00
Adrian Roos
670edcb535 am 862d72e2: Merge "Improve dump of status bar service" into lmp-mr1-dev 
automerge: 8af07f4

* commit '8af07f4717359c8421bc91c8171fcf749714b08f':
  Improve dump of status bar service
 2014-11-03 15:02:09 +00:00
Adrian Roos
862d72e2f4 Merge "Improve dump of status bar service" into lmp-mr1-dev 2014-11-03 14:56:48 +00:00
Jason Monk
8efeae7eb4 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
automerge: 5c69f5b

* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:42:18 +00:00
Jason Monk
2e647efe01 Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 2014-11-03 14:36:02 +00:00
Jeff Brown
5177979bbd am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e 
automerge: a80162f

* commit 'a80162f0d124e7400e268440c864289a9a7be11e':
  Add a function to boost screen brightness temporarily.
 2014-11-01 15:04:52 +00:00
Jeff Brown
0ed053ef53 am e333e674: Add a function to boost screen brightness temporarily. 
* commit 'e333e674a758c39885d4d9779a1aad387fb0e6aa':
  Add a function to boost screen brightness temporarily.
 2014-11-01 14:10:46 +00:00
Yohei Yukawa
f5051e9b67 am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev 
automerge: b1f5643

* commit 'b1f56430d38f9d6bab0a3512905daaf994ba134b':
  Conditionally allow non-primay profiles to use TextServices
 2014-11-01 02:19:02 +00:00
Jeff Brown
e333e674a7 Add a function to boost screen brightness temporarily. 
When PowerManager.boostScreenBrightness() is called, the screen
brightness is set to maximum for 5 seconds.  This action is
also considered to be user activity.

Bug: 17934954
Change-Id: I1cb4a03a60705c6c1c5cc9ff84b1c5dbd2932fcd
 2014-10-31 18:45:11 -07:00
Yohei Yukawa
22cbf54ca0 Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev 2014-11-01 01:29:26 +00:00
Craig Mautner
8252b827db am a1b9e3d7: Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev 
automerge: ec5f374

* commit 'ec5f374f296791ebb28fb265b15e40b38844f2e7':
  Animate starting windows when keyguard dismissed.
 2014-11-01 00:02:37 +00:00
Craig Mautner
a1b9e3d7ea Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev 2014-10-31 23:55:55 +00:00
Craig Mautner
c0d2d0ad6d Animate starting windows when keyguard dismissed. 
Starting windows are displayed prior to their app windows visibility
being set. Consequently the WindowToken.hidden boolean for starting
windows is still true even when it is shown. The keyguard logic uses
the method WindowState.isVisibleNow to determine whether to animate
each window. This method incorrectly determined that starting windows
were not visible based on WindowToken.hidden and consequently didn't
animate in the starting window.

This change fixes isVisibleNow() to correctly determine when
starting windows are visible and animates them in as part of the
keyguard transition.

This change also adds keyguard debug.

Partially fixes bug 15991916.

Change-Id: Iac3e5f3f33876be5801ec619bbe7a1579e648322
 2014-10-31 16:33:56 -07:00
Tsuwei Chen
ba16fc9d06 am 5ef08182: Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev 
automerge: e939996

* commit 'e939996646bd40284a2d3fdd5a8d539e9f6c5f75':
  Reject SUPL connection when data is disbaled by user. b/18127920
 2014-10-31 23:26:48 +00:00
Dianne Hackborn
58f2a1e8a4 am f34fa3e7: Merge "Improve low on RAM reporting." into lmp-mr1-dev 
automerge: 1816361

* commit '18163616c80aa30f4b7389838d8658812615080c':
  Improve low on RAM reporting.
 2014-10-31 23:23:40 +00:00
Tsuwei Chen
5ef0818281 Merge "Reject SUPL connection when data is disbaled by user. b/18127920" into lmp-mr1-dev 2014-10-31 23:06:01 +00:00
Dianne Hackborn
f34fa3e7aa Merge "Improve low on RAM reporting." into lmp-mr1-dev 2014-10-31 22:44:24 +00:00
Mike Lockwood
3d50308c7f Fix USB audio disconnect logic 
Previously, disconnecting any USB device would terminate USB audio playback.

Also moved USB audio support to a separate class and did some prep work for
multiple USB audio device support.

Bug: 18203024
Change-Id: I49822c2c47428e658c853b2ec83c7313e626a1cb
 2014-10-31 15:28:52 -07:00
Tsuwei Chen
d3ef8e264b Reject SUPL connection when data is disbaled by user. 
b/18127920

Change-Id: I6209d7c48bb7c9a81fd3fd9323275e1f6a38d8db
 2014-10-31 14:58:44 -07:00
Jason Monk
94cfd9d7c4 Move LOCK_TO_APP_EXIT_LOCKED from System to Secure 
To prepare for controlling from settings.

While here, add lock to app settings to backups.

Bug: 16957435
Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
 2014-10-31 14:47:13 -04:00
Dianne Hackborn
6edb5c665d Improve low on RAM reporting. 
- Don't print every little native process.
- Print in different sections, so if one is too long we don't get the
  rest truncated in the log.
- Include other info from meminfo -- ksm and free/used/lost summary.

Change-Id: Iea4ec3860212667e195d2b60b3ded23bfec78436
 2014-10-31 10:35:15 -07:00
Jason Monk
c7587ddefa am a031ae8c: am e6cd9daf: Merge "Download PAC when set after a diff PAC URL" into lmp-mr1-dev 
* commit 'a031ae8c825e154838f599fb072bba021e047f73':
  Download PAC when set after a diff PAC URL
 2014-10-31 14:24:44 +00:00
Jason Monk
e6cd9daff4 Merge "Download PAC when set after a diff PAC URL" into lmp-mr1-dev 2014-10-31 14:15:36 +00:00
Yohei Yukawa
ba910dfadd Merge "Fix not to show a log with empty default ime" into lmp-mr1-dev 2014-10-31 03:09:05 +00:00
Craig Mautner
6a80527f61 am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
  Add enter-animation-done callback for system windows
 2014-10-31 00:29:52 +00:00
Guang Zhu
3ef0189a82 am 3a68e181: am 4ba4e03e: Merge "also add backtraces of CPUs before watchdog kills system server" into lmp-mr1-dev 
* commit '3a68e1811f8d374fec04e75e34a89042ca9d1862':
  also add backtraces of CPUs before watchdog kills system server
 2014-10-31 00:29:22 +00:00
Lorenzo Colitti
58d86a5c2a am 1a9864db: am 2d2a69b2: Merge "Enable 464xlat on wifi." into lmp-mr1-dev 
* commit '1a9864db0af701074d9060f8eef8189e108485be':
  Enable 464xlat on wifi.
 2014-10-31 00:16:14 +00:00
Lorenzo Colitti
fa186dbd3d am f2c90942: am bbb2c5b2: Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 
* commit 'f2c9094293529f42b7183f0373b41a5278581a81':
  Add support for running 464xlat on wifi as well.
 2014-10-31 00:16:09 +00:00
Nicolas Prevot
da0611a759 am ad93adfb: am 9710b04f: Merge "Schedule to write package restrictions." into lmp-mr1-dev 
* commit 'ad93adfb3d4b5470098ec82ea320b9e3669abddb':
  Schedule to write package restrictions.
 2014-10-31 00:15:55 +00:00
Adam Lesinski
5231a1edf4 am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '496611416d4da9fb4a8323dab7d270c0f9be04d7':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:13:47 +00:00
Wale Ogunwale
75b1e8c5c6 am 0319e704: am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 
* commit '0319e704c19deeea7cd8c93a6275ac02e565b473':
  Fix issue 6455374: Bad recent image on camera launch from lockscreen.
 2014-10-31 00:13:36 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
Craig Mautner
159da3dba8 Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev 2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225 Add enter-animation-done callback for system windows 
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.

The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.

Fixes bug 16661752.

Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
 2014-10-30 14:43:18 -07:00
Kenny Guy
a349784180 am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 
automerge: 5cf65f7

* commit '5cf65f7bf6ca0751749bff3f8c89ff9f0a3dc9cb':
  Listen for package changes for all users not just owner.
 2014-10-30 19:18:27 +00:00
Jinsuk Kim
2dfb7397b4 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 
automerge: 44ce605

* commit '44ce60502439d4ae37a5316efaaafbbeede3cda3':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:09:06 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Guang Zhu
0620c451da also add backtraces of CPUs before watchdog kills system server 
Bug: 18003452
Change-Id: I052fe0b2948ea036c3f1b842ea6270b6f11eadef
 2014-10-30 18:25:05 +00:00
Hyejin Kim
5baaaac7c7 Fix not to show a log with empty default ime 
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: I7a0d55bc0da0566a60abb24123c1dbcdd03be9ed
 2014-10-30 17:49:54 +00:00
Lorenzo Colitti
2d2a69b2d3 Merge "Enable 464xlat on wifi." into lmp-mr1-dev 2014-10-30 13:28:03 +00:00
Lorenzo Colitti
bbb2c5b28a Merge "Add support for running 464xlat on wifi as well." into lmp-mr1-dev 2014-10-30 13:27:54 +00:00
Lorenzo Colitti
dc6690867b Enable 464xlat on wifi. 
Bug: 12111730
Change-Id: If6d118a3c6e163262b09cc2fb3e3d3f9a81986ec
 2014-10-30 20:31:27 +09:00
Lorenzo Colitti
e21a26b3ba Add support for running 464xlat on wifi as well. 
1. Add a command to NetworkManagementService to enable/disable
   IPv6 ND offload via netd.
2. Make Nat464Xlat enable offload if clatd successfully comes up
   on a wifi network (which means it detected a NAT64), and
   correspondingly re-enable offload when the clatd interface
   goes down.

This change does not enable clatd on wifi yet, that requires an
extra 2 lines to enable it.

Bug: 12111730
Change-Id: I4318611762a37487c9a84f8c4867ec5aece98be8
 2014-10-30 20:31:26 +09:00