157869 Commits

Author SHA1 Message Date
Winson Chung
71113e43e7 Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 2014-11-21 23:15:04 +00:00
Jeff Sharkey
1740062728 Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 2014-11-21 23:14:04 +00:00
Craig Mautner
0a398d7bb4 Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev 2014-11-21 22:45:08 +00:00
ztenghui
cb721bf674 Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev 2014-11-21 22:27:37 +00:00
John Reck
72d6e4facb It's super critical to call nStart
Bug: 18204974

Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set

Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished

Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
2014-11-21 14:27:21 -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
Jeff Sharkey
27f36f4267 Avoid NPE in forceStopPackageLocked().
Bug: 18477180
Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
2014-11-21 14:17:17 -08:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE"
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
2014-11-21 22:05:33 +00:00
Winson Chung
bc571a9807 Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
This will remove the need for having all the null checks in TaskStackView.
We also remove the check when launching tasks (the fail case is worse
when the activity fails to load).  And the CL also fix the header focus
animation, and an issue with tasks not getting laid out when the stack is
set again.

Change-Id: I9b4cd50d76f72ba3d16dd1b8e2d9bbf9f1f24d2b
2014-11-21 14:00:17 -08:00
Jeff Sharkey
c0491a2e2d Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 2014-11-21 21:59: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
682ed6b608 Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 2014-11-21 21:48:47 +00:00
Jinsuk Kim
2dafe6664a Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 2014-11-21 21:43:23 +00: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
Jeff Davidson
11008a78b8 Don't enforce control permission when preparing consented VPN.
If a VPN app requests to be prepared and has already obtained user
consent, there is no need to additionally enforce the control
permission. We only need to enforce the control permission when a VPN
is first being prepared, where such a preparation would bypass user
consent.

Also ensure that in this case, the VPN being prepared matches the
calling app. Otherwise an app could prepare another pre-consented VPN,
which is not particularly dangerous but is likely unexpected.

Finally, remove misleading comment in ConnectivityService#prepareVpn.
This method IS called from VpnService.prepare(), not only from
system-privileged apps.

Bug: 18442887
Change-Id: Ic3227c6c1c74312697f0576d3811b06692a4edff
2014-11-21 12:56:29 -08:00
Chris Wren
a6d4fb60ed Push back notification means snooze the package.
Bug: 18451923
Change-Id: I90160f9d14cde12a5bc03e46e64eedf770149a90
2014-11-21 15:51:41 -05:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Joe Fernandez
fbdfdef43d am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '9034ead0ba8ce1d0c8c162d9516ca188b783d407':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
2014-11-21 20:37:02 +00:00
Joe Fernandez
9034ead0ba am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '5b94d00b896b2bbc71a0c925e92e8c7e08978975':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
2014-11-21 20:32:03 +00:00
Joe Fernandez
5b94d00b89 docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
- Chinese pages are showing Japanese (not good)
- Chinese resource page is not rendering because of bad video links

Change-Id: Ia4508c2db85b9cbd5bdad34ae8bedc411df98360
2014-11-21 20:27:13 +00:00
ztenghui
996f22f4df Supporrt tapas build for vector tests
Such that UX team has less pain on building the VD / AVD assets.
This also requires removing internal API dependence in the test.

To build the VectorDrawableTest with prebuilt SDK.
<root dir>/tapas VectorDrawableTest
<root dir>/make -j64 showcommand
Then later for incremental build.
<root dir>/mmm ./frameworks/base/tests/VectorDrawableTest/ -j20

b/18260896

Change-Id: Id559074df78d7c2a5c529c545834da23986bc15f
2014-11-21 19:40:34 +00:00
Jinsuk Kim
4d1189e283 CEC: Enable log for non-user builds
This helps get better bugreports for dogfooding. Accompanying bug
will be kept track of to ensure the log is turned off before
shipping. See ag/175890 for reference.

Bug: 18471978
Change-Id: Ic67d64526fee3c52fee6c7f1e0201ead4ae6a3e7
2014-11-22 04:25:20 +09:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable.
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
2014-11-21 11:08:45 -08:00
Sailesh Nepal
7a4e3871e7 Add system API to get registered connection managers
This API is used to check if we're in the simplified
version of the call assistant settings UI or the version
that displays a full list.

