Commit Graph

4752 Commits

Author SHA1 Message Date
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
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
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
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
0b22e395d2 Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 2014-12-17 15:14:03 +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
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
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
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
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
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
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
Christopher Tate
758f45217d Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev 2014-12-03 23:09:34 +00:00
Christopher Tate
31f25696d9 Adjust wallpaper-restore acceptance criteria
Previously the dimension check had implicit orientation sensitivity.
We now make sure to compare the candidate image's width to the smallest
screen dimension for acceptance purposes; this fixes cases when we would
e.g. get a restored image of (1680x2560) but believe that we needed it
to have a max width of 2048, even though it had originated on that same
device -- due to current-orientation issues.

Bug 18448052

Change-Id: I64ca6a4ed91ce1ccc04f5a9a6851e5cfe511b7c7
2014-12-03 13:07:24 -08:00
Winson Chung
de9848c641 Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 2014-12-03 18:10:38 +00:00
Dianne Hackborn
ef44c0514d Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 2014-12-03 18:03:27 +00:00
Dianne Hackborn
7b7c58b384 Work on issue #18572506: AppOps in-memory state is invalid after...
...uninstalling updates to a system app

Things seem to be working fine, however we were not as aggressive at
writing out the current state in this case as we probably should be.

Also introduce more features to the appops command, which are useful
for testing this.

Change-Id: I177a9cc0e16e98b76fee0d052d742e06842bb3f9
2014-12-03 10:01:14 -08:00
George Mount
561261d444 Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 2014-12-03 00:13:28 +00:00
Winson Chung
740c3ac782 Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
Add a listener to listen for changes in the Task stacks to preload thumbnails from the
system.  In addition, reduce the amount of synchronous work done in activity creation
and first measure/layout passes.

Change-Id: I8bd9155d7a05e89c190a20429acff69a17808208
2014-12-02 15:34:20 -08:00
George Mount
92692c0284 Keep snapshot order matching the shared elements.
Bug 18578796

When no snapshot was created, we weren't adding anything to
the snapshot list. When a snapshot is not created, we should
add an null snapshot to the snapshot list to keep them in
order.

Change-Id: I522e485163229230037dcdd635b83cff800df28f
2014-12-02 14:31:31 -08:00
Dianne Hackborn
221b545cda Merge "Fix issue #18510117: Returning from an activity started with..." into lmp-mr1-dev 2014-12-02 19:22:07 +00:00
Dianne Hackborn
a01a0faebf Fix issue #18510117: Returning from an activity started with...
...startActivityForResult causes SecurityExpcetion

The ReferrerIntent hack was becoming visible to apps, which caused
a mismatch between marshalling/unmarshalling of the IPC call.

Change-Id: Ibcb788327b5bae4426efc826551799fa87d1cbaa
2014-12-02 10:33:14 -08:00
Paul Crowley
fbeeac8266 Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev 2014-12-02 14:44:27 +00:00
Paul Crowley
2934b266e5 Add a tag to separate paragraphs in Javadoc
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
2014-12-02 11:21:13 +00:00
Alan Viverette
d26276d9e3 Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked
BUG: 18541882
Change-Id: I2ba4611e08ba08667ef5ee4fb556d1c9075ca6d2
2014-11-26 16:08:58 -08:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data.
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
2014-11-25 20:48:41 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
e935fe918e Fix MediaStyle API comments
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
2014-11-24 14:18:06 +01:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
2014-11-21 13:57:48 -08:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
2014-11-21 21:35:08 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
f8f56bce42 Fix DPM.resetPassword("")
While we're at it, also fix some multi-user issues in
LockPatternUtils.

Bug: 17496766
Change-Id: I8e557ea640fa589817c8f8f818c91463585d5ea7
2014-11-21 13:34:06 +01:00
Filip Gruszczynski
a83c5806de Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev
automerge: 96c5d37

* commit '96c5d37fb5139465cdd3d882b5deba830497557a':
  SwipeDismissLayout makes activity opaque only after entry animation ends.
2014-11-21 10:13:59 +00:00
Christopher Tate
ad064d48ad Merge "Recents backup helper" into lmp-mr1-dev 2014-11-21 02:24:31 +00:00
Jeff Brown
694c1d2b2d Merge "Support keeping activities resumed while dozing." into lmp-sprout-dev 2014-11-21 00:54:05 +00:00
Jeff Brown
fbe96706bb Support keeping activities resumed while dozing.
If the lock screen is not shown, then let activities keep running
while dozing.  This is important to support ambient mode on watches
since it allows the home app to keep running.

To make this possible, we need to inform the activity manager about
the exact wakefulness state, not just the overall boolean
interactive state.

Bug: 18284212
Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
2014-11-20 16:49:18 -08:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
2014-11-20 21:48:38 +01:00