OSDN Git Service
Andre Eisenbach [Wed, 29 Oct 2014 17:24:03 +0000 (17:24 +0000)]
Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev
Andre Eisenbach [Wed, 29 Oct 2014 00:03:18 +0000 (17:03 -0700)]
Fix exception in AudioService when no BT Headset is connected.
If AudioManager.startBluetoothSco() is invoked with no Bluetooth Headset
connected, a NullPointerException will ensue.
Added check to make sure mBluetoothHeadsetDevice is set before accessing
it.
Bug:
17601845
Change-Id: Ia00bfffbea5484230b11a74787fe3309c18f824d
Geoff Mendal [Wed, 29 Oct 2014 16:19:45 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Calin Juravle [Wed, 29 Oct 2014 15:48:11 +0000 (15:48 +0000)]
Merge "Use native brige only if we have a private data directory." into lmp-mr1-dev
Calin Juravle [Wed, 29 Oct 2014 15:47:53 +0000 (15:47 +0000)]
Merge "PreInitializeNativeBridge only if its Available" into lmp-mr1-dev
John Spurlock [Wed, 29 Oct 2014 15:40:55 +0000 (15:40 +0000)]
Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-dev
Jason Monk [Wed, 29 Oct 2014 15:38:57 +0000 (15:38 +0000)]
Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev
Geoff Mendal [Wed, 29 Oct 2014 15:37:57 +0000 (08:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I63c0b33a09334fbb50cd62d6eccb43edee751e45
Auto-generated-cl: translation import
John Spurlock [Wed, 29 Oct 2014 15:13:01 +0000 (11:13 -0400)]
PowerUI: Suppress warning on incremental drops.
If the user explicitly dismisses the warning notification,
don't update the notification until the next threshold value.
Bug:
17691122
Change-Id: I840f33f787f1dd6f217de543a291bc9f65b1b046
Kenny Guy [Wed, 29 Oct 2014 15:05:01 +0000 (15:05 +0000)]
Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev
Jason Monk [Wed, 29 Oct 2014 15:03:41 +0000 (11:03 -0400)]
QS: Only hide grid if there is detail to show
If the animation ends at the 'same' time as handleShowDetail is
running it is possible for the grid content to get cleared by the
animation callback just after it is shown in handleShowDetail.
This checks mDetailRecord to avoid that chance.
Bug:
18009138
Change-Id: Ia2951f44b5a1470321bf6580daf33917bbcb1ffd
Chris Wren [Wed, 29 Oct 2014 14:54:16 +0000 (14:54 +0000)]
Merge "Reveal notification listener settings APIs." into lmp-mr1-dev
John Reck [Wed, 29 Oct 2014 14:40:01 +0000 (14:40 +0000)]
Merge "Be more conservative about current buffer" into lmp-mr1-dev
Jorim Jaggi [Wed, 29 Oct 2014 13:28:08 +0000 (13:28 +0000)]
Merge "Improve doze transitions" into lmp-mr1-dev
Geoff Mendal [Wed, 29 Oct 2014 13:24:18 +0000 (13:24 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Jorim Jaggi [Tue, 28 Oct 2014 10:42:58 +0000 (11:42 +0100)]
Improve doze transitions
This change animates the status bar and the bottom area when exiting
doze mode from touch. We also prevent all animations when exiting
from other means, i.e. usually when the power button is pressed, so
we don't have a distracting animation there. In addition, this also
optimizes the scrim animations a bit in terms of interpolation and
duration to make the experience smoother and cleans up some logic.
Bug:
18146441
Bug:
17717584
Change-Id: I495ce480c25de24b6433adebdfe923b637d98f66
Jorim Jaggi [Wed, 29 Oct 2014 13:22:23 +0000 (13:22 +0000)]
Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev
Calin Juravle [Tue, 28 Oct 2014 12:16:21 +0000 (12:16 +0000)]
Use native brige only if we have a private data directory.
Bug:
18027433
(cherry picked from commit
6a4d2369e5493cea86817634eceb0be46ba7d7a6)
Change-Id: I08b4e7172cd66c9006c26f07e3399848999cd74d
Calin Juravle [Fri, 24 Oct 2014 15:16:49 +0000 (16:16 +0100)]
PreInitializeNativeBridge only if its Available
Also, assert that we always have a private application directory for non
system_server case.
Bug:
18027433
(cherry picked from commit
79ec4c15ab941419d21700a9734f5238b975c31a)
Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
Jorim Jaggi [Mon, 27 Oct 2014 15:53:18 +0000 (16:53 +0100)]
Tune spacing in navigation bar for small and big devices
Bug:
18032228
Change-Id: Ia187fa3c108b93f4ca74e109d3fa76e625b711e3
Geoff Mendal [Wed, 29 Oct 2014 13:14:09 +0000 (06:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ae72e34f8e819d5c8e8b3f5c96cd737d680bde0
Auto-generated-cl: translation import
Jorim Jaggi [Tue, 28 Oct 2014 18:04:20 +0000 (19:04 +0100)]
Cancel ripple animations when window is hidden
Bug:
17737340
Change-Id: I0acb4bb20365634875489269bc84ade5161ea3ac
Calin Juravle [Wed, 29 Oct 2014 11:19:22 +0000 (11:19 +0000)]
Merge "Fix the length of a profiler system property" into lmp-mr1-dev
Wei Jin [Wed, 27 Aug 2014 00:16:08 +0000 (17:16 -0700)]
Fix the length of a profiler system property
This patch changes the profiler system property
"dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth"
so that the length of the option is less than PROP_NAME_MAX.
Bug:
17294224
(cherry picked from commit
4d033e1c44c1b94ea5311713b8cc8bfb56bdcdd2)
Change-Id: I10dd0b3bfa46b836def437a3822f6c48538167dd
Erik Kline [Mon, 20 Oct 2014 10:46:56 +0000 (19:46 +0900)]
Treat optimistic addresses as global preferred.
If the kernel sends notification of an optimistic address then
treat is a useable address (isGlobalPreferred()).
Note that addresses flagged as IFA_F_OPTIMISTIC are
simultaneously flagged as IFA_F_TENTATIVE (when the tentative
state has cleared either DAD has succeeded or failed, and both
flags are cleared regardless).
Additionally: do not consider RFC 4193 ULA addresses sufficient
for "global preffered". They are, by definition, of global scope
but not sufficient for global reachability.
Bug:
17769720
Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
Jinsuk Kim [Wed, 29 Oct 2014 06:44:35 +0000 (06:44 +0000)]
Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev
Anthony Lee [Mon, 27 Oct 2014 18:28:40 +0000 (11:28 -0700)]
Added a function to clear accounts for a specified package.
Right now, clearAcounts() only clears the accounts
for the calling package. This new function will allow a class like
PhoneAccoutBroadcastReceiver to clear accounts for any package.
Bug:
17689845
Change-Id: I24db104268535e7e0e33e093e8fab63765df0b08
Lorenzo Colitti [Wed, 29 Oct 2014 03:43:03 +0000 (03:43 +0000)]
Merge "Support more than one clatd at a time." into lmp-mr1-dev
Jinsuk Kim [Tue, 28 Oct 2014 22:02:06 +0000 (07:02 +0900)]
CEC: Use language code "chi" for Traditional Chinese
Android by default returns "zho" for all sorts of Chinese variants.
Use "chi" for traditional one used in Taiwan/Hong Kong/Macau
as required in CEC standard.
Bug:
18149804
Change-Id: I86ac7e2f0f1121641c52032a0d98a6405554457c
Alan Viverette [Wed, 29 Oct 2014 01:10:07 +0000 (01:10 +0000)]
Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev
Alan Viverette [Wed, 29 Oct 2014 00:50:59 +0000 (17:50 -0700)]
Inflate ActionMode items against the ActionBarContextView theme
BUG:
18078900
Change-Id: I300a0268bacf7e1ebcd64eac3d79548e1c4a9606
Shishir Agrawal [Wed, 29 Oct 2014 00:15:50 +0000 (00:15 +0000)]
Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev
Ihab Awad [Tue, 28 Oct 2014 23:48:19 +0000 (23:48 +0000)]
Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev
Ihab Awad [Fri, 24 Oct 2014 18:42:32 +0000 (11:42 -0700)]
PhoneAccounts include literal icon bitmap (1/4)
Change-Id: I9110d983c0ca6610075bd24975f1e90d123ef9c1
Sanket Padawe [Tue, 28 Oct 2014 22:47:08 +0000 (22:47 +0000)]
Merge "Remove checks to support new sim color selection." into lmp-mr1-dev
Alan Viverette [Tue, 28 Oct 2014 22:45:31 +0000 (22:45 +0000)]
Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev
Yorke Lee [Tue, 28 Oct 2014 22:08:50 +0000 (22:08 +0000)]
Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev
Kenny Guy [Tue, 28 Oct 2014 20:45:06 +0000 (20:45 +0000)]
Listen for package changes for all users not just owner.
Listen for package changes for all users to cancel notifications
for secondary users and profiles when an app is uninstalled.
Bug:
18151696
Change-Id: I6921729e2878e1e5890411b173a56849eb2e0745
Yorke Lee [Tue, 28 Oct 2014 21:12:02 +0000 (14:12 -0700)]
Add comment to TelecomManager.getCallState
Explain why READ_PHONE_STATE permission is not required so that
people don't try to add it in the future. Requiring the permission
causes stability crashes with legacy apps and system components
that don't have the permission.
Change-Id: Idf8766aa409d4a2c4ed3d6f81a398f4a0eb24615
Adrian Roos [Tue, 28 Oct 2014 20:27:39 +0000 (20:27 +0000)]
Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev
Sanket Padawe [Tue, 28 Oct 2014 20:06:08 +0000 (13:06 -0700)]
Remove checks to support new sim color selection.
Remove checks to support new sim color selection in multi-sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
John Spurlock [Tue, 28 Oct 2014 20:04:19 +0000 (20:04 +0000)]
Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev
Santos Cordon [Tue, 28 Oct 2014 20:01:00 +0000 (20:01 +0000)]
Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev
Jeff Davidson [Tue, 28 Oct 2014 20:00:31 +0000 (20:00 +0000)]
Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev
Chris Wren [Wed, 22 Oct 2014 18:13:32 +0000 (14:13 -0400)]
Reveal notification listener settings APIs.
Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant
to be the actual value to which the settings app responds.
Bug:
10023397
Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
John Spurlock [Tue, 28 Oct 2014 19:49:25 +0000 (15:49 -0400)]
Zen: Fix quantity format specifiers for quantity=1.
Bug:
16824863
Change-Id: I3c7fc5961cd65b0b8291b7d9aef6110e6dfe85f1
Joe Fernandez [Tue, 28 Oct 2014 19:28:36 +0000 (19:28 +0000)]
am
5c0ed74b: am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
automerge:
56a8cb7
* commit '
56a8cb7fd1eff26da30c4ebcb58eae71b9774b81':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 19:27:37 +0000 (19:27 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
automerge:
b648cab
* commit '
b648cabadfd73bcd3fa8b88db48007f58739300e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:26:43 +0000 (19:26 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
automerge:
77760e7
* commit '
77760e753eb9a6c533eb2b52f228149e49356f64':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:25:57 +0000 (19:25 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
automerge:
eb07af2
* commit '
eb07af2ced7aa438dca941fcde2e3ca0b338a620':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:25:10 +0000 (19:25 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
automerge:
be07f2a
* commit '
be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
docs: Add SearchXonY to Common Intents
Joe Fernandez [Tue, 28 Oct 2014 19:22:45 +0000 (19:22 +0000)]
am
5c0ed74b: am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
5c0ed74b3886c5765c576e9e427b93c76b37635a':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 19:22:40 +0000 (19:22 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
b2d582d995622cc8379603cfadae7ee6d4163b3e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:22:37 +0000 (19:22 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:22:15 +0000 (19:22 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:22:11 +0000 (19:22 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
f4e32145a214b28522d67e748c0eff74aa915bf6':
docs: Add SearchXonY to Common Intents
Jason Monk [Tue, 28 Oct 2014 18:45:33 +0000 (18:45 +0000)]
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 18:27:04 +0000 (18:27 +0000)]
Merge "Add hotspot icon to status bar" into lmp-mr1-dev
Shishir Agrawal [Mon, 27 Oct 2014 19:28:52 +0000 (12:28 -0700)]
Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
The change above deleted these lines by mistake.
Bug:
18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
Joe Fernandez [Tue, 28 Oct 2014 18:15:33 +0000 (18:15 +0000)]
am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 18:15:28 +0000 (18:15 +0000)]
am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
3c00bc01f9c6e82a0859201f74237998b24872da':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 18:15:24 +0000 (18:15 +0000)]
am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
d126294a8f954fb758d3f67bc5271014748ba9e7':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 18:15:20 +0000 (18:15 +0000)]
am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 18:15:17 +0000 (18:15 +0000)]
am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
docs: Add SearchXonY to Common Intents
Jason Monk [Mon, 27 Oct 2014 15:38:47 +0000 (11:38 -0400)]
QS: Bring back BT/Wi-Fi sub-panels
Bluetooth has stayed pretty much the same, just came back.
Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.
Bug:
17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
Adam Lesinski [Tue, 28 Oct 2014 17:41:10 +0000 (17:41 +0000)]
Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 17:08:42 +0000 (17:08 +0000)]
Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
Santos Cordon [Mon, 27 Oct 2014 21:57:49 +0000 (14:57 -0700)]
Update javadocs for Telecom APIs.
Bug:
18142177
Change-Id: I78461f3634d281a6927cec9c555825a1bdab7a24
George Mount [Tue, 28 Oct 2014 17:01:23 +0000 (17:01 +0000)]
Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
George Mount [Tue, 28 Oct 2014 17:00:42 +0000 (17:00 +0000)]
Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 15:21:42 +0000 (11:21 -0400)]
Zen: Show "(until 4:56 PM)" in exit conditions.
Implement two-line exit conditions, display the duration + end
time on separate lines.
Bug:
16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
Adrian Roos [Fri, 24 Oct 2014 16:42:51 +0000 (18:42 +0200)]
Close keyguard user switcher on tap outside
Also closes when tapping the current user.
Also fixes a bug, where the background alpha was
not properly initialized. And while we're at it,
fixes a bug where the user switcher was closable
in simple mode by extending quick settings.
Bug:
17691134
Change-Id: I5444fe42a8a2887ab012ef6cbdcc57ba81a8c1c2
Nicolas Prevot [Tue, 28 Oct 2014 16:33:32 +0000 (16:33 +0000)]
Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
Lorenzo Colitti [Thu, 9 Oct 2014 04:44:48 +0000 (13:44 +0900)]
Support more than one clatd at a time.
1. Make Nat464Xlat a per-network object, one for every network
requiring clat, instead of a ConnectivityService singleton.
2. Make the NetworkManagementService clatd commands take an
interface.
3. When we attempt to start clatd on a network, store its
Nat464Xlat object in the NetworkAgentInfo, so we have an
authoritative way of knowing whether clat is running on a
given network.
4. Rework Nat464Xlat, hopefully simplifying it.
Bug:
12111730
Change-Id: I1fa5508ef020cd1c3d1c7a1f7b06370ac5fc2ae2
Nicolas Prevot [Mon, 1 Sep 2014 11:24:05 +0000 (12:24 +0100)]
Replace minimum with maximum in method description.
BUG:
18152344
Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
Benjamin Franz [Tue, 28 Oct 2014 16:13:03 +0000 (16:13 +0000)]
Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 12:45:56 +0000 (13:45 +0100)]
Fix jank when launching something from lockscreen
Apparently, hideRecents blocks around 300ms so we avoid this as a
low-risk fix. In the longer term, we should investigate why it takes
so long.
Bug:
18133433
Change-Id: I3eae659d4720d3c95280e7f7a144e00f0c760388
Adrian Roos [Tue, 28 Oct 2014 15:23:12 +0000 (15:23 +0000)]
Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
* changes:
Fix NPE in FlashlightController
Fix stale unlock icon
Adrian Roos [Tue, 28 Oct 2014 14:37:37 +0000 (14:37 +0000)]
Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
Craig Mautner [Tue, 28 Oct 2014 13:56:06 +0000 (13:56 +0000)]
Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev
Jason Monk [Mon, 27 Oct 2014 19:28:22 +0000 (15:28 -0400)]
Add hotspot icon to status bar
Bug:
17318034
Change-Id: I291fe6bf7ac8c2faffd37cfda436ef050c1c5ca5
Christoph Studer [Tue, 28 Oct 2014 12:41:32 +0000 (12:41 +0000)]
Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev
Ari Sachter-Zeltzer [Tue, 28 Oct 2014 08:58:21 +0000 (08:58 +0000)]
Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev
Erik Kline [Tue, 28 Oct 2014 07:53:36 +0000 (07:53 +0000)]
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
Lorenzo Colitti [Tue, 28 Oct 2014 07:00:30 +0000 (07:00 +0000)]
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
Lorenzo Colitti [Mon, 20 Oct 2014 02:08:03 +0000 (11:08 +0900)]
Change removeStackedLink to take an interface name.
This simplifies callers.
Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.
Bug:
12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
Erik Kline [Fri, 24 Oct 2014 12:50:20 +0000 (21:50 +0900)]
(re)define the definition of "provisioned"
Specifically:
[1] provide a hasIPv4(), and
[2] a hasIPv6()
each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.
Additionally:
[3] redefine isProvisioned() to return the logical OR
of [1] and [2] above.
Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".
Bug:
17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
Lajos Molnar [Tue, 28 Oct 2014 03:28:17 +0000 (03:28 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev
Joe Fernandez [Tue, 28 Oct 2014 03:25:39 +0000 (03:25 +0000)]
Merge "docs: Update timing of Android Wear app review" into lmp-docs
Joe Fernandez [Tue, 28 Oct 2014 00:39:53 +0000 (17:39 -0700)]
docs: Update timing of Android Wear app review
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
David Friedman [Tue, 28 Oct 2014 02:51:30 +0000 (02:51 +0000)]
Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
David Friedman [Tue, 28 Oct 2014 00:16:44 +0000 (17:16 -0700)]
Updates Notifications screenshot for Android 5.0.
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
Griff Hazen [Tue, 28 Oct 2014 02:23:34 +0000 (02:23 +0000)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
automerge:
732e4ec -s ours
* commit '
732e4ecbee3168c19e49469934f0e1cd3268e001':
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Jason Monk [Tue, 28 Oct 2014 02:21:20 +0000 (02:21 +0000)]
Add missing passive discovery flag automerge:
4444c5b
automerge:
07faf0e
* commit '
07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
Add missing passive discovery flag
Ying Wang [Tue, 28 Oct 2014 02:20:25 +0000 (02:20 +0000)]
Update current.txt with generics to field types. automerge:
79775d4
automerge:
475d739 -s ours
* commit '
475d7393bf0cbb80dd1911df30a6ba0292da09c3':
Update current.txt with generics to field types.
Griff Hazen [Tue, 28 Oct 2014 02:19:22 +0000 (19:19 -0700)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
Yuncheol Heo [Tue, 28 Oct 2014 01:04:06 +0000 (01:04 +0000)]
Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev
Alan Viverette [Tue, 28 Oct 2014 00:57:10 +0000 (00:57 +0000)]
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 00:52:56 +0000 (00:52 +0000)]
Add missing passive discovery flag
automerge:
4444c5b
* commit '
4444c5b27874866f18cd8f4abb8914cc17857ea7':
Add missing passive discovery flag
Alan Viverette [Tue, 28 Oct 2014 00:50:51 +0000 (17:50 -0700)]
Play CLICK sound effect when compound buttons are clicked
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.
BUG:
16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5