24395 Commits

Author SHA1 Message Date
Craig Mautner
ea002666cf am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev automerge: 82da2ee
automerge: 1549346

* commit '1549346a98227c1f41fa4bd99921139f2cf97a14':
  Complete booting when frontmost activity is idle
2015-01-13 22:11:48 +00:00
Craig Mautner
6245afc811 am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev automerge: 0f6da47
automerge: 9d82182

* commit '9d82182f0c97271323d039b51e9179d2f4f2fa74':
  Add debug for ANR
2015-01-13 22:10:25 +00:00
Craig Mautner
1549346a98 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev
automerge: 82da2ee

* commit '82da2ee927a86114f583b2ea8683076069e761e0':
  Complete booting when frontmost activity is idle
2015-01-13 22:05:27 +00:00
Craig Mautner
9d82182f0c am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev
automerge: 0f6da47

* commit '0f6da477cbf3232996770a17910d3e44a0b893ac':
  Add debug for ANR
2015-01-13 22:03:04 +00:00
Craig Mautner
82da2ee927 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev
* commit 'ef04ae79af58cc86c4312fac18c8a4eb24fc73ae':
  Complete booting when frontmost activity is idle
2015-01-13 21:34:32 +00:00
Craig Mautner
0f6da477cb am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev
* commit '31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2':
  Add debug for ANR
2015-01-13 21:34:27 +00:00
Craig Mautner
ef04ae79af Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 2015-01-13 21:28:37 +00:00
Craig Mautner
bcb6eb9e26 Add debug for ANR
Help for bug 17721767.

Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
2015-01-13 13:24:17 -08:00
Greg Hackmann
fcb3be7aaa am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80e
automerge: b5af40f

* commit 'b5af40f040f7c227604f129bcf79784c349c2ad5':
  Find wall clock RTC through sysfs
2015-01-13 21:12:46 +00:00
Wink Saville
494601e39a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
automerge: 9482799

* commit '948279954ac88ecfd0678713158175702d981c73':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 21:09:10 +00:00
Greg Hackmann
b5af40f040 am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80e
* commit '96f7ac84b51c3ceb913e78275e99e2f4f79ebe86':
  Find wall clock RTC through sysfs
2015-01-13 20:53:06 +00:00
Prashant Malani
5c090ad791 am 0142097a: am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev automerge: 4212bf1
* commit '0142097a0335b7839cf807c6e520b474811caa11':
  Improve the circularMask for round displays
2015-01-13 20:30:41 +00:00
Olawale Ogunwale
be37df395e am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished"
automerge: 0f8ecc8

* commit '0f8ecc84c8b86054bfd3275f942c3a705df01fbb':
  [ActivityManager] Distinguish FG or BG receiver finished
2015-01-13 20:19:57 +00:00
Olawale Ogunwale
01e2fda02d am cacf5564: am e3f85985: Merge "bindService can\'t start up service process"
automerge: d362d19

* commit 'd362d1936434148f332ab8c6c9c92c38aac0dac8':
  bindService can't start up service process
2015-01-13 20:17:58 +00:00
Greg Hackmann
0eb5826830 Find wall clock RTC through sysfs
Devices may have multiple RTCs.  By default the kernel uses rtc0 to
store the system time, but devices may override this (or even specify
that none of them should be used for system time).

Userspace can indirectly find the designated RTC through sysfs.  During
AlarmManagerService initialization, enumerate through all rtc class
devices to locate the device with attribute hctosys=1.

This is only done on devices without /dev/alarm, which has its own
in-kernel mechanism to pick the RTC.

Change-Id: Ife2b342c3590133ed316ddaf1799cbc1bfa6e6d9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-01-13 12:16:56 -08:00
Olawale Ogunwale
7dfe83d396 am a9ae5050: am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage."
automerge: d07b9ea

* commit 'd07b9ea63dc37eaaf28bdf91b2edae62e2b35ee1':
  [ActivityManager] Fix process record leakage.
2015-01-13 20:16:40 +00:00
Craig Mautner
f3ea23ad9b Complete booting when frontmost activity is idle
The boot process is intended to complete when the frontmost activity
becomes idle. This change fixes a corner case where the system was
booting and the Home activity became idle when it was not at the
front causing the system to never complete booting.

Before ag/603303 a secondary stack was created for the TaskPersister
at the beginning of activity manager systemReady(). Following that
change the secondary stack was created for the first time when a task
was restored from system ui recents when getTaskThumbnail() was
called. At the time it was created it was also moved to the front of
the stack order.

If that stack creation happens to occur after the Home activity is
started but before the Home activity becomes idle then the new stack
will obscure the Home activity and the boot process does not
complete.

1. This change adds a test for an idle activity coming to the front
when a stack is moving to the front and we haven't completed booting
yet. If this situation is detected the boot sequence is then
completed.

2. This change fixes the stack ordering so that creating a new task
when restoring recents does not automatically move the stack to the
front.

Fixes bug 18949470.

Change-Id: I243f0bb4396b518a0a8835c0c7bdccb2581a3520
2015-01-13 11:27:30 -08:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:15:58 +00:00
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:09:48 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener.
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
2015-01-13 08:36:24 -08:00
Prashant Malani
0142097a03 am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev
automerge: 4212bf1

* commit '4212bf1fad7ab15b10926b30038aae380697aaa3':
  Improve the circularMask for round displays
