157944 Commits

Author SHA1 Message Date
Chris Wren
ce00a234ed LED should not be blocked by interruption filtering.
Bug: 17204854
Change-Id: Ife30c2ebbcf3fce87ac262dbd339b694d4a57728
2014-11-24 10:53:46 -05:00
Geoff Mendal
ae71b0027f Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-24 15:30:49 +00:00
Geoff Mendal
9be80ee53f Import translations. DO NOT MERGE
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
2014-11-24 07:13:23 -08:00
Geoff Mendal
905e20855b Import translations. DO NOT MERGE
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
2014-11-24 06:21:48 -08:00
Christoph Studer
e935fe918e Fix MediaStyle API comments
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
2014-11-24 14:18:06 +01:00
Zoltan Szatmary-Ban
604aec9574 Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev 2014-11-24 12:08:20 +00:00
Selim Cinek
962b06f9a0 Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 2014-11-24 11:52:40 +00:00
Jinsuk Kim
546d867cb8 CEC: Do not issue non-effective <Routing Change>
CEC command <Routing Change> should not be issued if old and new path
are identical since it not only have no effect but also can lead certain
devices to taking unexpected action.

Bug: 18283251
Change-Id: I7a210b7aa20ce4b96ef0d260c4abfc10d4393e63
2014-11-24 11:51:35 +09:00
a20023
bcb78eec88 Set network selection to automatic when in Global mode
Verzion requests that network selection should be set to automatic when 
network mode is global.

Bug: 18372726
Change-Id: I58aae223e15351efc3f58a938630f0aa9600537e
2014-11-24 02:34:08 +00:00
Jeff Davidson
df9ca46979 Fix WifiTile's Connected indicator for ephemeral networks.
Such networks do not have a WifiConfiguration and need to be matched
by SSID.

Note a subtle difference with platform settings: in platform settings,
selecting an ephemeral network saves it for future use. That feels out
of place here, where normally clicking on the connected network does
nothing.

Bug: 18489098
Change-Id: I6aebd14054af47f078ffd8d754668817dff90436
2014-11-23 15:59:55 -08:00
Wink Saville
12c2136e55 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:25 +00: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
Svet Ganov
f6cd14dbc9 Print spooler crash when printing after a rotation.
1. Available printers are provided by a loader driven by the activity
   lifecycle. After a rotation of an app that does not handle rotation
   the print activity is destroyed in a delayed fashion. When another
   print task is started the loader of the destroed activity gets two
   cancellations, one when the activity is stopped and one when it is
   destroyed but when the second cancellation happens the loader has a
   bad state that it is loading while it is not and a NPE occurs.

2. If a rotation happens early before the print activity is fully initialized
   (there are asyncrconous operations that take place) we get a NPE as
   the print preview controller is not created yet.

3. A lockup of the print preview process occurs if the print print
   activity is destroyed after we initiated binding to the rendering
   service but before we receive the remote interface. In this case no
   remote service is received as exepcted since we already unbound from
   it resulting in a missed signal.

bug:18238590

Change-Id: I81817d81702f649ded97dfbab7d7bba28f22fa91
2014-11-22 09:28:38 -08:00
Lajos Molnar
c398f175cd Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev 2014-11-22 05:59:31 +00:00
Eino-Ville Talvala
dfa99f6367 Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev 2014-11-22 04:57:49 +00:00
Jeff Brown
3d110b2391 Make WallpaperService watch the actual display state.
Bug: 18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
2014-11-22 03:25:39 +00:00
RoboErik
a08adb2437 Fix binder equality check
Forgot to call .asBinder() before checking binders for equality. This
fixes a memory leak caused by the system holding on to binders.

bug:18049316
Change-Id: I43a9f4163b28cf1a77e59c3e7bade32bd2ef1c1a
2014-11-21 18:28:18 -08:00
Dianne Hackborn
b2411f77ca Final resource IDs.
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
2014-11-21 17:04:53 -08:00
Joe Fernandez
85f463c5b5 am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit 'fbdfdef43da5d946e8559d47d8bd79db0bceedb1':
  docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
2014-11-22 00:25:13 +00:00
Scott Rowe
a505d0becb am 63108ee3: 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 '63108ee3623cc2b57c3a0a2e730dc9bf5c06c825':
  docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
2014-11-22 00:24:51 +00:00
Chris Craik
b5a5435a77 Improve DisplayList state output
bug:17991451

Log hardware layers and shadow casting

Change-Id: I2ae40f270d18f5b2a5af985513e0f5e8841216c2
2014-11-21 16:23:00 -08:00
Amith Yamasani
da0b168254 Fix parsing bug that affects reading back guest restrictions
Now it remembers guest default restrictions across reboots.

Bug: 18477780
Change-Id: I3a2c0d47825c8fcfc69edf791ddd6329e23ee04b
2014-11-21 15:50:43 -08:00
Sanket Padawe
ab4a940a8a Merge "Make default carrier name string look better." into lmp-mr1-dev 2014-11-21 23:33:26 +00:00
John Reck
418c8549dc Merge "It's super critical to call nStart" into lmp-mr1-dev 2014-11-21 23:32:08 +00:00
Dianne Hackborn
d052a9416a Work on issue #18486438: Reduce size of bugreport output
Reduce how much stuff ProcessStats spews, and do collapsing of
repeated intent filter targets when dumping IntentResolvers.

Also add to pm's checkout output to include shared user ids,
and fix output formatting in a few places.

Change-Id: Ic9fc6731f0439101ba9343535e66cdbbad47e291
2014-11-21 15:23:13 -08:00
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