Dan Albert
7a79c4cac3
am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master
...
* commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7':
Stop using namespace std.
2015-03-05 23:50:35 +00:00
Dan Albert
f8d6a4ba87
resolved conflicts for merge of 701f9c2f to stage-aosp-master
...
Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
2015-03-05 15:41:39 -08:00
Eric Gilmore
dcfa5e03f7
am 6e3c763f: am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
...
* commit '6e3c763f0146377f610227c879c8037b1842ab6e':
Re-fixing link, and removing trailing white space.
2015-03-05 23:38:31 +00:00
Dan Albert
701f9c2fd8
Merge "Stop using namespace std."
2015-03-05 23:31:41 +00:00
Eric Gilmore
6e3c763f01
am 685e6ce8: am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
...
* commit '685e6ce830f97383846335eec758e83ba3ad7060':
Re-fixing link, and removing trailing white space.
2015-03-05 23:26:17 +00:00
Eric Gilmore
685e6ce830
am 636a39ba: am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
...
* commit '636a39babbda97743b33511b3dd2addafc8c2847':
Re-fixing link, and removing trailing white space.
2015-03-05 23:11:09 +00:00
Eric Gilmore
636a39babb
am e95fa264: am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
...
* commit 'e95fa2649b62a3fbccd096b43925a17c6ff03228':
Re-fixing link, and removing trailing white space.
2015-03-05 23:04:27 +00:00
Eric Gilmore
e95fa2649b
am e17b0a14: am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
...
* commit 'e17b0a14ccc427bff386517537fcf23e00a087d4':
Re-fixing link, and removing trailing white space.
2015-03-05 22:50:16 +00:00
Andreas Gampe
0fcfae88f2
am ecc20aaf: am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"
...
* commit 'ecc20aafa6f3d272292e7b3577c99f2c127e590f':
Frameworks/base: Use ArraySet more explicitly
2015-03-05 22:46:49 +00:00
Andreas Gampe
ecc20aafa6
am 63ab6eb2: Merge "Frameworks/base: Use ArraySet more explicitly"
...
* commit '63ab6eb220a2a75837d6e3d18d19cbd5dda175eb':
Frameworks/base: Use ArraySet more explicitly
2015-03-05 22:38:56 +00:00
Eric Gilmore
e17b0a14cc
am 87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
...
* commit '87499b275bc7a8d4a12a3134646769a5c6c34829':
Re-fixing link, and removing trailing white space.
2015-03-05 22:34:58 +00:00
Andreas Gampe
63ab6eb220
Merge "Frameworks/base: Use ArraySet more explicitly"
2015-03-05 22:33:43 +00:00
Eric Gilmore
87499b275b
Merge "Re-fixing link, and removing trailing white space." into lmp-docs
2015-03-05 22:00:22 +00:00
Eric Gilmore
08134e649d
Re-fixing link, and removing trailing white space.
...
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
2015-03-05 13:39:21 -08:00
Andreas Gampe
0888276a1c
Frameworks/base: Use ArraySet more explicitly
...
In KeySetManagerService, use ArraySet more explicitly. Avoid for-each
loops.
Collections API methods on ArraySet are not very efficient. Iterators
incur two object allocations: a helper and the actual iterator object.
During boot, about 4.5K such calls are made. Using the ArraySet more
explicitly like an ArrayList/array avoids the overhead.
Bug: 19617481
Change-Id: I25df334fa1d4be3210667fb1404e3c43f2585049
2015-03-05 13:13:55 -08:00
Rich Slogar
f02b1abc27
am 2847fc99: am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
...
* commit '2847fc9912715027492bdae8567cd896b7ba8f9f':
docs: sdk tools date fix
2015-03-05 20:05:31 +00:00
Rich Slogar
2847fc9912
am cfb0978f: am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
...
* commit 'cfb0978fd9a6bf8fa06dee061df03fccf20fabc4':
docs: sdk tools date fix
2015-03-05 19:59:55 +00:00
Rich Slogar
cfb0978fd9
am bc669e3f: am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
...
* commit 'bc669e3f555519f641102b759a04a01ac5c10cad':
docs: sdk tools date fix
2015-03-05 19:52:05 +00:00
Rich Slogar
bc669e3f55
am dad1cbeb: am 9f485e97: am 4aba69a8: docs: sdk tools date fix
...
* commit 'dad1cbebfabf421efc90d366d9c4fd67becf930f':
docs: sdk tools date fix
2015-03-05 19:46:12 +00:00
Rich Slogar
dad1cbebfa
am 9f485e97: am 4aba69a8: docs: sdk tools date fix
...
* commit '9f485e971e06dad399dd70712787f4c30da9515e':
docs: sdk tools date fix
2015-03-05 19:39:47 +00:00
Rich Slogar
9f485e971e
am 4aba69a8: docs: sdk tools date fix
...
* commit '4aba69a8a7f58541ce76429252dd0c9650b40f35':
docs: sdk tools date fix
2015-03-05 19:33:56 +00:00
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