139542 Commits

Author SHA1 Message Date
Richard Coles
2995606963 Merge "Connect WebView Async Cookie APIs" 2014-06-17 05:13:46 +00:00
Hector Dearman
24a11d311c Connect WebView Async Cookie APIs
Bug: 14379829
Change-Id: I6b0e0644153a805eccb48d30b0ad3e91babd8093
2014-06-17 15:32:07 +01:00
Baligh Uddin
0f8f45edad am 3358b9fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '3358b9fe124a192a1775630d57485bcdec16069d':
  Import translations. DO NOT MERGE
2014-06-17 14:30:19 +00:00
Baligh Uddin
d99d5e098f am 1d96174c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev
* commit '1d96174cd57699272fb6dd9abf08599acc6ce8d0':
  Import translations. DO NOT MERGE
2014-06-17 14:30:14 +00:00
Baligh Uddin
22669d0024 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-17 05:00:50 +00:00
Baligh Uddin
281b14eea0 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-17 04:56:28 +00:00
Baligh Uddin
d31899bb76 Merge "Import translations. DO NOT MERGE" 2014-06-17 04:56:28 +00:00
Baligh Uddin
f67ce362cf Merge "Import translations. DO NOT MERGE" 2014-06-17 05:00:50 +00:00
Jungshik Jang
3ecdd832c7 Fix missing iteration policy on device discover action
Device polling requires both pick policy and pick iteration policy,
however, device discovery action has no iteration policy.
Along with fix, move send result and pick policy constants
to HdmiConstants package

Change-Id: Ibbcfdc482a189bbc3aa2c61143422541da78447d
2014-06-17 14:04:38 +09:00
Jungshik Jang
8db85ab744 Merge "Rename HdmiCecKeycodeTranslater to HdmiCecKeycode." 2014-06-17 04:00:08 +00:00
Jungshik Jang
cd3445cc8b Rename HdmiCecKeycodeTranslater to HdmiCecKeycode.
Since HdmiCecKeycode defines all keys used for Hdmi CEC,
simple HdmiCecKeycode sounds better than HdmiCecKeycodeTranslater.

Change-Id: I1a0ea9f128b19dd47bfda3bf2dd8794a9e42c6f8
2014-06-17 13:23:06 +09:00
Lorenzo Colitti
b86f752a24 Merge "Notify network observers of route changes." 2014-06-17 04:04:28 +00:00
Lorenzo Colitti
8c0d4594c3 Merge "Move netlink updates to a new NetlinkTracker class." 2014-06-17 04:04:28 +00:00
Jungshik Jang
3e1e33f13b Merge "Rearrange ownership between Hdmi control modules." 2014-06-17 04:00:08 +00:00
Jungshik Jang
79c58a4b97 Rearrange ownership between Hdmi control modules.
Here is a list of changes on this. (R: rationale)
1. HdmiCecLocalDeviceTv takes over responsibilty of device info
management.
 R: All devices infos are added or removed by only Tv's
device discovery and hot plug detection mecanism

2. Each HdmiCecLocalDevice manages FeatureAction and Cec
 message cache.
 R: There is no direct connection between actions that
 are created in different device action. If there is
 an same actions created from different local device,
 they should be managed independently.

3. Active path and logical address is managed by
   HdmiCecLocalDevice.
 R: All device should know active path of current source.

4. All system audio & ARC features are handled by
   HdmiCecLocalDeviceTv
 R: In terms of ARC, theoretically, any device can be transmiter of
   ARC but TV is the de facto device
   On other hands, for system audio Tv is the recipeint
    of request.

Change-Id: Iac9ff43fb41798ed4f94c61d23345fe5fe777fbb
2014-06-17 13:03:55 +09:00
Lorenzo Colitti
3ee63c25e4 Merge "Modify LinkProperties add/remove route functions." 2014-06-17 04:00:08 +00:00
Lorenzo Colitti
0f50bbfe45 Merge "IpPrefix improvements." 2014-06-17 04:11:04 +00:00
smain@google.com
28b244ef02 am 755c930a: am b17420b8: Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev
* commit '755c930a5139987d865facdc9ed2e8c033136dfd':
  add toggle for IDE instructions, revise some titles and other cleanup to Google API setup
