123342 Commits

Author SHA1 Message Date
Narayan Kamath
b4606676a8 am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '49538def98520eb57d4fb634bf09b2f3104e7953':
  Init the static member when first used for CursorWindow.
2014-05-16 12:29:59 +00:00
Narayan Kamath
49538def98 am 79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '79e0206ef3203a1842949242e58fa8f3c25eb129':
  Init the static member when first used for CursorWindow.
2014-05-16 12:26:34 +00:00
Narayan Kamath
79e0206ef3 Merge "Init the static member when first used for CursorWindow." 2014-05-16 12:24:33 +00:00
Narayan Kamath
0c42f3bb33 am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '2c125876208c6b7173ef561316843d64ae1599e2':
  Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:13:49 +00:00
Narayan Kamath
2c12587620 am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
  Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:08:09 +00:00
Narayan Kamath
8a196c0676 Merge "Change InputMessage.motion.pointerSize to a uint32_t." 2014-05-16 12:06:09 +00:00
Narayan Kamath
844a4c81ff Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.

(cherry-picked from commit bc6001b026069714177526eb1120b0011d6f2a51)

Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
2014-05-16 12:55:48 +01:00
Justin Koh
8b2e7c4aaa am 0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
* commit '0ade263c28ea62e619972752ef2e6a6c994eeddf':
  If there is only 1 simple global action, autolaunch it
2014-05-15 17:20:23 +00:00
Justin Koh
0ade263c28 Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev 2014-05-15 17:17:14 +00:00
Baligh Uddin
3d58e2292d am bd44640c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'bd44640c7f532cdfe2b6d8c3e721abd92fbca65e':
  Import translations. DO NOT MERGE
2014-05-15 14:31:13 +00:00
Baligh Uddin
bd44640c7f Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-15 14:26:05 +00:00
Narayan Kamath
35b884f88e am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit 'be3dc5754fd081f54a86df9894763c0da915eed3':
  Wait for secondary zygote before bringing up the system_server.
2014-05-15 13:41:12 +00:00
Narayan Kamath
be3dc5754f am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '402120a2236b294dff9a51461cb22400a6ef67f6':
  Wait for secondary zygote before bringing up the system_server.
2014-05-15 13:38:17 +00:00
Narayan Kamath
402120a223 Merge "Wait for secondary zygote before bringing up the system_server." 2014-05-15 13:34:09 +00:00
Narayan Kamath
5d5f19a339 am 6e2e6868: am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '6e2e686889037711170ee145f9dfdb442cee85db':
  Remove "required" prefix from ABI fields.
2014-05-15 12:45:27 +00:00
Narayan Kamath
6e2e686889 am 706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
  Remove "required" prefix from ABI fields.
2014-05-15 12:41:47 +00:00
Narayan Kamath
706b1d7ea0 Merge "Remove "required" prefix from ABI fields." 2014-05-15 12:39:36 +00:00
Narayan Kamath
6e35a2ad05 Remove "required" prefix from ABI fields.
As per a comment on an earlier code review.

(cherry-picked from commit a9d64733421d6765eab5c2730fa912f068e26047)

Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
2014-05-15 10:57:05 +01:00
Narayan Kamath
1810927a9b am eabc93db: am c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit 'eabc93db1020be4b71f0db7d5b5d3a7991f3c264':
  app_process: change app_process a symlink of primary version
2014-05-15 09:45:33 +00:00
Narayan Kamath
eabc93db10 am c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit 'c4c08803a8cc090aa27720e97df342231e8433af':
  app_process: change app_process a symlink of primary version
2014-05-15 09:41:40 +00:00
Narayan Kamath
c4c08803a8 Merge "app_process: change app_process a symlink of primary version" 2014-05-15 09:36:28 +00:00
Ricardo Cervera
d850be5d14 am 7c05fd85: am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '7c05fd850bfbbbe9139a958102494260b5e6dea2':
  docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:57:12 +00:00
Mathieu Chartier
760f0994db am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"
* commit 'c0f18b9d0cce0c140b1274055faabff732f1e27c':
  Add property for background GC type
2014-05-14 23:56:13 +00:00
Ian Rogers
76ee05d4f6 am d05c7d26: am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
* commit 'd05c7d265170ca6573bbdd97f3c4aaa8e25a6389':
  Move FLATTENED_PATTERN to inner class.
2014-05-14 23:56:06 +00:00
Ricardo Cervera
7c05fd850b am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
  docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:53:20 +00:00
Mathieu Chartier
c0f18b9d0c am c4c77d63: Merge "Add property for background GC type"
* commit 'c4c77d63d889baca2abbdce6326077f0911b279e':
  Add property for background GC type
