Commit Graph

4962 Commits

Author SHA1 Message Date
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
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Jeff Sharkey
d6a8c32a6a am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
automerge: 0cb736f

* commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
  Guard against MountService throwing NPE.
2015-01-09 19:24:31 +00:00
Jeff Sharkey
2b46774ff9 Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 2015-01-09 19:14:29 +00:00
Mathieu Chartier
eb896e1feb Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e
automerge: 117ba18

* commit '117ba186d1d28ae7eb6d1187c795e502668fa9b4':
  Call VMRuntime.clampGrowthLimit for small heap apps
2015-01-09 00:28:33 +00:00
Mathieu Chartier
9a6c45eedd Merge "Call VMRuntime.clampGrowthLimit for small heap apps" 2015-01-09 00:17:16 +00:00
Mathieu Chartier
24cee07160 Call VMRuntime.clampGrowthLimit for small heap apps
If the manifest doesn't specify large heaps, we now call
VMRuntime.clampGrowthLimit to release heap virtual address space
which won't ever get used.

Bug: 18387825
Bug: 17131630
Change-Id: I61fdcd70c70234256637eeebefe3abb22b91095d
2015-01-08 14:42:20 -08:00
Jeff Sharkey
9708669b2f Guard against MountService throwing NPE.
Fall through to below logic and return null instead of crashing the
entire app.  We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
2015-01-08 14:00:15 -08:00
Christopher Tate
e04518866e am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
* commit '413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
  Support single-package backup rejection by the transport
2015-01-07 23:30:34 +00:00
Amith Yamasani
442dcb1761 am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"
* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
  NPE in SearchManager.triggerSearch
2015-01-07 00:17:09 +00:00
Amith Yamasani
dcf323adaf Merge "NPE in SearchManager.triggerSearch" 2015-01-07 00:05:11 +00:00
Christopher Tate
b89e1405cf Support single-package backup rejection by the transport
We now cleanly handle the case of the transport blacklisting specific
packages from key/value backup.  Previously we would halt the entire
backup pass and reschedule if the transport returned any error from
performBackup(pkg).  Now, we recognize the TRANSPORT_PACKAGE_REJECTED
result from that invocation, and properly drop that package's work
but proceed with running the rest of the backup queue as expected.

Bug 18694053

Change-Id: Id0dd6d59492bdea9f970540d776f37db0cc5d99c
2015-01-06 15:48:33 -08:00
Alan Viverette
74882cb0e3 am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
* commit 'bf80d2737fc59e8ae04875edddf1534c6a7739bc':
  Don't override dialog icon drawable unless valid resource ID was set
2015-01-05 21:48:58 +00:00
Alan Viverette
5c2d8f7d51 Don't override dialog icon drawable unless valid resource ID was set
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
2015-01-05 12:56:45 -08:00
riddle_hsu
1f5ac4d322 [ActivityManager] Distinguish FG or BG receiver finished
Symptom:
Assume a foreground broadcast FG and a background BG.
If a recevier registers both FG and BG. When sending
BG and FG to the receiver, and the receiver BG receiver
completes first, its finishReceiver will trigger next FG
receiver rather than BG, and also deliver wrong result
code/data to the next.

More detail and sample:
https://code.google.com/p/android/issues/detail?id=92917

Root cause:
Due to BroadcastQueue:getMatchingOrderedReceiver will match
by receiver(IBinder), so the caller ActivityManagerService:
broadcastRecordForReceiverLocked will always match the first
queue(fg) if a receiver is both receiving fg and bg.

Solution:
Add a parameter flags to finishReceiver, then server side
could know the finished receiver should belong to which queue.

Another general solution but with bigger scope:
I60dce4a48e20c1002a61a979e4d78b9b0a8b94a0

Change-Id: I913ca6f101ac8ec6c7a8e42754e6781f80247b7f
2015-01-03 15:38:21 +08:00
Winson Chung
5d40d0b645 am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev
* commit '4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a':
  Bug 18784289: Fix issue with transition animation callback.
2014-12-18 21:53:36 +00:00
Winson Chung
a320b2176c Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 2014-12-18 19:30:40 +00:00
Winson Chung
e494c382c0 Bug 18784289: Fix issue with transition animation callback.
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback.  This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.

Bug: 18784289

Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
2014-12-18 11:27:18 -08:00
Olawale Ogunwale
a230a43204 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object"
automerge: e3b07b4

* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
  [ActivityManager] Use synchronized to protect object
2014-12-17 21:50:31 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Jorim Jaggi
3a70523eb6 am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev
* commit '4a5129c83b92e7ae198f4b9a3018c8cdcba5dd86':
  Fix colored icons in doze mode
2014-12-17 19:10:43 +00:00
Nicolas Prevot
237637e22b am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev
automerge: 47cbcd7

* commit '47cbcd7740739796aef113646861ff7e79439a9c':
  Fix the doc of addCrossProfileIntentFilter.
2014-12-17 19:01:18 +00:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
2014-12-17 19:57:45 +01:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Nicolas Prevot
fc7b444462 Fix the doc of addCrossProfileIntentFilter.
Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
2014-12-17 17:55:08 +00:00
Christoph Studer
f35284804b am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev
* commit '1464dd2f925f4b6179a7ede287f13431e6835aec':
  Notification: Fix bigLargeIcon
2014-12-17 15:23:48 +00:00
Christoph Studer
0b22e395d2 Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 2014-12-17 15:14:03 +00:00
Christopher Tate
a8fe14a211 am 15626d3a: am b32a33ce: Merge "Turn debug flag off"
* commit '15626d3a493b5eb4c1fecb73f8d4fc18547c4c13':
  Turn debug flag off
