Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,808 Commits 3 Branches 0 Tags
1bf7bca511e3fdbb5e71bb71158d56400538b910
Commit Graph

42369 Commits

Author SHA1 Message Date
Chris Wren
e52d0d68c4 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
automerge: b3239da

* commit 'b3239da9a0c3c75e5aea5e961cd8ed4fc627d42b':
  Reveal notification listener settings APIs.
 2014-10-30 19:17:17 +00:00
Erik Kline
0d74973a08 am befe778c: Treat optimistic addresses as global preferred. 
automerge: 9a8351d

* commit '9a8351d9d7d1e002187fca20fea48d1e9214d829':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:10:04 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Shishir Agrawal
060afd455f am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
automerge: 47fa171

* commit '47fa1715221b50334ca1df1eab148cd50eeef608':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:04:24 +00:00
Alan Viverette
2a4c7618ef am 09da6ec6: am 4bf9edfc: Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 
* commit '09da6ec635fc4565aa7cdac62dccd40fcf73b359':
  Update drag-to-open menu close behavior
 2014-10-30 11:03:35 +00:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Elliott Hughes
64a1a901dc am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit '87ce99ca7243e4556a6cfe9f42cc51531301e979':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-29 17:13:38 +00:00
Chris Wren
402152d673 Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 2014-10-29 14:54:18 +00:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +00:00
Erik Kline
befe778c73 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
 2014-10-29 19:11:58 +09:00
Lorenzo Colitti
def4cd4fa4 Merge "Support more than one clatd at a time." into lmp-mr1-dev 2014-10-29 03:43:04 +00:00
Shishir Agrawal
c8787beca6 Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 2014-10-29 00:15:51 +00:00
Alan Viverette
4bf9edfc1f Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev 2014-10-28 22:45:33 +00:00
Chris Wren
8326a8a945 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
 2014-10-28 15:54:53 -04:00
Shishir Agrawal
1ae88e3420 Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37 
The change above deleted these lines by mistake.

Bug: 18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
 2014-10-28 11:19:14 -07:00
John Spurlock
d856afec47 am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 
automerge: 93e40ba

* commit '93e40ba6c4373402c7c4f430e3e575e4a0cc13eb':
  Zen: Show "(until 4:56 PM)" in exit conditions.
 2014-10-28 18:08:11 +00:00
George Mount
aeb0a9dba2 am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 
automerge: 8a536bb

* commit '8a536bb4e04b8a0e4f074c744321d352d5bf08b2':
  Fix NPE in moveSharedElementsToOverlay
 2014-10-28 18:06:58 +00:00
George Mount
c142397272 am 45b70108: Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 
automerge: 69a3dd8

* commit '69a3dd85df49d5c5ef67d7c28f1473d23ce46980':
  Fixed: Nested shared elements now transition separately.
 2014-10-28 18:06:04 +00:00
Nicolas Prevot
ecdc14dc31 am ebee8a4d: Merge "Replace minimum with maximum in method description." into lmp-mr1-dev 
automerge: e86848c

* commit 'e86848c258a2fc42e52eb1e3234c1288acd96a3b':
  Replace minimum with maximum in method description.
 2014-10-28 18:05:09 +00:00
John Spurlock
ee990413b5 Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev 2014-10-28 17:08:43 +00:00
George Mount
95d520f160 Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev 2014-10-28 17:01:25 +00:00
George Mount
45b701085b Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev 2014-10-28 17:00:43 +00:00
John Spurlock
c90e6fe863 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
 2014-10-28 12:57:43 -04:00
Lorenzo Colitti
954394653d 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
 2014-10-29 01:23:26 +09:00
Nicolas Prevot
555f1986f1 Replace minimum with maximum in method description. 
BUG:18152344

Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
 2014-10-28 16:18:47 +00:00
Erik Kline
e9810e8d53 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev automerge: dd91fb4 
automerge: 8fc600d

* commit '8fc600d1a8fc4f9cedceee185d129a19b06001c5':
  (re)define the definition of "provisioned"
 2014-10-28 08:54:03 +00:00
Lorenzo Colitti
9d6f408ab5 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 
automerge: 35261c4