2014-05-14 23:52:02 +00:00
Ian Rogers
d05c7d2651 am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
* commit 'bcf76242134317a2f722eab5af2600fe2858f895':
  Move FLATTENED_PATTERN to inner class.
2014-05-14 23:51:59 +00:00
Ricardo Cervera
59ab011eeb am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
  docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:49:24 +00:00
Mathieu Chartier
c4c77d63d8 Merge "Add property for background GC type" 2014-05-14 23:07:39 +00:00
Mathieu Chartier
c01936a686 Add property for background GC type
To disable background compaction do:
adb shell setprop dalvik.vm.backgroundgctype CMS

To enable:
adb shell setprop dalvik.vm.backgroundgctype SS

Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
2014-05-14 15:45:48 -07:00
Ricardo Cervera
0e286ab1f0 Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs 2014-05-14 22:44:57 +00:00
Ian Rogers
bcf7624213 Merge "Move FLATTENED_PATTERN to inner class." 2014-05-14 22:40:58 +00:00
Ian Rogers
5d5d14fd97 Move FLATTENED_PATTERN to inner class.
Avoid AOT compilation/initialization in ART failing due to regex.Pattern
requiring native support.

Bug: 14646037

Change-Id: I9d9c7fd9ed9fab7e21d37f9b31c00d037fc5a691
2014-05-14 15:29:46 -07:00
Dirk Dougherty
ae4388f794 am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '0f5822847ae3422d939a7959f6a25178fcc12232':
  update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:24:29 +00:00
Dirk Dougherty
93ccd1a2eb am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
* commit '0540bc373c84b4ab590708cc9f79c95eeac5114c':
  Doc change: Updated content for distribute.
2014-05-14 21:24:24 +00:00
Dirk Dougherty
0f5822847a am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '980a285b4c29254fd65b0426256918ae2b5eea85':
  update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:21:23 +00:00
Dirk Dougherty
0540bc373c am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
* commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
  Doc change: Updated content for distribute.
2014-05-14 21:21:15 +00:00
Dirk Dougherty
980a285b4c am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '5eb99943d5cf4ad32c61d94e944c155d1c77a915':
  update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:17:27 +00:00
Dirk Dougherty
a4e6c7d1d4 am 3506ac87: Doc change: Updated content for distribute.
* commit '3506ac87c09c0748d92ef594c94365a5d7b07262':
  Doc change: Updated content for distribute.
2014-05-14 21:17:22 +00:00
Dirk Dougherty
5eb99943d5 Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs 2014-05-14 21:16:31 +00:00
Dirk Dougherty
3506ac87c0 Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
2014-05-14 14:10:51 -07:00
Yongqin Liu
559484ed6a app_process: change app_process a symlink of primary version
Change app_process to be a symlink to the primary version
and have app_process32/app_process64 be the 32-bit/64-bit
versions respectively.

This will make it possible to use the primary zygote for
am/pm commands and other scripts that use app_process and
don't need a specific zygote.

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibef545994eb95ddc82101c95df613ad1d06345e6
2014-05-14 18:48:42 +01:00
Baligh Uddin
aab161cf2c Import translations. DO NOT MERGE
Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e
Auto-generated-cl: translation import
2014-05-14 10:44:46 -07:00
Justin Koh
1c46c2d784 If there is only 1 simple global action, autolaunch it
Requested by UX. Also made settings available before provisioning
Bug: 14683740
Bug: 14886954

Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
2014-05-14 17:30:32 +00:00
Torne (Richard Coles)
41ecc8b1e0 am dcc9cf03: am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit 'dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
  Avoid supported ABI list containing "unknown".
2014-05-14 15:35:19 +00:00
Torne (Richard Coles)
dcc9cf03a8 am 41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '41ec8c9672fccce90a7156bcd856f59a36e93ad3':
  Avoid supported ABI list containing "unknown".
2014-05-14 15:31:28 +00:00
Torne (Richard Coles)
41ec8c9672 Merge "Avoid supported ABI list containing "unknown"." 2014-05-14 15:26:05 +00:00
Torne (Richard Coles)
da8c037c8b Avoid supported ABI list containing "unknown".
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.

Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
2014-05-14 16:17:26 +01:00
Deepanshu Gupta
406e38bd20 am 80816bfc: am f73dbcc3: am 9916c17e: am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev
* commit '80816bfcaf487535a45a7e6f271341eaede653b1':
  Fix build due to incorrect merges [DO NOT MERGE]
2014-05-14 00:36:23 +00:00
Deepanshu Gupta
c1a7440094 am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build
* commit '7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc':
  Fix build
2014-05-14 00:36:20 +00:00