7582 Commits

Author SHA1 Message Date
Andreas Gampe
1b4e56ac36 resolved conflicts for merge of 1d67698b to master
Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b
2015-03-13 00:17:40 -07:00
Olawale Ogunwale
ce389e00cf am 2f952916: am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"
* commit '2f9529168974fb6ca3a70372fd802e845e015bfd':
  Wait for visible wallpaper drawn before starting app transitions
2015-03-13 07:09:55 +00:00
Andreas Gampe
db64454b33 resolved conflicts for merge of b6b9fe21 to master
Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9
2015-03-13 00:04:10 -07:00
John Spurlock
63b9e8200e Merge "Volume policy updates." 2015-03-13 00:59:34 +00:00
Wenchao Tong
f5ea340aab NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
2015-03-12 17:43:41 -07:00
Wale Ogunwale
d58617b4f5 Merge "Protect against NPE for ActivityRecords without a stack." 2015-03-12 22:31:05 +00:00
Wale Ogunwale
ab48bc164f Merge "Revert "Revert "Remove activity and window stacks when last task is removed.""" 2015-03-12 22:30:49 +00:00
Wale Ogunwale
7d701174f4 Protect against NPE for ActivityRecords without a stack.
A previous change allowed us to remove stack that no longer contained
any task. This was causing some NPE when an ActivityRecord.Token or
some other cached ActivityRecord later gets converted back to an
ActivityRecord and we try to access its stack.

Bug: 19552874
Change-Id: Ie9454bbce56591b337f97af40f8c00b8597becdf
2015-03-12 15:03:22 -07:00
Olawale Ogunwale
1d67698bb4 am 53729e29: Merge "Wait for opening apps ready before stopping freezing display"
* commit '53729e2933540307b090e64ee89cbae26c67de8f':
  Wait for opening apps ready before stopping freezing display
2015-03-12 21:38:41 +00:00
Olawale Ogunwale
2f95291689 am 1b4933d1: Merge "Wait for visible wallpaper drawn before starting app transitions"
* commit '1b4933d10eea59b091f263ebb3723f4d59a85d2b':
  Wait for visible wallpaper drawn before starting app transitions
2015-03-12 21:38:30 +00:00
Prashant Malani
737298b93e am 276d1bc9: am a98c21a6: Make circular mask thickness configurable
* commit '276d1bc929485e53ba4d4e93d4cc3ded3fcc2fc3':
  Make circular mask thickness configurable
2015-03-12 20:31:52 +00:00
John Spurlock
a48d779dad Volume policy updates.
- Make volume policy settable by the volume UI instead
   of hardcoded in AudioService.
 - Add status bar icon for silent mode.
 - Limit unmute-on-volume-adjust behavior to tvs.
 - Ensure all changes to device volume are sent through
   setIndex so no change events are missed.

Bug: 19260237
Change-Id: Iea070a7a6f90ff620e39629f2da3f33f87223d72
2015-03-12 13:57:08 -04:00
Olawale Ogunwale
53729e2933 Merge "Wait for opening apps ready before stopping freezing display" 2015-03-12 16:51:19 +00:00
Olawale Ogunwale
1b4933d10e Merge "Wait for visible wallpaper drawn before starting app transitions" 2015-03-12 16:22:07 +00:00
John Spurlock
9087433753 AudioService: Write base stream volume changes to the event log.
- Add a new volume_changed event, reported at the stream level.
 - Only include changes to base streams (no aliases).
 - Include the caller for each change.  A caller is either:
   -  a pkg name (for external calls or known media sessions)
   -  a system server class's log tag (for internal calls,
      disambiguates "android")

Bug: 19599935
Change-Id: Ia61b68ff1e7e2907a24972790ec052bfe099e665
2015-03-12 09:54:10 -04:00
Lorenzo Colitti
4a61eaf784 am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"
* commit '1c24b3f110e0521a3840c3dfce9a86343fa02672':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/
2015-03-12 08:00:53 +00:00
Lorenzo Colitti
7b5be4c0c7 Fix build, broken by https://android-review.googlesource.com/#/c/115890/
Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5
2015-03-12 16:48:12 +09:00
Lorenzo Colitti
b6b9fe216d am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."
* commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8':
  Remove dead code, mostly DataStateTracker.