* commit '35261c4351ea42b2bbd057e852f50158de8eda9c':
  Change removeStackedLink to take an interface name.
 2014-10-28 08:50:41 +00:00
Erik Kline
dd91fb4474 Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev 2014-10-28 07:53:37 +00:00
Lorenzo Colitti
111cc9f511 Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 2014-10-28 07:00:31 +00:00
Lorenzo Colitti
f3cab63ef2 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
 2014-10-28 15:13:57 +09:00
Erik Kline
d3b9fd33c6 (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
 2014-10-28 14:47:42 +09:00
Elliott Hughes
87ce99ca72 am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24." 
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
  Migrate off timeFormat12 and timeFormat24.
 2014-10-28 04:39:24 +00:00
Alan Viverette
52f67ffc5d Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev automerge: e5d27a2 
automerge: 8e448af

* commit '8e448aff2df5f41dc4b329134306fd700f497ca6':
  Play CLICK sound effect when compound buttons are clicked
 2014-10-28 03:39:26 +00:00
Alan Viverette
e5d27a22a6 Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev 2014-10-28 00:57:11 +00:00
Alan Viverette
d4e7790fee 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
 2014-10-27 17:50:51 -07:00
John Reck
c7c8b06940 Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad 
automerge: 49a01fc

* commit '49a01fc7dc8d2b9cc7591a94d19f3c209e470aea':
  Cleanup debug options
 2014-10-28 00:35:14 +00:00
Alan Viverette
7a21011a2d Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev automerge: 3847552 
automerge: 5a01fcd

* commit '5a01fcd194bea9cf001709f32247ad851cd5a0dc':
  Fix min/max date range in DatePicker calendar mode
 2014-10-28 00:34:22 +00:00
Alan Viverette
7e79fd3ee2 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev automerge: 253626b 
automerge: b64176b

* commit 'b64176bd87e08bcb952d6c22eea7ffd9a8b6df62':
  Clean up some javadocs in Window.setFeature...()
 2014-10-28 00:32:19 +00:00
Jeff Sharkey
a148a0dc66 Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527 
automerge: a5921b9

* commit 'a5921b9b79a1d95e8a41bd74998cab82b153cb0a':
  Drop DEV network stats to save RAM.
 2014-10-28 00:27:07 +00:00
Alan Viverette
99b4e85073 Update drag-to-open menu close behavior 
Menu now closes if the user opens using long-press and then lifts their
finger when touching outside of the menu. This is consistent with the
normal drag-to-open interaction model.

BUG: 16352041
Change-Id: I06aafae7b702ef44000ed19707c46e2bb595095e
 2014-10-27 16:42:26 -07:00
John Reck
b0aeaad442 Merge "Cleanup debug options" into lmp-mr1-dev 2014-10-27 23:27:30 +00:00
Alan Viverette
384755230c Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev 2014-10-27 23:16:26 +00:00
Alan Viverette
253626b822 Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev 2014-10-27 22:39:12 +00:00
Dake Gu
54aad95336 am 4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev 
automerge: 63964d9

* commit '63964d9eae11b79e3d50ee5f3cc79b08050653fe':
  ActivityTransition: Encode scaleType and matrix in snapshot view
 2014-10-27 21:34:58 +00:00
Jeff Sharkey
1c6659486c am e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev 
automerge: 301b563

* commit '301b563107c7458a21e4460254e81694b45f0e35':
  Reduce PackageManager RAM usage: ArrayMap/Set.
 2014-10-27 21:33:55 +00:00
George Mount
eca1ae5e44 Fix NPE in moveSharedElementsToOverlay 
Bug 18119532

Change-Id: I334bda2d63427032583a15a483e000412024c150
 2014-10-27 14:25:12 -07:00
George Mount
06e74b30ae am e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev 
automerge: 7b042be

* commit '7b042be5e2975eddf1da915be052ad70fc07c115':
  Fix transition being canceled improperly.
 2014-10-27 21:22:49 +00:00
George Mount
8b92704f02 am 03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev 
automerge: 3437192

* commit '34371925470e43dfe1b194fd3f6d0b942f13f1bd':
  Add resizeClip attribute to ChangeBounds.
 2014-10-27 21:21:18 +00:00