Bug: 18473946
Change-Id: I7dca50ada80b2203bd8d646bb510418646382df8
2014-11-21 11:01:40 -08:00
Jim Miller
0284e5e498 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 2014-11-21 18:38:03 +00:00
Jeff Sharkey
55a442e582 Lightweight checkin output for network stats.
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
2014-11-21 10:11:10 -08:00
Adrian Roos
26750711e1 Merge "Explicitly specify user for public mode" into lmp-mr1-dev 2014-11-21 17:57:01 +00:00
Rubin Xu
b90a2f9d1a Merge "String literals for CL ag/586597" into lmp-mr1-dev 2014-11-21 17:50:23 +00:00
Scott Rowe
63108ee362 am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '02cb1fe6c4a12c15ef44c2982fcab71ba6346c9b':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-21 17:50:17 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Scott Rowe
02cb1fe6c4 am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
* commit '14f78ed7b8c374017fa37f29cfed2208a072ea28':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-21 17:41:06 +00:00
Scott Rowe
14f78ed7b8 Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs 2014-11-21 17:34:29 +00:00
Sreeram Ramachandran
c2c0beab79 Allow VPNs to specify their underlying networks.
These are used when responding to getActiveNetworkInfo() (and cousins)
when an app is subject to the VPN.

Bug: 17460017
Change-Id: Ief7a840c760777a41d3358aa6b8e4cdd99c29f24
2014-11-21 09:26:18 -08:00
Selim Cinek
9c4a707912 Fixed several time related states for secondary users
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.

Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
2014-11-21 18:25:30 +01:00
Rubin Xu
7f9e014b00 String literals for CL ag/586597
Mini-CL to get the strings in for translations.

Bug: 17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
2014-11-21 17:04:11 +00:00
Sreeram Ramachandran
75f018e6a7 Delete unused/non-working code.
Change-Id: I2cba9ffdb4ed547cb922d0ac08abf81e49ffa66b
2014-11-21 08:08:19 -08:00
Sreeram Ramachandran
21b5ee3f0e Eliminate race conditions in UID-based network filtering.
The previous code retrieved information from the legacy tracker multiple
times for each user query, leading to race conditions where the info
could've changed between the calls.

Refactors the handling of legacy data types in ConnectivityService and
unifies call paths so that APIs that deal with legacy data types
(NetworkInfo and int/networkType) and newer types (such as Network) go
through common code paths, using NetworkState to hold all the necessary
data pieces. This enables follow-on bug fixes to getActiveNetworkInfo().

The changes are limited to public "query" APIs (those that retrieve some
network information or the other). More details about the specific
changes and their rationale can be found in the code review thread.

Bug: 17460017
Change-Id: I656ee7eddf2b8cace5627036452bb5748043406c
2014-11-21 08:07:13 -08:00
Zoltan Szatmary-Ban
08229e817e Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 2014-11-21 15:21:07 +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
7e2e40e127 Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
Fix log spam and wrong log string.

Bug: 18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380
2014-11-21 15:27:12 +01:00
Adrian Roos
c5db390f5b Revert "Only keep user switcher bitmaps if needed"
This reverts commit cba0faadbe1c8cf7c6b264b761d747f7381a2f93 
with change id I416beb82156787e61ee1f59b6726fd702f135f68.

It keeps the fix preventing us from reclipping already loaded
bitmaps.

Bug: 18350670
Change-Id: I0562d38d2a6eb0b715adcd4ca77512f2cbedd320
2014-11-21 13:59:42 +00:00
Adrian Roos
31b844ba0c Explicitly specify user for public mode
Bug: 18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
2014-11-21 13:55:09 +01:00
Paul Jensen
0653f508b5 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev 2014-11-21 12:42:34 +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
Geoffrey Borggaard
e548c3a378 am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev
automerge: 90ed95f

* commit '90ed95faeddf7ebe71320e3e0e80eb17d374e49c':
  Fix null handling in proxies.
2014-11-21 10:17:39 +00:00
Ricardo Cervera
462b32011a am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class.
automerge: 8837ce2

* commit '8837ce2ce3b8e10a5201a18b77a790d0df43d8e4':
  docs: Fixes to the Data Layer Wear class.
2014-11-21 10:16:35 +00:00
Ricardo Cervera
9aede602ff am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev
automerge: 161dce4

* commit '161dce465ef528568eac119235e635b217322485':
  docs: Fixes to the Data Layer Wear class.
2014-11-21 10:15:17 +00: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