2015-03-12 07:38:50 +00:00
Lorenzo Colitti
2f196e6c81 Merge "Remove dead code, mostly DataStateTracker." 2015-03-12 07:27:27 +00:00
Jim Miller
216ce5d7b2 Merge "Add rename support to FingerprintManager" 2015-03-12 01:20:05 +00:00
Jim Miller
99d6019bea Add rename support to FingerprintManager
Bug 19592835

Change-Id: I656b3932caf2cfdb9a330522d171a59af2c7a2d1
2015-03-11 18:17:55 -07:00
Andreas Gampe
26c95085b3 am cdd3fb5c: Merge "Extracted a separate class to run dexopt on packages"
* commit 'cdd3fb5cdb9be8ae087c6d0fef2a545fca1c4205':
  Extracted a separate class to run dexopt on packages
2015-03-11 23:23:06 +00:00
Fyodor Kupolov
7487657ee9 Extracted a separate class to run dexopt on packages
performDexOptLibsLI and related methods were extracted to PackageDexOptimizer
class. Minor refactoring of PackageManagerService.

This is a non-functional change. It should simplify further work to allow
storing OAT files inside package dir.

(cherry picked from commit eeea67b8c3678d882d3774edc41242c63daa60fa)

Change-Id: I3494a2da70605362bb6fb4625ffbee1cbe1cd457
2015-03-11 16:03:41 -07:00
Craig Mautner
9c1353ee6c am 20553036: am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task"
* commit '20553036af92a6369b3e53f54a1f4f0ccaf8e981':
  [ActivityManager] Fix index OOB when resetting removed task
2015-03-11 23:02:44 +00:00
Jeff Brown
6c7b41adf9 Rename Looper::isIdling() to isPolling() to resolve confusion.
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Added a real isIdle() function.

Bug: 19532373
Change-Id: Idd273e8774f469ccafb00d560818cf279dfd6ba6
2015-03-11 15:00:34 -07:00
Wale Ogunwale
04f4d6bb88 Revert "Revert "Remove activity and window stacks when last task is removed.""
This reverts commit 7a7bf5ea48b12f044c591fb03ed3e58acd28ceb7.
2015-03-11 14:56:02 -07:00
Chet Haase
31f2b619fb Merge "Fix artifacts in clip reveal animations" 2015-03-11 20:57:31 +00:00
Mike Lockwood
57baee2e12 Merge "MidiManager: Add MIDI device status notifications" 2015-03-11 19:43:49 +00:00
Mark Renouf
c12569110d resolved conflicts for merge of 91239a0b to master
Change-Id: Ib30f0631278602f0363181021f1ad364e4ec2f8d
2015-03-11 14:52:47 -04:00
Prashant Malani
276d1bc929 am a98c21a6: Make circular mask thickness configurable
* commit 'a98c21a662040a8afa75a35bd882c292f7ed8414':
  Make circular mask thickness configurable
2015-03-11 17:24:54 +00:00
Mike Lockwood
5ff9e2a171 MidiManager: Add MIDI device status notifications
MidiManager clients can be notified of device status changes via a new MidiDeviceStatus object.
MidiDeviceStatus contains the busy status of the device's input ports and number of
connections to the output ports.
MidiDeviceService now has an optional callback for receiving notifications when its ports change as well.

Change-Id: I1600df4464d82724bc026c27b9633ae9c412d3f0
2015-03-11 10:19:45 -07:00
Paul Jensen
7fad4eb4b5 Remove dead code, mostly DataStateTracker.
Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
2015-03-11 10:03:58 -04:00
Craig Mautner
20553036af am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task"
* commit '686947801e7c35eb60bf25385f46e45db66bee69':
  [ActivityManager] Fix index OOB when resetting removed task
