OSDN Git Service
Jinsuk Kim [Mon, 24 Nov 2014 21:13:58 +0000 (21:13 +0000)]
Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 20:44:48 +0000 (20:44 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Jeff Sharkey [Mon, 24 Nov 2014 20:16:12 +0000 (20:16 +0000)]
Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
Jeff Sharkey [Sun, 23 Nov 2014 00:49:34 +0000 (16:49 -0800)]
Introduce revision codes for split APKs.
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures. However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.
This change introduces "revision codes" which can vary between
split APKs belonging to the same app. An install is valid as long
as the normal version code is identical across all splits. Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.
Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version. Also fix bug to enable inheriting from system apps
when adding splits.
Bug:
18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
Sailesh Nepal [Mon, 24 Nov 2014 19:36:56 +0000 (19:36 +0000)]
Merge "Add system API to get registered connection managers" into lmp-mr1-dev
Jorim Jaggi [Mon, 24 Nov 2014 19:31:28 +0000 (19:31 +0000)]
Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
Jorim Jaggi [Fri, 21 Nov 2014 17:10:32 +0000 (18:10 +0100)]
Fix quick settings on Keyguard
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel
Bug:
18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
Geoff Mendal [Mon, 24 Nov 2014 19:21:09 +0000 (11:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I753b271eb5b97b719fe6d4aa50d21431a961d553
Auto-generated-cl: translation import
Chris Wren [Mon, 24 Nov 2014 19:15:47 +0000 (19:15 +0000)]
Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev
smain@google.com [Mon, 24 Nov 2014 19:11:04 +0000 (19:11 +0000)]
am
75cd7c74: am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
75cd7c74ab38a55914f1658234a0031c907eb3ed':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 19:02:34 +0000 (19:02 +0000)]
am
5f3ba993: am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
5f3ba99376a7d01a4d142f2e34576202870b0a46':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 18:55:57 +0000 (18:55 +0000)]
am
1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '
1b23ee962a1ce0963537810724b2be61c0ab8c57':
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
smain@google.com [Mon, 24 Nov 2014 18:51:02 +0000 (18:51 +0000)]
Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
John Spurlock [Mon, 24 Nov 2014 18:34:55 +0000 (18:34 +0000)]
Merge "QS: Update data usage over limit title." into lmp-mr1-dev
Paul Jensen [Mon, 24 Nov 2014 18:30:34 +0000 (18:30 +0000)]
Merge "Don't bother validating networks that don't satisfy the default request." into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 18:24:23 +0000 (18:24 +0000)]
am
3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
3a013dab155acafab6a80e6b13a82252b69abd9f':
Import translations. DO NOT MERGE
Svet Ganov [Mon, 24 Nov 2014 18:23:34 +0000 (18:23 +0000)]
Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev
Amit Mahajan [Mon, 24 Nov 2014 18:21:54 +0000 (18:21 +0000)]
Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev
John Reck [Mon, 24 Nov 2014 18:19:45 +0000 (18:19 +0000)]
am
2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
* commit '
2b36a86b8ee4e8c0952494dd17b5e96ded22f2ee':
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 18:18:13 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
John Reck [Fri, 14 Nov 2014 00:15:08 +0000 (16:15 -0800)]
Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Bug:
18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit
b35c9602cf5c628c621e4fe102a461505f302bfe)
Dianne Hackborn [Mon, 24 Nov 2014 17:54:03 +0000 (17:54 +0000)]
Merge "Final resource IDs." into lmp-mr1-dev
Dianne Hackborn [Mon, 24 Nov 2014 17:53:48 +0000 (17:53 +0000)]
Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
Jeff Brown [Mon, 24 Nov 2014 17:34:32 +0000 (17:34 +0000)]
am
3d110b23: Make WallpaperService watch the actual display state.
* commit '
3d110b239153a6c7423a99f02ef859201205eee2':
Make WallpaperService watch the actual display state.
John Spurlock [Mon, 24 Nov 2014 17:25:32 +0000 (12:25 -0500)]
QS: Update data usage over limit title.
Bug:
18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
smain@google.com [Mon, 24 Nov 2014 17:25:00 +0000 (09:25 -0800)]
add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
Sreeram Ramachandran [Mon, 24 Nov 2014 17:24:25 +0000 (17:24 +0000)]
Merge "Delete unused/non-working code." into lmp-mr1-dev
Sreeram Ramachandran [Mon, 24 Nov 2014 17:24:03 +0000 (17:24 +0000)]
Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev
Sreeram Ramachandran [Mon, 24 Nov 2014 17:21:15 +0000 (17:21 +0000)]
Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 16:51:30 +0000 (08:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia6e19184b9f8f2ef31f1ea94263fe1090333837e
Auto-generated-cl: translation import
Jorim Jaggi [Mon, 24 Nov 2014 16:26:01 +0000 (16:26 +0000)]
Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:03:54 +0000 (16:03 +0000)]
Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:03:41 +0000 (16:03 +0000)]
Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev
Adrian Roos [Mon, 24 Nov 2014 16:02:09 +0000 (16:02 +0000)]
Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev
Christoph Studer [Mon, 24 Nov 2014 16:00:35 +0000 (16:00 +0000)]
Merge "Fix MediaStyle API comments" into lmp-mr1-dev
Chris Wren [Mon, 24 Nov 2014 15:58:14 +0000 (15:58 +0000)]
Merge "Push back notification means snooze the package." into lmp-mr1-dev
Chris Wren [Fri, 21 Nov 2014 21:25:19 +0000 (16:25 -0500)]
LED should not be blocked by interruption filtering.
Bug:
17204854
Change-Id: Ife30c2ebbcf3fce87ac262dbd339b694d4a57728
Geoff Mendal [Mon, 24 Nov 2014 15:30:47 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 15:13:23 +0000 (07:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 14:21:48 +0000 (06:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
Christoph Studer [Mon, 24 Nov 2014 13:18:06 +0000 (14:18 +0100)]
Fix MediaStyle API comments
Bug:
17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:08:17 +0000 (12:08 +0000)]
Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev
Selim Cinek [Mon, 24 Nov 2014 11:52:36 +0000 (11:52 +0000)]
Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
Jinsuk Kim [Sun, 23 Nov 2014 22:30:54 +0000 (07:30 +0900)]
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
a20023 [Wed, 12 Nov 2014 20:59:39 +0000 (14:59 -0600)]
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
Wink Saville [Sat, 22 Nov 2014 20:19:23 +0000 (20:19 +0000)]
Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
Wink Saville [Sat, 22 Nov 2014 18:08:16 +0000 (10:08 -0800)]
Additional changes to SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
Svet Ganov [Thu, 20 Nov 2014 15:43:30 +0000 (07:43 -0800)]
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
Lajos Molnar [Sat, 22 Nov 2014 05:59:29 +0000 (05:59 +0000)]
Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
Eino-Ville Talvala [Sat, 22 Nov 2014 04:57:47 +0000 (04:57 +0000)]
Merge "Camera: Add new capability flags as system features as well" into lmp-mr1-dev
Jeff Brown [Sat, 22 Nov 2014 03:01:13 +0000 (19:01 -0800)]
Make WallpaperService watch the actual display state.
Bug:
18471411
Change-Id: Ie9d2e70e4e105dfbb2cb4d9726f632bcf2cc0a31
RoboErik [Sat, 22 Nov 2014 02:28:18 +0000 (18:28 -0800)]
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
Dianne Hackborn [Sat, 22 Nov 2014 01:04:53 +0000 (17:04 -0800)]
Final resource IDs.
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
Joe Fernandez [Sat, 22 Nov 2014 00:25:13 +0000 (00:25 +0000)]
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
Scott Rowe [Sat, 22 Nov 2014 00:24:51 +0000 (00:24 +0000)]
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
Sanket Padawe [Fri, 21 Nov 2014 23:33:24 +0000 (23:33 +0000)]
Merge "Make default carrier name string look better." into lmp-mr1-dev
John Reck [Fri, 21 Nov 2014 23:32:05 +0000 (23:32 +0000)]
Merge "It's super critical to call nStart" into lmp-mr1-dev
Dianne Hackborn [Fri, 21 Nov 2014 23:23:13 +0000 (15:23 -0800)]
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
Winson Chung [Fri, 21 Nov 2014 23:15:03 +0000 (23:15 +0000)]
Merge "Reset the task stack instead of the view when Recents is hidden. (Bug.
18436876, Bug.
18394126, Bug.
18432310)" into lmp-mr1-dev
Jeff Sharkey [Fri, 21 Nov 2014 23:14:03 +0000 (23:14 +0000)]
Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev
Craig Mautner [Fri, 21 Nov 2014 22:45:07 +0000 (22:45 +0000)]
Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev
ztenghui [Fri, 21 Nov 2014 22:27:35 +0000 (22:27 +0000)]
Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev
John Reck [Fri, 21 Nov 2014 22:10:10 +0000 (14:10 -0800)]
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
Amith Yamasani [Fri, 21 Nov 2014 22:27:16 +0000 (22:27 +0000)]
Merge "Different messages when wiping user and not device" into lmp-mr1-dev
Jeff Sharkey [Fri, 21 Nov 2014 22:13:27 +0000 (14:13 -0800)]
Avoid NPE in forceStopPackageLocked().
Bug:
18477180
Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
Chris Craik [Fri, 21 Nov 2014 22:11:11 +0000 (22:11 +0000)]
Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
Chris Craik [Fri, 21 Nov 2014 22:05:33 +0000 (22:05 +0000)]
Revert "Add a way to override Xfermode DO NOT MERGE"
Feature no longer needed.
bug:
18448377
This reverts commit
4678dcc5524258908eadc5fe1e5e1874768967eb.
Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
Winson Chung [Thu, 20 Nov 2014 01:09:03 +0000 (17:09 -0800)]
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
Jeff Sharkey [Fri, 21 Nov 2014 21:59:15 +0000 (21:59 +0000)]
Merge "Lightweight checkin output for network stats." into lmp-mr1-dev
Amith Yamasani [Wed, 29 Oct 2014 18:41:31 +0000 (11:41 -0700)]
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
Jeff Brown [Fri, 21 Nov 2014 21:48:46 +0000 (21:48 +0000)]
Merge "resolved conflicts for merge of
694c1d2b to lmp-mr1-dev" into lmp-mr1-dev
Jinsuk Kim [Fri, 21 Nov 2014 21:43:20 +0000 (21:43 +0000)]
Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev
Jeff Brown [Fri, 21 Nov 2014 21:04:42 +0000 (13:04 -0800)]
resolved conflicts for merge of
694c1d2b to lmp-mr1-dev
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
Chris Wren [Thu, 20 Nov 2014 19:46:23 +0000 (14:46 -0500)]
Push back notification means snooze the package.
Bug:
18451923
Change-Id: I90160f9d14cde12a5bc03e46e64eedf770149a90
Yigit Boyar [Fri, 21 Nov 2014 20:48:44 +0000 (20:48 +0000)]
Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev
Joe Fernandez [Fri, 21 Nov 2014 20:37:02 +0000 (20:37 +0000)]
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
Joe Fernandez [Fri, 21 Nov 2014 20:32:03 +0000 (20:32 +0000)]
am
5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
* commit '
5b94d00b896b2bbc71a0c925e92e8c7e08978975':
docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
Joe Fernandez [Fri, 21 Nov 2014 20:23:26 +0000 (12:23 -0800)]
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
ztenghui [Fri, 21 Nov 2014 19:32:29 +0000 (11:32 -0800)]
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
Jinsuk Kim [Fri, 21 Nov 2014 01:43:51 +0000 (10:43 +0900)]
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
Bryce Lee [Fri, 21 Nov 2014 19:18:47 +0000 (19:18 +0000)]
Merge "Make default windows features configurable." into lmp-mr1-dev
Bryce Lee [Fri, 21 Nov 2014 19:08:45 +0000 (11:08 -0800)]
Make default windows features configurable.
Bug:
18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
Sailesh Nepal [Fri, 21 Nov 2014 19:01:40 +0000 (11:01 -0800)]
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
Jim Miller [Fri, 21 Nov 2014 18:37:59 +0000 (18:37 +0000)]
Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
Jeff Sharkey [Wed, 19 Nov 2014 02:22:21 +0000 (18:22 -0800)]
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
Adrian Roos [Fri, 21 Nov 2014 17:56:59 +0000 (17:56 +0000)]
Merge "Explicitly specify user for public mode" into lmp-mr1-dev
Rubin Xu [Fri, 21 Nov 2014 17:50:20 +0000 (17:50 +0000)]
Merge "String literals for CL ag/586597" into lmp-mr1-dev
Scott Rowe [Fri, 21 Nov 2014 17:50:17 +0000 (17:50 +0000)]
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
Ruben Brunk [Fri, 21 Nov 2014 17:42:42 +0000 (17:42 +0000)]
Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
Scott Rowe [Fri, 21 Nov 2014 17:41:06 +0000 (17:41 +0000)]
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
Scott Rowe [Fri, 21 Nov 2014 17:34:27 +0000 (17:34 +0000)]
Merge "docs: b/
17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
Sreeram Ramachandran [Wed, 12 Nov 2014 00:09:21 +0000 (16:09 -0800)]
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
Selim Cinek [Fri, 21 Nov 2014 16:44:34 +0000 (17:44 +0100)]
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
Rubin Xu [Thu, 20 Nov 2014 23:59:51 +0000 (23:59 +0000)]
String literals for CL ag/586597
Mini-CL to get the strings in for translations.
Bug:
17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
Sreeram Ramachandran [Wed, 19 Nov 2014 17:09:43 +0000 (09:09 -0800)]
Delete unused/non-working code.
Change-Id: I2cba9ffdb4ed547cb922d0ac08abf81e49ffa66b
Sreeram Ramachandran [Thu, 13 Nov 2014 06:31:52 +0000 (22:31 -0800)]
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
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:21:03 +0000 (15:21 +0000)]
Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:20:44 +0000 (15:20 +0000)]
Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev
Adrian Roos [Fri, 21 Nov 2014 14:27:12 +0000 (15:27 +0100)]
Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
Fix log spam and wrong log string.
Bug:
18414067
Change-Id: I588ec7b62055d2374d311d3adf9edd500ca40380
Adrian Roos [Fri, 21 Nov 2014 13:54:04 +0000 (13:54 +0000)]
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