2015-01-12 18:42:48 +00:00
Prashant Malani
4212bf1fad am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev
* commit 'b71f9f96f7f464267c59a80add495388338ced04':
  Improve the circularMask for round displays
2015-01-12 18:40:56 +00:00
Prashant Malani
b71f9f96f7 Merge "Improve the circularMask for round displays" into lmp-mr1-dev 2015-01-12 18:34:46 +00:00
Olawale Ogunwale
0f8ecc84c8 am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished"
* commit '9d293911221cac930eb8edfef01362ea083eeaab':
  [ActivityManager] Distinguish FG or BG receiver finished
2015-01-12 16:44:28 +00:00
Olawale Ogunwale
d362d19364 am cacf5564: am e3f85985: Merge "bindService can\'t start up service process"
* commit 'cacf55647f64076f840f37537a5edb979fe2c3ab':
  bindService can't start up service process
2015-01-12 16:44:22 +00:00
Olawale Ogunwale
d07b9ea63d am a9ae5050: am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage."
* commit 'a9ae505053585b6c46a6a86475959fd9fe501b09':
  [ActivityManager] Fix process record leakage.
2015-01-12 16:44:12 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Olawale Ogunwale
e3f8598547 Merge "bindService can't start up service process" 2015-01-12 13:44:35 +00:00
Olawale Ogunwale
8ddd5f4cd6 Merge "[ActivityManager] Fix process record leakage." 2015-01-12 13:44:17 +00:00
Jinsuk Kim
740df4845d am c7325cd3: am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev automerge: 258b941
* commit 'c7325cd3576f7e2bc25b4c49c53d5bc5e5af9938':
  CEC: Keep Playback device awake while it is the active source
2015-01-10 22:12:56 +00:00
Jinsuk Kim
c7325cd357 am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev
automerge: 258b941

* commit '258b9418905de33f1b6f8461d79c8e39be7a50a5':
  CEC: Keep Playback device awake while it is the active source
2015-01-10 22:07:03 +00:00
Jinsuk Kim
258b941890 am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev
* commit 'f94d5d26f2d122cbb41327d8e34d8655514f9b0c':
  CEC: Keep Playback device awake while it is the active source
2015-01-10 22:04:27 +00:00
Jinsuk Kim
f94d5d26f2 Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 2015-01-10 21:59:40 +00:00
Paul Jensen
7c9512cb2d am 2a41b761: am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev automerge: 63e2b8e
* commit '2a41b761866f12f67fdf50efb76dd72e403ff1c2':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
2015-01-10 02:15:17 +00:00
Paul Jensen
2a41b76186 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
automerge: 63e2b8e

* commit '63e2b8e058f379582d0325aa84b5de6bfa73e15b':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
2015-01-10 02:08:59 +00:00
Paul Jensen
63e2b8e058 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '60944390cde10c44064f1eda67eae5d76598f0d8':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
2015-01-10 02:06:06 +00:00
Paul Jensen
60944390cd Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 2015-01-10 01:59:45 +00:00
Paul McLean
96798efe99 Merge "Support for simultaneous USB Audio Devices connect/disconnect" 2015-01-09 23:12:37 +00:00
Paul McLean
0a8f06922f Support for simultaneous USB Audio Devices connect/disconnect
Attach/Detach logic
Decoupling card# and list index
Modern loop constructs
Consistent logging flags
Add class/type flags to device "address" string.
Factored UsbAudioDevice out of UsbAudioManager.

Bug: 18399845
Bug: 18717784

Change-Id: I6f185e1c24091d4c0d21eb7e922a1496748d32c3
2015-01-09 14:56:43 -08:00
Dianne Hackborn
1ed82edf1d am 2abf1f1c: Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e automerge: a319aa8
* commit '2abf1f1c212574ea7073584406ee86898f5d3779':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:21:25 +00:00
Dianne Hackborn
2abf1f1c21 Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e
automerge: a319aa8

* commit 'a319aa800df36d40e1de453b64fd1e14573e6d80':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:13:58 +00:00
Dianne Hackborn
a319aa800d Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
automerge: 54f9b1e

* commit '54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:11:44 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Prashant Malani
ea481beda6 Improve the circularMask for round displays
The mask was earlier drawn as a thin ring at the display periphery.
This had undesirable effects when screenshots were taken, as the ring
was seen, as well as display content beyond it.

This patch modifies the mask to be a black canvas with portions erased
to improve the screenshot image.

Bug: 18772987
Change-Id: I25ef6387879613354308e015446fe325ed8c4515
2015-01-09 11:07:03 -08:00
Ariel Gertzenstein
d82f9988a9 am 4a207e3e: Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2 automerge: b32831e
* commit '4a207e3e52044839b035c2a0af9c240d31692422':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
2015-01-09 18:11:50 +00:00
Ariel Gertzenstein
4a207e3e52 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev automerge: cce8db2
automerge: b32831e

* commit 'b32831eebfd3c3ba2b26da18fef6818c12643f9d':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
2015-01-09 18:03:03 +00:00
Ariel Gertzenstein
b32831eebf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev
automerge: cce8db2

* commit 'cce8db2c31a03d0c4e04f5851415d37032ae6621':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
2015-01-09 17:59:15 +00:00
Ariel Gertzenstein
cce8db2c31 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev 2015-01-09 17:56:11 +00:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
2015-01-09 09:54:06 -08:00
Ariel Gertzenstein
2999acb0ce Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
This reverts commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db.

Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991
2015-01-09 17:45:40 +00:00