22871 Commits

Author SHA1 Message Date
Wale Ogunwale
9a3f6ac63c am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev
* commit '6b54d38a2c859f1c2cc176d1d9a33837cfc351db':
  Add support from restoring recent's backup.
2014-12-04 22:06:56 +00:00
Wale Ogunwale
6b54d38a2c Merge "Add support from restoring recent's backup." into lmp-mr1-dev 2014-12-04 21:58:51 +00:00
Dianne Hackborn
57a873fcaa Fix issue #18593636: Turn on "kill important processes that...
...have ballooned" for all devices

Actually, this was supposed to be on for all devices, but it was no
longer being run due to changes in the idle maintenance code in L.
So now we run it again.  And moved the idle maintenance window to 3am.

Change-Id: I8e90723e1431b82896d261cf90f8bf84f43b0bf2
2014-12-04 13:58:46 -08:00
Craig Mautner
3f11bba5b9 am afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev
* commit 'afca4dba31f2da85265b97ad50638fc34bad292c':
  bug fix possible NPE while startProcessLocked()
2014-12-04 21:58:29 +00:00
Craig Mautner
b97b19f6a4 am 9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev
* commit '9052862ebb64a0fdccc897d634eab20a1ad6debe':
  [ActivityManager] Invalidate last screenshot when activity relaunched
2014-12-04 21:58:24 +00:00
Craig Mautner
f6d03f3980 am 799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev
* commit '799cb730298591a9d7303ea051451a3b6dc8e51f':
  [ActivityManager] Fix race condition in pss collection
2014-12-04 21:58:18 +00:00
Craig Mautner
a32933fdfe am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev
* commit 'e0dc40c0f232ee2d7c5523f307781ccd3f7cb50b':
  ANR caused by incorrect cleanup in BroadcastQueue.
2014-12-04 21:58:13 +00:00
Craig Mautner
afca4dba31 Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev 2014-12-04 21:55:02 +00:00
Craig Mautner
9052862ebb Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev 2014-12-04 21:53:42 +00:00
Craig Mautner
799cb73029 Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev 2014-12-04 21:52:06 +00:00
Craig Mautner
e0dc40c0f2 Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 2014-12-04 21:50:46 +00:00
Craig Mautner
435496e1ac am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev
* commit 'c2cae50b832753dea612db575c6d97b8d94eceea':
  Reset killedByAm flag at attachApplicationLocked
2014-12-04 21:49:50 +00:00
Craig Mautner
1d8b27bced am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev
* commit '1289a3b2d3ae6ba67215d984c3302bfdcd69ae14':
  [ActivityManager] Fix NPE when start activity
2014-12-04 21:49:44 +00:00
Christoph Studer
51347595a3 am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
  RankingHelper: Remove STOPSHIP
2014-12-04 21:46:32 +00:00
Jinsuk Kim
4921676345 am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
* commit '92a4627250d74264719eff3ade798a9f4480ed5a':
  CEC: Generate hotplug events upon adding listener
2014-12-04 21:46:08 +00:00
Vinit Deshpande
f04e214a6b am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
* commit 'aefb79b2dd13047630ba455d5a3aec8084c1d954':
  Remove notification for SoftAP turned on
2014-12-04 21:46:01 +00:00
Erik Kline
180a30aa57 am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 21:45:33 +00:00
Craig Mautner
c2cae50b83 Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 2014-12-04 21:45:21 +00:00
Cheuksan Wang
29ac679f9f am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
  new SMS/MMS carrier app API
2014-12-04 21:45:08 +00:00
Craig Mautner
1289a3b2d3 Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 2014-12-04 21:44:39 +00:00
louis_chang
1864a509b0 [ActivityManager] Invalidate last screenshot when activity relaunched
Symptom:
The task thumbnail is not updated when activity relaunched.