2014-12-16 20:34:37 +00:00
Christoph Studer
2bd62b53b6 am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
2014-12-16 18:31:53 +00:00
mark_chen
89764e337b [ActivityManager] Use synchronized to protect object
Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object

Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da
2014-12-16 05:44:34 +00:00
Christoph Studer
5c510ee551 Notification: Fix bigLargeIcon
Fix a bug in L where BigPictureStyle.bigLargeIcon never made it
into the notification layout.

Bug: 18735551
Change-Id: Ia72d1de8cca2e95df3a99aaffeaba31325f1d858
2014-12-15 17:00:14 +01:00
Alan Jeon
f0e32ee572 Turn debug flag off
Change-Id: Iced1a24ecfc182eccedd3a749fab9dd32dea41da
Signed-off-by: Alan Jeon <skyisle@gmail.com>
2014-12-13 22:44:53 +09:00
Christoph Studer
fde6f4d745 Fix MediaStyle docs mentioning 2 max actions in compact view
Bug: 18729304
Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225
2014-12-12 13:23:26 +01:00
Paul Jensen
8f58207319 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
  Fix several HTTP proxy issues with multinetworking.
2014-12-11 05:49:18 +00:00
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
Paul Jensen
e0bef71662 Fix several HTTP proxy issues with multinetworking.
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
   not just the default network.
2. When a process is bound to a particular Network, update the proxy
   system properties to those for the bound Network, and keep them
   updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.

bug:17905627
bug:17420465
bug:18144582

(cherry-pick of https://android-review.googlesource.com/#/c/115170)

Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
2014-12-10 15:22:12 -05:00
Dianne Hackborn
9b287368b0 am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev
automerge: 7557ec1

* commit '7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
2014-12-10 19:21:58 +00:00
Dianne Hackborn
80b1c5608e Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
...testCallActivityOnNewIntent test fails with LMP-MR1 Release.

Check for null.

Also fix some small issues with converting intents to/from intents.

Change-Id: Ic391cc57552635935af9a271b2d09353257f6d14
2014-12-09 20:22:08 -08:00
John Spurlock
ef10307e4a am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev
* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e':
  Zen: New behavior for built-in downtime + nextalarm conditions.
2014-12-08 19:43:38 +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
John Spurlock
530052a2fe Zen: New behavior for built-in downtime + nextalarm conditions.
- Downtime: Allow user to enter downtime early, offer as an end
   condition four hours before downtime starts.  Available in
   either none or priority, regardless of settings configuration.
 - Downtime: Always exit before next alarm if zen=none.
 - Downtime: Make more like any other condition provider, remove
   special status (mostly).
 - Downtime: New auto-triggering rules, allow triggering after a
   manual condition ends, once.
 - Decouple NextAlarm + Downtime providers, allow them to offer
   their conditions at the same time.
 - Downtime/NextAlarm: Update conditions if they change while being
   requested, even if unsubscribed.
 - Make all three built-in condition providers optional, via config.
 - New internal helper for runtime config.
 - Don't follow changes to next alarm, consider the condition false.
 - Isolate downtime calendar logic into separate class (for testing).
 - Allow a:bb -> a:bb as a valid downtime range (all day).
 - Volume dialog: configuration establishes maximum number of visible
   conditions, including built-ins.
 - Zen mode panel: avoid widget updates during layout transition.
 - Zen mode panel: move controller callers to background thread.
 - Zen mode panel: hide/show/rebind rows instead of adding/removing.
 - ZenLog: Add downtime autotrigger results.
 - Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
2014-12-08 11:00:57 -05: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
Fyodor Kupolov
22afe6261a Merge "Added isRemovingAdmin method" into lmp-mr1-dev 2014-12-05 19:28:12 +00:00
Fyodor Kupolov
96fb932666 Added isRemovingAdmin method
Added isRemovingAdmin method, so that clients can query if device
admin is currently being removed.

Bug: 17609838
Change-Id: I82547a9eeb228fcf8ac2a6e639ca1a75fa41d161
2014-12-04 17:53:45 -08:00
Wale Ogunwale
6b54d38a2c Merge "Add support from restoring recent's backup." into lmp-mr1-dev 2014-12-04 21:58:51 +00:00
Craig Mautner
93d47b4c05 Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 2014-12-04 21:50:15 +00:00
Christopher Tate
dff5580711 am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev
* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
  Adjust wallpaper-restore acceptance criteria
2014-12-04 21:17:37 +00:00
Wale Ogunwale
18795a2299 Add support from restoring recent's backup.
Bug: 15986349
Change-Id: I899f81d317fcd5277a75db7ba50ecca14112df26
2014-12-04 12:37:53 -08:00
louis_chang
dfa34cd517 Avoid system server crash due to package removed
Cherry-picked from aosp.

Fixes bug 18593178.

Symptom:
When application is not responding, an ANR dialog will shown.
In certain timing, user uninstall the application when the ANR
occurs, but before ANR dialog shown. The system server will crash
when looking up the errorReportReceiver because the package is removed.

Here shows how the exception occurs.
java.lang.IllegalArgumentException: Unknown package: app.package.name
 at com.android.server.pm.Settings.getInstallerPackageNameLPr
 at com.android.server.pm.PackageManagerService.getInstallerPackageName
 at android.app.ApplicationPackageManager.getInstallerPackageName
 at android.app.ApplicationErrorReport.getErrorReportReceiver
 at com.android.server.am.ActivityManagerService.startAppProblemLocked
 at com.android.server.am.ActivityManagerService.makeAppNotRespondingLocked
 at com.android.server.am.ActivityManagerService.appNotResponding

Change-Id: Iced4287bd44dc25b1db2c1e3a583892eb6c041a2
2014-12-03 16:46:23 -08:00