2015-03-11 13:59:04 +00:00
Craig Mautner
686947801e Merge "[ActivityManager] Fix index OOB when resetting removed task" 2015-03-11 13:46:38 +00:00
Alan Treadway
38bcb8c9ab Merge "Fix for managed-profile users needing to "install" packages twice." 2015-03-11 09:42:54 +00:00
riddle_hsu
1d7919a7eb [ActivityManager] Fix index OOB when resetting removed task
Assume task T has an activity X lives in process P.
When P is died and before death recipient being called,
start activity with flag RESET_TASK_IF_NEEDED to bring the
existed task T.

Then scheduleResumeActivity IPC will fail and trigger start
a new process that removes task T.

That results resetTaskIfNeededLocked cannot find the task
when continuing the start flow.

Detail:
https://code.google.com/p/android/issues/detail?id=159558

Change-Id: Icc400c7a6c481a3f78657e9fb83cf0c3a17dde68
2015-03-11 17:09:50 +08:00
tiger_huang
4a7f8b99f8 Wait for visible wallpaper drawn before starting app transitions
If the opening app has wallpaper, when the closing app starts hiding,
the wallpaper would be revealed. It would be nice if we play the app
transitions while opening apps, closing apps, and visible wallpapers
are all drawn.

https://code.google.com/p/android/issues/detail?id=150811

Change-Id: I3c7d140f6f6e43e18119e48f9cab441ee96b17e5
2015-03-11 16:38:27 +08:00
Guang Zhu
11cce7989b Fix build
Change-Id: I530793e9090d780a5cb2581ee185badc51e14902
2015-03-10 19:15:23 -07:00
Prashant Malani
a98c21a662 Make circular mask thickness configurable
Obtain the circular mask thickness as a dimension so that it can
be customized per-device.

Change-Id: Ied88f91424c5cf4f25dd1e78cf22f0fd7ea7b0a4
Signed-off-by: Prashant Malani <pmalani@google.com>
2015-03-11 00:34:15 +00:00
Wale Ogunwale
de01b03a85 Merge "Converted some AMS log points to use ActivityManagerDebugConfig." 2015-03-11 00:31:33 +00:00
Andreas Gampe
8ccfe899a7 Merge "resolved conflicts for merge of b6d6c04a to master" 2015-03-11 00:19:27 +00:00
Adrian Roos
bd5e03b6d9 Merge "Notify TrustAgentService when device policy configuration no longer applies" 2015-03-11 00:12:56 +00:00
Wale Ogunwale
e23149f155 Converted some AMS log points to use ActivityManagerDebugConfig.
Change-Id: I0563bafd29ae0bbe596ed8c06fcc573b5ead50b7
2015-03-10 16:55:35 -07:00
Paul McLean
5f035052b6 Merge "Handle simultaneous connect of devices with the same "type" (as in USB)" 2015-03-10 22:48:34 +00:00
Andreas Gampe
2c1078fbbd resolved conflicts for merge of b6d6c04a to master
Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
2015-03-10 15:45:36 -07:00
Wale Ogunwale
e5afd8293d Merge "Revert "Remove activity and window stacks when last task is removed."" 2015-03-10 22:36:41 +00:00
Wale Ogunwale
7a7bf5ea48 Revert "Remove activity and window stacks when last task is removed."
This reverts commit 0f95e3f0753508344b198c0a76afb892df514f52.

Bug: 19644506
Bug: 19083170
Change-Id: I2eb2a0400be58fe2c5d48a4b68368725e98aaf6f
2015-03-10 15:05:01 -07:00
Paul McLean
394a8e1fa7 Handle simultaneous connect of devices with the same "type" (as in USB)
Change-Id: I163bf8e33ccf5aacc7ba21775916727430327f18
Bug: 19563570
2015-03-10 14:55:30 -07:00
John Spurlock
0b4db747d3 Merge "ZenLog: Track changes to effect suppressorship." 2015-03-10 20:11:12 +00:00
Robin Lee
5ca9616733 Merge "Move more file handling into LockSettingsStorage" 2015-03-10 18:30:26 +00:00