2014-06-17 03:33:25 +00:00
smain@google.com
755c930a51 am b17420b8: Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev
* commit 'b17420b81ebe7e1235a45ad3e7ce8c1850c129f2':
  add toggle for IDE instructions, revise some titles and other cleanup to Google API setup
2014-06-17 03:24:16 +00:00
Robert Ly
792346e494 am 48e337ae: am 696b3cd9: docs: fix links
* commit '48e337ae333d0b960fa4d4abcd3c1a68a4c5bfc1':
  docs: fix links
2014-06-17 03:23:48 +00:00
Robert Ly
48e337ae33 am 696b3cd9: docs: fix links
* commit '696b3cd96f0c0d061b3f860412ad1e6cf34b64c9':
  docs: fix links
2014-06-17 03:19:13 +00:00
Robert Ly
696b3cd96f docs: fix links
Change-Id: Ibbf3e24893d953a65cb1ef2dd31cf1174a40ebf6
2014-06-16 20:10:49 -07:00
Lorenzo Colitti
c18cbfdf8d Notify network observers of route changes.
Bug: 9180552
Change-Id: If8432bc74335676320b815784b21f404d3479c35
2014-06-17 11:18:54 +09:00
Lorenzo Colitti
10accbb46e Move netlink updates to a new NetlinkTracker class.
This will allow us to use this logic on other link types such as
Ethernet, and will also avoid increasing the complexity of
WifiStateMachine as we get more information such as routes and
DNS servers from netlink.

Bug: 9180552
Change-Id: I79034827cb0c5f24d783d7243e04b69e12aa3cc6
2014-06-17 11:18:53 +09:00
Lorenzo Colitti
c17a1b9ee4 Modify LinkProperties add/remove route functions.
This will allow us to dynamically track routes being added and
removed, similar to what we do for IP addresses.

1. Support removing routes. Since this is a new function, we
   don't need to jump through hoops to support callers passing
   in routes that have no interface, we just fail to match them.
2. Make the addRoute method return a boolean value indicating
   whether anything changed. This is consistent with what we do
   for addresses and is used to decide whether to update the
   rest of the system when an update comes in.

Bug: 9180552
Change-Id: I50648b5f81ec55c88501a7640e119cda2bb540f2
2014-06-17 11:18:53 +09:00
Lorenzo Colitti
8c6c2c3c92 IpPrefix improvements.
1. Allow IpPrefixes to be created from strings. In order to do
   this, factor out the code from LinkAddress which already does
   this to a small utility class in NetworkUtils.
2. Truncate prefixes on creation, fixing a TODO.
3. Add a toString method.
4. Write a unit test.

While I'm at it, make RouteInfoTest pass again, and convert it
to use IpPrefix instead of LinkAddress.

Change-Id: I5f68f8af8f4aedb25afaee00e05369f01e82a70b
2014-06-17 11:18:53 +09:00
Robert Ly
f141f48fb4 am 483af3bf: docs: fix lmp index
* commit '483af3bf9e0de4d84b6b36fddf458d35ba5728d6':
  docs: fix lmp index
2014-06-17 00:05:15 +00:00
RoboErik
6b1bea0903 b/15676582 Fix ordering of sessions returned by MediaSessionManager
This was causing the wrong rcc to be shown. Simple fix
just fixes the ordering so it's not reversed.

Change-Id: I56f2d9d6895d6ba3b0eca8f77a3b0b63e0193ad1
2014-06-16 16:59:37 -07:00
Robert Ly
483af3bf9e docs: fix lmp index
Change-Id: If3f696cba65bcd9a126a1abde6d4b2a0bda84767
2014-06-16 16:56:09 -07:00
Chris Craik
88b1c9ad87 am e709d53f: am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI."
* commit 'e709d53ff31c74a6abf2a27350966d18d8dad4f7':
  Fix the texture ID reuse issue in HWUI.
2014-06-16 23:47:34 +00:00
Chris Craik
678886fde5 am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"
* commit 'b1fc06a4321f13360fcca49bbf87f87f34c22d58':
  hwui: fix possible null pointer de-refrence