Reproduce Steps:
1. Put device in portrait
2. Launch Calculator
3. Launch Recent App (the Calculator's screenshot is correct)
4. Rotate device to landscape
5. Click Calculator in Recent App to return to Calculator (Calculator has relaunched to landsacpe ui)
6. Launch Recent App again (the Calculator's screenshot is not updated)

Change-Id: I92e951ea2ee215c52ca6e50cf6f9e02deb787bce
2014-12-04 13:35:02 -08:00
younghwan1.kim
bc0975b3af bug fix possible NPE while startProcessLocked()
In case, process doesn't create well while startingProcessLocked().
There is possibility to make NPE.
Setting app's crash handler needs to be assigned after null check routine.

Change-Id: I67fb6427f72d93f79fed36eb44c47d37eafdac31
2014-12-04 13:32:41 -08:00
louis_chang
71e737c8e8 [ActivityManager] Fix race condition in pss collection
Symptom:
There has a race condition that two threads are accessing
the mPendingPssProcesses simultaneously. One of the thread
is collecting the process pss by looping the mPendingPssProcesses.
The other thread is requesting to collect pss of all processes,
which clears mPendingPssProcesses and adding processes back.

Solution:
Avoid race condition by adding synchornized protection.

Change-Id: Ifb090eda9c4a1b8e3fd980fe0171e9dd77773b46
2014-12-04 13:30:12 -08:00
Kazuki Nakayama
8920e1cabb Reset killedByAm flag at attachApplicationLocked
Cherry picked from aosp.

Fixes bug 18593309.

ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.

Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
2014-12-04 13:28:10 -08:00
Winson Chung
1c88fc009f am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev
* commit '4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8':
  Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
  Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)
2014-12-04 21:18:01 +00:00
louis_chang
cd5d198d7e [ActivityManager] Fix NPE when start activity
Cherry picked from aosp.

Fixes bug 18593457.

Symptom:
NPE occurs in line 1184 (resultStack.sendActivityResultLocked)
because resultStack is null.

Root cause:
When starting activity with FLAG_ACTIVITY_FORWARD_RESULT flag,
the resultRecord could be updated, but the resultStack is not
updated as well. In that case, the resultStack is still be
null. The exception will occurs if the activity is not
granted to launch due to permission denied.

Solution:
Update resultStack when resultRecord updates.

Change-Id: I91634e4f713c2e8dbd1a71f358a8fd9beed83ec7
2014-12-04 13:06:05 -08:00
Wale Ogunwale
18795a2299 Add support from restoring recent's backup.
Bug: 15986349
Change-Id: I899f81d317fcd5277a75db7ba50ecca14112df26
2014-12-04 12:37:53 -08:00
Svetoslav
8d9a06feee am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev
* commit '6e7bf935b4adbfcc75c968f030f770af87bf6dbb':
  Notify accessibility for window changes after an app animation end.
2014-12-04 20:36:52 +00:00
Svetoslav
6e7bf935b4 Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev 2014-12-04 20:29:57 +00:00
Guobin Zhang
53964dac4b ANR caused by incorrect cleanup in BroadcastQueue.
Pulled from aosp.

Fixes bug 18593454.

Two broadcasts could be sent to the same app simultaneously:
one foreground, one background. For example, LOCALE_CHANGED
and PACKAGE_CHANGED are delievered to com.android.vending
at the same time.
1. AMS started new vending process to handle LOCALE_CHANGED.
   And set app.curReceiver = LOCALE_CHANGED.
2. Before LOCALE_CHANGED is handled by vending process,
   PACKAGE_CHANGED was delievered to vending process too.
   AMS set app.curReceiver = PACKAGE_CHANGED. Bad!
3. Vending process finished handling LOCALE_CHANGED.
   AMS clear app.curReceiver = NULL. Bad!
   And Vending process  killed itself without handling
   PACKAGE_CHANGED.
4. AMS known vending process has died, but didn't know that
   BgBroadcastQueue was still waiting for finish message
   for PACKAGE_CHANGED.
At last, BgBroadcastQueue reported ANR for PACKAGE_CHANGED.

This patch adds protection before clearing app.curReceiver,
only set to NULL if the finishing receiver = app.curReceiver
So handleAppDied would know that PACKAGE_CHANGED was not
finished yet, it will abort the broadcast and continue.

Change-Id: Ic4f31b35e21823d4a3c27712391ecbede213a494
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
2014-12-04 12:26:53 -08:00
Dianne Hackborn
11bee890a2 am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev
* commit '4c4e4686d5de3f22cf4d832c63716d9054b9ad54':
  Fix issue #18607384: Run fstrim after every system update
2014-12-04 20:23:11 +00:00
Craig Mautner
8432cee04f am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev
* commit '224904e01a2efb01c6276eb64fba531a3d30a42b':
  Prevent ANR when broadcast receiver is killed
2014-12-04 19:52:21 +00:00
Craig Mautner
b3c60bcb51 am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"
* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
  Prevent ANR when broadcast receiver is killed
2014-12-04 19:51:23 +00:00
Craig Mautner
224904e01a Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 2014-12-04 19:46:20 +00:00
Paul Jensen
461e73677d am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit 'efb81b9e965c4ba782151b6767e7e3df4f2cdfd2':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
2014-12-04 19:33:08 +00:00
Paul Jensen
efb81b9e96 Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 2014-12-04 19:27:52 +00:00
Kenji Sugimoto
d088027ff1 Prevent ANR when broadcast receiver is killed
Cherry-picked from aosp

Fixes bug 18613138.

If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.

As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.

Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.

Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
2014-12-04 11:02:36 -08:00
Christoph Studer
2d58c9220c am 798c0552: Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev
* commit '798c05523bc238853269a24dc526a31f0464a589':
  NoMan: Update effect suppressor on listener remove
2014-12-04 18:14:59 +00:00
Christoph Studer
798c05523b Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev 2014-12-04 18:08:38 +00:00
Chris Wren
f55ad28444 am ffc050ad: Merge "Track active notifications by key, not by reference." into lmp-mr1-dev
* commit 'ffc050ad369c09d740d33f72e66d03f6e2473c49':
  Track active notifications by key, not by reference.
2014-12-04 18:07:41 +00:00
Chris Wren
ffc050ad36 Merge "Track active notifications by key, not by reference." into lmp-mr1-dev 2014-12-04 18:02:54 +00:00
RoboErik
8f0953963d am 7fbcac6a: Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev
* commit '7fbcac6a03db6d09ab3816738754a64f62de22b9':
  Tweak the behavior of the MediaSessionStack
2014-12-04 17:53:42 +00:00
RoboErik
7fbcac6a03 Merge "Tweak the behavior of the MediaSessionStack" into lmp-mr1-dev 2014-12-04 17:46:41 +00:00
Benjamin Franz
e8b98925d0 Change the routing path of bluetooth headset connections.
The HeadsetService is now bound directly by the BluetoothManagerService.
The IBinder object related to the HeadsetService is then given back to
the BluetoothHeadset and to the client app. This change makes the
HeadsetService available for managed profile clients.

Bug: 16968338
Change-Id: I016d1837e4f987c0fab1fc2c64cb06eb91b24d87
2014-12-04 16:57:25 +00:00
Paul Jensen
b10e37fd1c Reap unvalidated networks that have no chance of becoming highest scoring.
These networks are unneeded and waste battery.  We won't bring up these
networks in the first place if they have no chance of becoming highest scoring.
This change handles the case where these networks are already up and
transition to a state where they have no chance of becoming highest scoring.
This happens when another network validates with a score higher than this
network can ever hope to attain.

bug:18489123
Change-Id: I77a96a72e250e25e44e0c50e7a928af8b35bb6ab
2014-12-04 11:22:39 -05:00
Christoph Studer
a6ecb61ee7 am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev
* commit 'c9660bdf289ba7ee20854af9de4133df5fb42d92':
  RankingHelper: Remove STOPSHIP
2014-12-04 15:16:55 +00:00
Jinsuk Kim
92a4627250 am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev
* commit 'f16473951052b1f9eb06753c43b93255452c8838':
  CEC: Generate hotplug events upon adding listener
2014-12-04 15:16:32 +00:00
Vinit Deshpande
aefb79b2dd am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev
* commit '31bd4220855ded4ece67c8ae75227441a12a00a7':
  Remove notification for SoftAP turned on
2014-12-04 15:16:26 +00:00
Erik Kline
95b5ca9019 am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev
* commit '9261d9d64548f0221de50eb99f3675488a4176a4':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.
2014-12-04 15:16:04 +00:00
Cheuksan Wang
dba26aa2e7 am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev
* commit '109ec376da86de1275f73fa432d6344431a457e9':
  new SMS/MMS carrier app API
2014-12-04 15:15:33 +00:00