Ian Rogers
631bc614f5
am 08a92a33: Merge "Account malloc mmaped pages as native heap."
...
* commit '08a92a335fd84ca427b55c6c2d39f72970d82b76':
Account malloc mmaped pages as native heap.
2013-02-22 10:53:59 -08:00
Dirk Dougherty
531a599660
am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo.
...
* commit '82f810f3d4e70c264cb81c0cb6caaec2e864ebd0':
Doc change: Update DC image, fix typo.
2013-02-22 10:15:52 -08:00
Dirk Dougherty
82f810f3d4
am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo.
...
* commit 'bc1a863f687a2bbe9ae71ed22a3ebfaf7f8bbd26':
Doc change: Update DC image, fix typo.
2013-02-22 10:12:14 -08:00
Dirk Dougherty
bc1a863f68
am 094023a7: am 47dae077: Doc change: Update DC image, fix typo.
...
* commit '094023a7f155270a0f4ee54b8dd8282d4ffbea23':
Doc change: Update DC image, fix typo.
2013-02-22 10:08:19 -08:00
Dirk Dougherty
094023a7f1
am 47dae077: Doc change: Update DC image, fix typo.
...
* commit '47dae0771cb0db98ff829e19bf505f8628745878':
Doc change: Update DC image, fix typo.
2013-02-22 10:06:09 -08:00
Ian Rogers
08a92a335f
Merge "Account malloc mmaped pages as native heap."
2013-02-22 18:02:40 +00:00
Dirk Dougherty
47dae0771c
Doc change: Update DC image, fix typo.
...
Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d
2013-02-22 09:54:45 -08:00
Ian Rogers
afc10e174d
Account malloc mmaped pages as native heap.
...
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.
[1] https://android-review.googlesource.com/#/c/49583/3
Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
2013-02-22 09:40:58 -08:00
Kenny Root
8dda0956b6
am 49999acb: Merge "StreamingZipInflater: fix mmap\'d end of read"
...
* commit '49999acb049e09f99135e412cbb10d7367d2d607':
StreamingZipInflater: fix mmap'd end of read
2013-02-21 16:21:05 -08:00
Kenny Root
49999acb04
Merge "StreamingZipInflater: fix mmap'd end of read"
2013-02-22 00:05:36 +00:00
Dirk Dougherty
959256498a
am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:29:33 -08:00
Dirk Dougherty
9de1383960
am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'd886d12854011894d9b5f4155179c11e571a1aee':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:25:37 -08:00
Wink Saville
f7bf667d4a
am b5a1ce2f: Merge "Allow three digit phone numbers"
...
* commit 'b5a1ce2f5daa20b5c77113b8887e12dcc05590fc':
Allow three digit phone numbers
2013-02-21 14:21:12 -08:00
Dirk Dougherty
d886d12854
am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'efa92b0bbe906bfac15936e5ab3f75a206cf3d24':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:21:02 -08:00
Dirk Dougherty
efa92b0bbe
am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
* commit 'f32cbc3d490845967e28b0995ac88187b197642c':
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
2013-02-21 14:18:06 -08:00
Dirk Dougherty
f32cbc3d49
Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
...
bug: 8033647
bug: 8033688
Change-Id: Id7b5efd48f8e13ba8c8f4ab0e0f8e5dc736b1691
2013-02-21 13:29:07 -08:00
Scott Main
09ee121c27
am 7c3e0dcc: am b5261bfe: am 36c14ef8: am 488c81ae: docs: add note about javascript interface to 4.2 overview
...
* commit '7c3e0dcc7d395430e72b6786b715a530d8b5db4d':
docs: add note about javascript interface to 4.2 overview
2013-02-20 16:53:10 -08:00
Scott Main
7c3e0dcc7d
am b5261bfe: am 36c14ef8: am 488c81ae: docs: add note about javascript interface to 4.2 overview
...
* commit 'b5261bfe8f55617b8a91800bcc3ac41871bc5068':
docs: add note about javascript interface to 4.2 overview
2013-02-20 16:49:18 -08:00
Scott Main
b5261bfe8f
am 36c14ef8: am 488c81ae: docs: add note about javascript interface to 4.2 overview
...
* commit '36c14ef8c941133d3d35eee9afc76bd63b316ef6':
docs: add note about javascript interface to 4.2 overview
2013-02-20 16:47:36 -08:00
Scott Main
36c14ef8c9
am 488c81ae: docs: add note about javascript interface to 4.2 overview
...
* commit '488c81aebb24b2cde7a0878b2d8bab88484544ca':
docs: add note about javascript interface to 4.2 overview
2013-02-20 16:44:34 -08:00
Scott Main
488c81aebb
docs: add note about javascript interface to 4.2 overview
...
Change-Id: I19454c481061b27197399d63abc466810b9e1ff8
2013-02-20 16:10:32 -08:00
Scott Main
bedf5b35eb
am c1fd3ca5: am ad7b70b6: am 41ae4d7e: am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
...
* commit 'c1fd3ca5cc876110688ee32675e8cac7c5b5eae6':
update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
2013-02-20 15:38:38 -08:00
Scott Main
c1fd3ca5cc
am ad7b70b6: am 41ae4d7e: am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
...
* commit 'ad7b70b63171e5e6ddd62c37d97437a5123f33bc':
update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
2013-02-20 15:35:48 -08:00
Scott Main
ad7b70b631
am 41ae4d7e: am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
...
* commit '41ae4d7e04188657054df8ffdc7710d7c829fbc4':
update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
2013-02-20 15:33:36 -08:00
Scott Main
41ae4d7e04
am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
...
* commit 'e61116b9a1f2d92fbda3d23d35a3742d0661c2be':
update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
2013-02-20 15:30:04 -08:00
Wink Saville
b5a1ce2f5d
Merge "Allow three digit phone numbers"
2013-02-20 23:04:32 +00:00
Scott Main
e61116b9a1
update dev console language for new site design.
...
Language only; no screenshot changes.
bug: 8032875
bug: 8033647
bug: 8033688
Change-Id: Ia333846e89d025b1edc919a40cb2224b04deb9ab
2013-02-20 13:30:35 -08:00
Scott Main
1998060f69
am 803a6b0d: am ed7713e1: am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240
...
* commit '803a6b0da037e6ae6eaf51712cde5545ab140dce':
docs: sanitize input for badge generator bug: 8002240
2013-02-19 12:03:42 -08:00
Scott Main
803a6b0da0
am ed7713e1: am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240
...
* commit 'ed7713e161bdfdaa87278fbd369b3dc3939f12c3':
docs: sanitize input for badge generator bug: 8002240
2013-02-19 12:01:22 -08:00
Scott Main
ed7713e161
am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240
...
* commit 'e5c4846db7f12938836f7bd821076f3dd2e59fc8':
docs: sanitize input for badge generator bug: 8002240
2013-02-19 11:58:56 -08:00
Scott Main
e5c4846db7
am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240
...
* commit '9dbb0b3597291a8305e0c451521eec9a5be2fb9b':
docs: sanitize input for badge generator bug: 8002240
2013-02-19 11:56:54 -08:00
Scott Main
9dbb0b3597
docs: sanitize input for badge generator
...
bug: 8002240
Change-Id: Ic1429284fd1953fb6819110ecb47fcb3a79a9600
2013-02-19 11:51:37 -08:00
Victoria Lease
5782c16d34
am c36303a6: Merge "Applying ChannelScrolling to remove calculateDragAngle"
...
* commit 'c36303a66d1cb72f7216dc90ee7239b2b77a9815':
Applying ChannelScrolling to remove calculateDragAngle
2013-02-19 10:11:39 -08:00
Victoria Lease
c36303a66d
Merge "Applying ChannelScrolling to remove calculateDragAngle"
2013-02-19 17:40:09 +00:00
kiwon
72034953bf
Applying ChannelScrolling to remove calculateDragAngle
...
To avoid angle calculation changed the logic to use virtual areas.
When try to drag or pan, check where the current touch point locates
and determine how to drag a page.
Change-Id: Id9bd08a69c4ac93ff385c8088e6c16bed5dc5f88
Signed-off-by: kiwon <kiwon98.lee@samsung.com>
2013-02-18 14:30:58 +09:00
Irfan Sheriff
05913cc979
am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
...
* commit 'c6ea41efc93df12eeef7c59124bee83e8f3f7a41':
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
2013-02-15 15:55:43 -08:00
Irfan Sheriff
c6ea41efc9
Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
...
* changes:
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
2013-02-15 23:42:28 +00:00
Wink Saville
1c2acdc6e8
Fix broken test.
...
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
2013-02-15 15:20:37 -08:00
Irfan Sheriff
b815edf3ab
Track keys per config and allow cert push from apps
...
Allow configuring keys for a configuration and update/delete
from wificonfigstore.
Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
2013-02-15 15:19:35 -08:00
Dirk Dougherty
5fce0c1fe3
am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit 'e91b053369638f81e725a47a7491853b06aca5ae':
Doc change: Edits for RTL in highlights.
2013-02-15 15:11:25 -08:00
Dirk Dougherty
e91b053369
am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit 'ed0c6fe66ce836431ba999cb79fa0d1441e21997':
Doc change: Edits for RTL in highlights.
2013-02-15 15:08:33 -08:00
Dirk Dougherty
ed0c6fe66c
am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit '531375f9bdca84a34a0ca5bdba34f44f0b34ed50':
Doc change: Edits for RTL in highlights.
2013-02-15 15:06:00 -08:00
Dirk Dougherty
531375f9bd
am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit '34434badf6ca2fd04c088e2971d33ded39158d22':
Doc change: Edits for RTL in highlights.
2013-02-15 15:03:37 -08:00
Dirk Dougherty
34434badf6
Doc change: Edits for RTL in highlights.
...
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
2013-02-15 15:00:43 -08:00
Irfan Sheriff
b07526fb1c
eix enterprise config storage bugs
...
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.
Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.
Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
2013-02-15 14:58:15 -08:00
Irfan Sheriff
46e0931080
Fix connectivitymanagertest
...
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
2013-02-15 14:55:15 -08:00
Irfan Sheriff
2f6778c038
Fix build
...
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
2013-02-15 14:52:33 -08:00
Irfan Sheriff
c72c5625c6
Refactor enterprise config
...
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
2013-02-15 14:51:19 -08:00
Kenny Root
c6e35cb47a
StreamingZipInflater: fix mmap'd end of read
...
When reaching the end of a mmap'd segment, it was erroneously trying to
read more data. This is because we were reading data one character at a
time, so we never reached the Z_STREAM_END result without going through
the loop once more.
Bug: https://code.google.com/p/android/issues/detail?id=39041
Change-Id: I6c53b8187384a42217c32112d6a0c2857f471109
2013-02-15 11:05:48 -08:00
Bin Zhu
a37fc575a4
Allow three digit phone numbers
...
The comment for the PHONE pattern says:
"<digit><digit|sdd>+<digit>"
But the actual pattern requires that the string contains
more than that. A phone number should be allowed to be
three digits.
Change-Id: I86d2f3d634cd0c1654dad9814906f151055dc23a
2013-02-15 11:54:41 +01:00