Rich Slogar
4aba69a8a7
docs: sdk tools date fix
...
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
2015-03-05 11:24:45 -08:00
Andreas Gampe
ecb48c16b7
am 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
...
* commit '9c0ba24f3b54fa7916626f3d76ec6818d78ca47e':
Frameworks/base: Add removeAll for ArraySet
2015-03-05 17:33:13 +00:00
Andreas Gampe
9c0ba24f3b
am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
...
* commit '6695b9920d15f8d9a17d6b0c66b863d1c2e38584':
Frameworks/base: Add removeAll for ArraySet
2015-03-05 17:15:58 +00:00
Andreas Gampe
6695b9920d
Merge "Frameworks/base: Add removeAll for ArraySet"
2015-03-05 17:10:31 +00:00
smain@google.com
9f4e1f7f50
am b488a256: am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit 'b488a256308c8c7598da19d109be99d19a08a76d':
add tags for wakelock and other API names
2015-03-05 06:32:35 +00:00
Brian Carlstrom
233baedce8
am 686a1b2f: am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"
...
* commit '686a1b2f4ac90c3fb522405258212c8a91ed5148':
Manually add SignalStrength to preloaded-classes
2015-03-05 06:27:40 +00:00
smain@google.com
b488a25630
am 4f674bbd: am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit '4f674bbdf83056141f3dccf1af8af3113e17af87':
add tags for wakelock and other API names
2015-03-05 06:25:43 +00:00
Brian Carlstrom
686a1b2f4a
am 165c2564: Merge "Manually add SignalStrength to preloaded-classes"
...
* commit '165c25641ccedf6447d09dfec00f485df1361c35':
Manually add SignalStrength to preloaded-classes
2015-03-05 06:22:18 +00:00
smain@google.com
4f674bbdf8
am 8b2be54a: am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit '8b2be54a629e4567152d8b0e6c81332632b0b877':
add tags for wakelock and other API names
2015-03-05 06:18:45 +00:00
Brian Carlstrom
165c25641c
Merge "Manually add SignalStrength to preloaded-classes"
2015-03-05 06:15:53 +00:00
smain@google.com
8b2be54a62
am 182059f8: am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit '182059f875bedc778a3ce9710a4f634197d1e959':
add tags for wakelock and other API names
2015-03-05 06:10:54 +00:00
Brian Carlstrom
0b36620014
Manually add SignalStrength to preloaded-classes
...
Bug: 19323020
Change-Id: I61e9d2dd5d06fe2353da17e5646f259122e5ea98
2015-03-04 21:56:26 -08:00
Anthony Hugh
7b737c809d
am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
...
* commit '097f8d5f6b82f27e71ec72795dee053dfc698ac5':
Update "Optimizing app X from Y string"
2015-03-05 04:08:32 +00:00
Anthony Hugh
097f8d5f6b
Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev
2015-03-05 04:04:06 +00:00
Andreas Gampe
f9345e93db
Frameworks/base: Add removeAll for ArraySet
...
Add a simple ArraySet.removeAll(ArraySet) method. This avoids two
allocations, a MapCollections helper and an Iterator object, over
the removeAll(Collection) code.
KeySetManagerService heavily calls removeAll during boot (about 9K
times in AOSP). This reduces GC stress and optimizes the removal
(about half the time the removed collection has only one element).
The removal method in KeySetManagerService is also done under a lock,
so that it gates parallelization efforts in PackageManagerService.
Bug: 19498314
Change-Id: Ib0e483adfd09831cd66ab19a820ebf6544a2b66f
2015-03-04 17:14:10 -08:00
smain@google.com
182059f875
am ca10a435: am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit 'ca10a4352f07652d82da59f6c1630e8607d82dda':
add tags for wakelock and other API names
2015-03-05 01:12:15 +00:00
Eric Gilmore
761203089d
am 8edf64e9: am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '8edf64e9e903f2dcd54d52b74ef1bbfefcbbca3d':
Fixing broken link per b/19503824.
2015-03-05 01:10:56 +00:00
Eric Gilmore
8edf64e9e9
am 28d11557: am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '28d11557d6846e7ea7fb2593a6ed4d3a16f5eef6':
Fixing broken link per b/19503824.
2015-03-05 01:02:55 +00:00
smain@google.com
ca10a4352f
am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
...
* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
2015-03-05 00:59:24 +00:00
Bart Sears
1445dec74f
am 5a1cec86: am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
...
* commit '5a1cec86cfb3f08fac06ed26fe81247c3415d3ca':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:59:01 +00:00
Eric Gilmore
28d11557d6
am 498691d2: am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '498691d2641deb1ca30938c7777a9a63882ffd87':
Fixing broken link per b/19503824.
2015-03-05 00:55:38 +00:00
Bart Sears
5a1cec86cf
am 0c3052a6: am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
...
* commit '0c3052a6675ed528c2898bd2ecb92576bca78df9':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:52:58 +00:00
smain@google.com
f4bbec09a4
Merge "add tags for wakelock and other API names" into lmp-docs
2015-03-05 00:49:49 +00:00
Eric Gilmore
498691d264
am 62777b18: am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/19503824.
2015-03-05 00:49:21 +00:00
Bart Sears
0c3052a667
am 4eedcceb: Merge "Merge commit \'83a63bac\' into manualmerge" into lmp-mr1-dev
...
* commit '4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-05 00:40:13 +00:00
Bart Sears
4eedccebb7
Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev
2015-03-05 00:35:08 +00:00
Tucker Sylvestro
80cb73006d
am 5a6b44c4: (-s ours) Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
...
* commit '5a6b44c435fb06817a66bb74c66a5a6d19690616':
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
2015-03-05 00:27:13 +00:00
Tucker Sylvestro
5a6b44c435
Merge "DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)" into lmp-mr1-modular-dev
2015-03-05 00:15:08 +00:00
Anthony Hugh
6550bf5e39
Update "Optimizing app X from Y string"
...
The word "Optimizing" is rendering on two lines on Lenok due to being too
long. New design is to shorten the string on watches to avoid this issue.
BUG: 18388692
BUG: 18902013
BUG: 16493311
Change-Id: I8d9a9e8fcade460e50f9bf71d5cb0c6e415f871e
2015-03-04 16:12:08 -08:00
Miao Wang
87e908dfde
[RenderScript] AutoPadding & Unpadding for Vec3 Elements during
...
copyTo & copyFrom.
Change-Id: I10b6fb235717e181ebb30b92e4dbe23e6183a29c
2015-03-04 15:50:11 -08:00
John Spurlock
3bedeb0101
am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
...
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:15:51 +00:00
John Spurlock
bd43874287
am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
...
* commit 'b879e7395fa9446952b840b1d576ff225b039774':
MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:09:19 +00:00
John Spurlock
b879e7395f
am c974ac11: MediaProjectionPermissionActivity: Fix NPE.
...
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
2015-03-04 23:01:26 +00:00
Andre Eisenbach
a0eaaa2a22
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (3/4)
...
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
2015-03-04 17:17:20 -05:00
Dan Albert
030f536009
Stop using namespace std.
...
The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.
Bug: 19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
2015-03-04 13:54:20 -08:00
John Spurlock
c974ac11f8
MediaProjectionPermissionActivity: Fix NPE.
...
Avoid dismissing a null dialog.
Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
2015-03-04 18:58:18 +00:00
Craig Mautner
bbd2ac5adf
Merge commit '83a63bac' into manualmerge
2015-03-04 10:10:34 -08:00
Eric Gilmore
62777b189d
am 5c30adfd: am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
Fixing broken link per b/19503824.
2015-03-04 17:53:31 +00:00
Eric Gilmore
5c30adfdb6
am 22d1c1ce: Merge "Fixing broken link per b/19503824." into lmp-docs
...
* commit '22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
Fixing broken link per b/19503824.
2015-03-04 17:47:01 +00:00
Eric Gilmore
22d1c1ce1d
Merge "Fixing broken link per b/19503824." into lmp-docs
2015-03-04 17:40:16 +00:00
Craig Mautner
83a63bac5d
am 8fa394fa: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
...
* commit '8fa394fa8c4eb3ca832dac36baf5645a40d449f1':
Do not make ActivityContainer available to apps. DO NOT MERGE
2015-03-04 16:15:35 +00:00
Craig Mautner
8fa394fa8c
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
2015-03-04 16:09:29 +00:00
Geoff Mendal
850fd489de
am b214417a: (-s ours) am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'b214417a6e1a7cca5bac961c2b32b72d8baea2dd':
Import translations. DO NOT MERGE
2015-03-04 14:14:29 +00:00
Geoff Mendal
116b9336e2
am bb9360e3: (-s ours) am 63069cc9: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bb9360e36cea7c2af17992c1b08eedbce707962b':
Import translations. DO NOT MERGE
2015-03-04 14:14:24 +00:00
Geoff Mendal
b214417a6e
am 3b9e64f3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '3b9e64f3265ad146da1b9f5b523c406acd041f59':
Import translations. DO NOT MERGE
2015-03-04 14:08:11 +00:00
Geoff Mendal
bb9360e36c
am 63069cc9: (-s ours) Import translations. DO NOT MERGE
...
* commit '63069cc985869fe06254e352ea63b361cb0d0917':
Import translations. DO NOT MERGE
2015-03-04 14:08:03 +00:00
Geoff Mendal
3b9e64f326
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2015-03-04 14:04:04 +00:00
Geoff Mendal
c70510298e
Import translations. DO NOT MERGE
...
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
2015-03-04 06:02:36 -08:00
Geoff Mendal
63069cc985
Import translations. DO NOT MERGE
...
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
2015-03-04 05:56:33 -08:00
Geoff Mendal
3e938519e3
am 80b9bd85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
...
* commit '80b9bd854365bf052db9572bcff0fedf74090ff5':
Import translations. DO NOT MERGE
2015-03-04 13:47:51 +00:00