2014-06-16 23:47:26 +00:00
Chris Craik
e709d53ff3 am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI."
* commit '0d28bb47d771a2ac99cec6e4a071a98d2cd705dd':
  Fix the texture ID reuse issue in HWUI.
2014-06-16 23:43:21 +00:00
Chris Craik
b1fc06a432 am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"
* commit '5e7ef9489f3247c02395202d88fb4fb425aa8412':
  hwui: fix possible null pointer de-refrence
2014-06-16 23:43:16 +00:00
Selim Cinek
b688bf7ceb Fixed a bug where the device could not be unlocked.
When the Notifications could be scrolled, the shade could not
be closed.

Bug: 15643474
Change-Id: I59b9f55c0290da7683ce7fd40effc4b5413e4267
2014-06-16 16:36:51 -07:00
Tim Murray
9dad7d44d2 DO NOT MERGE: Mark new util type functions as @hide in AOSP.
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
2014-06-16 16:20:36 -07:00
Robert Ly
90fd93c0ef am d458e3f4: delete tv
* commit 'd458e3f4d8eb888470404701c37c8bc9cddfa993':
  delete tv
2014-06-16 23:18:21 +00:00
Robert Ly
3a437c7846 am 208eb3e8: Merge "Android TV DevGuide home fix (no pic)" into klp-modular-dev
* commit '208eb3e84a8ec3458b8cda7afd969e890261a018':
  Android TV DevGuide home fix (no pic)
2014-06-16 23:13:30 +00:00
Robert Ly
d458e3f4d8 delete tv
Change-Id: I22058850b4186951e69ada51959ef9f86054b1b1
2014-06-16 16:10:42 -07:00
Robert Ly
2c7fefe339 am f5135c28: Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev
* commit 'f5135c283f1771ab0e1de66cb015a0abeb48eae2':
  docs: Material design doc fixes from editorial review.
2014-06-16 22:55:46 +00:00
Robert Ly
605b00b97f am 13bc25bf: Merge "docs: misc l-prev fixes" into klp-modular-dev
* commit '13bc25bf4c5b47183b8eda68099314dd2a6ec47b':
  docs: misc l-prev fixes
2014-06-16 22:32:46 +00:00
Chris Craik
0d28bb47d7 Merge "Fix the texture ID reuse issue in HWUI." 2014-06-16 22:13:20 +00:00
Chris Craik
5e7ef9489f Merge "hwui: fix possible null pointer de-refrence" 2014-06-16 22:13:20 +00:00
smain@google.com
b17420b81e Merge "add toggle for IDE instructions, revise some titles and other cleanup to Google API setup" into klp-modular-dev 2014-06-16 22:12:26 +00:00
smain@google.com
7332669e39 add toggle for IDE instructions, revise some titles and other cleanup to Google API setup
Change-Id: Ic2454824adddb80ac844939f165cc68fc52a7005
2014-06-16 20:12:30 -07:00
Robert Ly
f5135c283f Merge "docs: Material design doc fixes from editorial review." into klp-modular-dev 2014-06-16 22:12:26 +00:00
Ricardo Cervera
d9a70a7aaa docs: Material design doc fixes from editorial review.
Change-Id: I2a7a9d39e85cc9c9d5f19f7265aaa6dc8c5dba12
2014-06-16 15:43:22 -07:00
Michael Kolb
b936c57c2c am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev
* commit 'a730881d769cfe0bdce1faafae2c3b88f86d6978':
  DO NOT MERGE : Fix measuring with outset for orientation
2014-06-16 20:55:39 +00:00
Chris Craik
56a78265bf Merge "Adjust tessellation abort depth DO NOT MERGE" into lmp-preview-dev 2014-06-16 20:54:41 +00:00
Chris Craik
2743e0caad Adjust tessellation abort depth DO NOT MERGE
bug:15615144
Change-Id: Iee91f241067de9d088220c34c19db52a37ac258d
2014-06-16 14:00:40 -07:00
Colin Cross
289476b65b am a803542a: am cb634bda: Merge "clean up native com.android.internal.os.Zygote"
* commit 'a803542aad4a58fe2446b8bf9cc4a4f59942d084':
  clean up native com.android.internal.os.Zygote
2014-06-16 20:19:05 +00:00